li.shaoyi 2 سال پیش
والد
کامیت
2f2ffc916a

+ 14 - 0
src/packages/mobile/router/index.ts

@@ -361,6 +361,20 @@ const routes: Array<RouteRecordRaw> = [
     ],
   },
   {
+    path: '/fullpayment',
+    component: Page,
+    children: [
+      {
+        path: '',
+        name: 'fullpayment-list',
+        component: () => import('../views/goods/list/Index.vue'),
+        props: {
+          marketId: 16201
+        }
+      },
+    ],
+  },
+  {
     path: '/mine',
     component: Page,
     children: [

+ 2 - 2
src/packages/mobile/views/goods/list/Index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="订单挂牌" :show-back-button="marketId === 50102" />
+            <app-navbar title="订单挂牌" :show-back-button="marketId !== 50101" />
         </template>
         <app-list :columns="columns" :data-list="futuresStore.marketGoodsList" @row-click="rowClick">
             <!-- 商品名称/代码 -->
@@ -104,7 +104,7 @@ const columns: Model.TableColumn[] = [
 
 const rowClick = (row: Model.QuoteGoodsListRsp) => {
     router.push({
-        name: 'goods-detail',
+        name: props.marketId === 16201 ? 'transfer-detail2' : 'goods-detail',
         query: {
             goodsid: row.goodsid
         }

+ 3 - 0
src/packages/mobile/views/home/main/Index.vue

@@ -16,6 +16,9 @@
           <li @click="routerTo('forward-list')">
             <Iconfont label-direction="bottom" icon="icon-dingjinzhuanrang">中远期挂牌</Iconfont>
           </li>
+          <li @click="routerTo('fullpayment-list')">
+            <Iconfont label-direction="bottom" icon="icon-a-zu771">全款挂牌</Iconfont>
+          </li>
           <!-- <li @click="switchTab(1)">
             <Iconfont label-direction="bottom" icon="icon-zhongqian">预售中签</Iconfont>
           </li> -->

+ 1 - 1
src/packages/mobile/views/home/main/index.less

@@ -20,7 +20,7 @@
                 display: flex;
                 flex-direction: column;
                 align-items: center;
-                width: calc(~'100% / 3');
+                width: calc(~'100% / 4');
                 text-align: center;
 
                 .app-iconfont {

+ 10 - 4
src/packages/mobile/views/transfer/listing/Index.vue

@@ -3,7 +3,7 @@
     <app-modal direction="right" height="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="转让" @back="closed" />
+                <app-navbar title="挂牌" @back="closed" />
             </template>
             <component :is="Price" v-bind="{ goodsCode }" />
             <component :is="Forex" v-bind="{ goodsCode, showMore: false }" @price-click="onPriceClick" />
@@ -59,7 +59,7 @@ import { fullloading, dialog } from '@/utils/vant'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradePositionExs } from '@/services/api/transfer'
 import { useOrder } from '@/business/trade'
-import { useAccountStore, useFuturesStore } from '@/stores'
+import { useAccountStore, useFuturesStore, usePositionStore } from '@/stores'
 import AppModal from '@/components/base/modal/index.vue'
 import { BuyOrSell } from '@/constants/order'
 import { EPriceMode, EValidType, EListingSelectType, EBuildType, EDelistingType } from '@/constants/client'
@@ -81,6 +81,7 @@ const props = defineProps({
 const { formData, formSubmit } = useOrder()
 const accountStore = useAccountStore()
 const futuresStore = useFuturesStore()
+const positionStore = usePositionStore()
 const formRef = shallowRef<FormInstance>()
 const refresh = shallowRef(false) // 是否刷新父组件数据
 const showModal = shallowRef(true)
@@ -129,8 +130,13 @@ const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
 
 // 可用数量
 const enableqty = computed(() => {
-    const [firstItem] = positionList.value
-    return firstItem ? firstItem.buycurpositionqty - firstItem.buyfrozenqty : 0
+    if (quote.value?.trademode === 16) {
+        const item = positionStore.positionList.find((e) => e.trademode === 16 && e.goodsid === quote.value?.goodsid)
+        return item?.enableqty ?? 0
+    } else {
+        const [firstItem] = positionList.value
+        return firstItem ? firstItem.buycurpositionqty - firstItem.buyfrozenqty : 0
+    }
 })
 
 const onPriceClick = (buyorsell: BuyOrSell, value: number) => {

+ 0 - 1
src/packages/pc/views/footer/presell/transferposition/delivery/index.vue

@@ -29,7 +29,6 @@
                 <li>
                     <span>已付定金:{{ deposit(qty).toFixed(2) }}</span>
                 </li>
-
             </ul>
         </template>
     </Delivery>

+ 2 - 2
src/packages/pc/views/market/trade/goods/list/listing/index.vue

@@ -27,11 +27,11 @@
                         <div v-if="selectedGoods">
                             <div class="row-price g-price-up">
                                 <Icon icon="Top" />
-                                <span>{{ selectedGoods.limitup }}</span>
+                                <span>{{ selectedGoods.limitup.toFixed(selectedGoods.decimalplace) }}</span>
                             </div>
                             <div class="row-price g-price-down">
                                 <Icon icon="Bottom" />
-                                <span>{{ selectedGoods.limitdown }}</span>
+                                <span>{{ selectedGoods.limitdown.toFixed(selectedGoods.decimalplace) }}</span>
                             </div>
                         </div>
                     </div>

+ 2 - 2
src/packages/pc/views/market/trade/presell/transfer/listing/index.vue

@@ -27,11 +27,11 @@
                         <div v-if="selectedGoods">
                             <div class="row-price g-price-up">
                                 <Icon icon="Top" />
-                                <span>{{ selectedGoods.limitup }}</span>
+                                <span>{{ selectedGoods.limitup.toFixed(selectedGoods.decimalplace) }}</span>
                             </div>
                             <div class="row-price g-price-down">
                                 <Icon icon="Bottom" />
-                                <span>{{ selectedGoods.limitdown }}</span>
+                                <span>{{ selectedGoods.limitdown.toFixed(selectedGoods.decimalplace) }}</span>
                             </div>
                         </div>
                     </div>