li.shaoyi 2 years ago
parent
commit
2a97b2464b

+ 7 - 13
src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -21,7 +21,7 @@
                             <div class="goods-listing__stepper">
                                 <Stepper v-model="orderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
                                     integer />
-                                <RadioGroup v-model="qtyStep" direction="horizontal">
+                                <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>
                                 </RadioGroup>
@@ -163,67 +163,61 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 }
 
 const onBuyClick = (index: number) => {
-    const { bid = 0, bid2 = 0, bid3 = 0, bid4 = 0, bid5 = 0, bidvolume = 0, bidvolume2 = 0, bidvolume3 = 0, bidvolume4 = 0, bidvolume5 = 0 } = quote.value ?? {}
+    const { bid = 0, bid2 = 0, bid3 = 0, bid4 = 0, bid5 = 0 } = quote.value ?? {}
     switch (index) {
         case 1: {
             formData.OrderPrice = bid
-            orderQty.value = bidvolume
             break
         }
         case 2: {
             formData.OrderPrice = bid2 || bid
-            orderQty.value = bidvolume2 || bidvolume
             break
         }
         case 3: {
             formData.OrderPrice = bid3 || bid
-            orderQty.value = bidvolume3 || bidvolume
             break
         }
         case 4: {
             formData.OrderPrice = bid4 || bid
-            orderQty.value = bidvolume4 || bidvolume
             break
         }
         case 5: {
             formData.OrderPrice = bid5 || bid
-            orderQty.value = bidvolume5 || bidvolume
             break
         }
     }
 }
 
 const onSellClick = (index: number) => {
-    const { ask = 0, ask2 = 0, ask3 = 0, ask4 = 0, ask5 = 0, askvolume = 0, askvolume2 = 0, askvolume3 = 0, askvolume4 = 0, askvolume5 = 0 } = quote.value ?? {}
+    const { ask = 0, ask2 = 0, ask3 = 0, ask4 = 0, ask5 = 0 } = quote.value ?? {}
     switch (index) {
         case 1: {
             formData.OrderPrice = ask
-            orderQty.value = askvolume
             break
         }
         case 2: {
             formData.OrderPrice = ask2 || ask
-            orderQty.value = askvolume2 || askvolume
             break
         }
         case 3: {
             formData.OrderPrice = ask3 || ask
-            orderQty.value = askvolume3 || askvolume
             break
         }
         case 4: {
             formData.OrderPrice = ask4 || ask
-            orderQty.value = askvolume4 || askvolume
             break
         }
         case 5: {
             formData.OrderPrice = ask5 || ask
-            orderQty.value = askvolume5 || askvolume
             break
         }
     }
 }
 
+const onRadioChange = (value: number) => {
+    orderQty.value = value
+}
+
 // 提交挂牌
 const onSubmit = () => {
     const { marketid = 0, goodsid = 0 } = quote.value ?? {}

+ 5 - 1
src/packages/mobile/views/goods/trade/components/delisting/index.vue

@@ -36,7 +36,7 @@
                             <div class="goods-delisting__stepper">
                                 <Stepper v-model="orderQty" theme="round" button-size="22" :min="0" :step="qtyStep"
                                     :max="selectedRow.orderqty" integer />
-                                <RadioGroup v-model="qtyStep" direction="horizontal">
+                                <RadioGroup v-model="qtyStep" direction="horizontal" @change="onRadioChange">
                                     <Radio v-for="(value, index) in qtyStepList" :key="index" :name="value">{{ value }}
                                     </Radio>
                                 </RadioGroup>
@@ -156,6 +156,10 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
     }],
 }
 
+const onRadioChange = (value: number) => {
+    orderQty.value = value
+}
+
 // 提交摘牌
 const onSubmit = () => {
     const { goodsid, orderid, orderprice, buyorsell } = props.selectedRow

+ 1 - 1
src/packages/mobile/views/order/list/components/goodsorder/detail/Index.vue

@@ -19,7 +19,7 @@
                     <Cell title="委托单号" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
-            <template #footer v-if="selectedRow.orderstatus === 3 || selectedRow.orderstatus === 7">
+            <template #footer v-if="[3, 7, 12].includes(selectedRow.orderstatus)">
                 <Button type="primary" block round @click="onCancelSumit">撤销</Button>
             </template>
         </app-view>

+ 2 - 2
src/packages/mobile/views/order/list/components/transfertrade/history/index.vue

@@ -38,7 +38,7 @@
                                 </li>
                                 <li>
                                     <span>损益</span>
-                                    <span>{{ item.closepl }}</span>
+                                    <span>{{ handleNumberValue(item.closepl) }}</span>
                                 </li>
                                 <li>
                                     <span>成交时间</span>
@@ -62,7 +62,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, ref, defineAsyncComponent } from 'vue'
-import { formatDate } from '@/filters'
+import { formatDate, handleNumberValue } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'
 import { getBuyOrSellName } from '@/constants/order'

+ 2 - 1
src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue

@@ -29,7 +29,7 @@
                         </li>
                         <li>
                             <span>损益</span>
-                            <span>{{ item.closepl }}</span>
+                            <span>{{ handleNumberValue(item.closepl) }}</span>
                         </li>
                         <li>
                             <span>成交时间</span>
@@ -50,6 +50,7 @@
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { Button } from 'vant'
+import { formatDate, handleNumberValue } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'

+ 1 - 1
src/packages/mobile/views/order/position/components/transfer/listing/Index.vue

@@ -1,6 +1,6 @@
 <!-- 我的持仓-转让持仓-转让 -->
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="转让" @back="closed" />

+ 1 - 1
src/packages/mobile/views/presale/detail/Index.vue

@@ -31,7 +31,7 @@
                         <span>{{ earnest }}</span>
                     </li>
                     <li>
-                        <span>转让比例</span>
+                        <span>转让定金</span>
                         <span>{{ parsePercent(detail.transferdepositratio) }}</span>
                     </li>
                 </ul>

+ 4 - 1
src/packages/mobile/views/transfer/delisting/Index.vue

@@ -32,13 +32,16 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { getQueryStringToNumber } = useNavigation()
-const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 const goodsid = getQueryStringToNumber('goodsid')
 const dataList = shallowRef<Model.WrTradeOrderDetailRsp[]>([])
 const selectedRow = shallowRef<Model.WrTradeOrderDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
 
+const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
+    pullRefreshRef.value?.refresh()
+})
+
 const { data: detail } = useRequest(queryPresaleDefault, {
     params: {
         goodsid,

+ 1 - 1
src/packages/mobile/views/transfer/delisting/components/delisting/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-modal direction="right" height="100%" v-model:show="showModal">
+    <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
                 <app-navbar title="买入" @back="closed" />

+ 8 - 4
src/packages/mobile/views/transfer/detail/Index.vue

@@ -23,7 +23,7 @@
                         <span>{{ handleNumberValue(quote?.last) }}</span>
                     </li>
                     <li>
-                        <span>转让定金</span>
+                        <span>转让比例</span>
                         <span>{{ parsePercent(detail.transferdepositratio) }}</span>
                     </li>
                     <li>
@@ -76,20 +76,24 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const { getQueryStringToNumber } = useNavigation()
-const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 const { getQuoteInfo } = useFuturesStore()
 const goodsid = getQueryStringToNumber('goodsid')
 const quote = getQuoteInfo(goodsid)
 
+const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
+    getPresaleDefault()
+    getMineTradePositionExs()
+})
+
 // 获取转让详情
-const { data: detail } = useRequest(queryPresaleDefault, {
+const { data: detail, run: getPresaleDefault } = useRequest(queryPresaleDefault, {
     params: {
         goodsid,
     }
 })
 
 // 获取转让持仓
-const { dataList } = useRequest(queryMineTradePositionExs, {
+const { dataList, run: getMineTradePositionExs } = useRequest(queryMineTradePositionExs, {
     params: {
         goodsid,
     }