xxxx

src/packages/mobile/views/pricing/trade/v2/Index.vue

@@ -174,25 +174,25 @@ const components = [
         component: defineAsyncComponent(() => import('../images/Index.vue')),
         show: pictureurl.value != ''
     },
-    {
-        name: 'cancel',
-        title: t('quote.pricing.ordercancel'),
-        component: defineAsyncComponent(() => import('../components/cancel/Index.vue')),
-        show: true
-    },
-    {
-        name: 'position',
-        title: t('quote.pricing.position'),
-        component: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/list/Index.vue')),
-        show: true
-    },
-    {
-        name: 'holdlb2',
-        title: t('quote.pricing.orderdetails'),
-        component: defineAsyncComponent(() => import('../holdlb2/Index.vue')),
-        detail: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/Index.vue')),
-        show: true
-    }
+    // {
+    //     name: 'cancel',
+    //     title: t('quote.pricing.ordercancel'),
+    //     component: defineAsyncComponent(() => import('../components/cancel/Index.vue')),
+    //     show: true
+    // },
+    // {
+    //     name: 'position',
+    //     title: t('quote.pricing.position'),
+    //     component: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/list/Index.vue')),
+    //     show: true
+    // },
+    // {
+    //     name: 'holdlb2',
+    //     title: t('quote.pricing.orderdetails'),
+    //     component: defineAsyncComponent(() => import('../holdlb2/Index.vue')),
+    //     detail: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/Index.vue')),
+    //     show: true
+    // }
 ]
     
 const componentMap = new Map<string, unknown>([

src/packages/tss/views/order/list/prepayment/Index.vue

@@ -1,75 +1,69 @@
 <template>
-    <app-view>
-        <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
+    <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <div class="g-order-list">
-                <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
-                    <div class="g-order-list__titlebar">
-                        <div class="left">
-                            <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
-                                {{ item.buyorsell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
-                                {{ item.goodscode + '/' + item.goodsname }}
-                                {{ formatDecimal(item.openprice, item.decimalplace) }}
-                            </h4>
-                        </div>
-                    </div>
-                    <div class="g-order-list__content">
-                        <ul>
-                            <li class="left">
-                                <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
-                            </li>
-                            <li>
-                                <span>订单重量</span>
-                                <span>
-                                    {{ item.openqty * item.agreeunit }}
-                                    {{ getGoodsUnitName(item.goodunitid) }}
-                                </span>
-                            </li>
-                            <li>
-                                <span>交收重量</span>
-                                <span>{{ (item.deliveryqty * item.agreeunit) + getGoodsUnitName(item.goodunitid)
-                                    }}</span>
-                            </li>
-                            <li>
-                                <span>可用重量</span>
-                                <span>
-                                    {{ enableqty(item) + getGoodsUnitName(item.goodunitid) }}
-                                </span>
-                            </li>
-                            <!-- <li>
-                                <span>订单金额</span>
-                                <span>{{ item.tradeamount }}</span>
-                            </li> -->
-                            <li>
-                                <span>订单价格</span>
-                                <span>{{ formatDecimal(item.openprice, item.decimalplace) }}</span>
-                            </li>
-                            <li>
-                                <span>已付定金</span>
-                                <span>{{ item.payeddeposit }}</span>
-                            </li>
-                            <li>
-                                <span>终止结余</span>
-                                <span :class="handlePriceColor(item.closepl)">{{ item.closepl }}</span>
-                            </li>
-                            <li v-if="riskType === 1">
-                                <span>已补定金</span>
-                                <span>{{ item.restockdeposit }}</span>
-                            </li>
-                            <li>
-                                <span>订单天数</span>
-                                <span>{{ item.holddays + 1 }}天</span>
-                            </li>
-                            <li>
-                                <span>滞纳金</span>
-                                <span>{{ item.callatefee }}</span>
-                            </li>
-                        </ul>
+        <div class="g-order-list">
+            <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-order-list__titlebar">
+                    <div class="left">
+                        <h4 :class="item.buyorsell === BuyOrSell.Buy ? 'g-price-up' : 'g-price-down'">
+                            {{ item.buyorsell === BuyOrSell.Buy ? '买料:' : '卖料:' }}
+                            {{ item.goodscode + '/' + item.goodsname }}
+                            {{ formatDecimal(item.openprice, item.decimalplace) }}
+                        </h4>
                     </div>
                 </div>
+                <div class="g-order-list__content">
+                    <ul>
+                        <!-- <li class="left">
+                            <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                        </li> -->
+                        <li>
+                            <span>订单重量</span>
+                            <span>
+                                {{ item.openqty * item.agreeunit }}
+                                {{ getGoodsUnitName(item.goodunitid) }}
+                            </span>
+                        </li>
+                        <li>
+                            <span>交收重量</span>
+                            <span>{{ (item.deliveryqty * item.agreeunit) + getGoodsUnitName(item.goodunitid)
+                                }}</span>
+                        </li>
+                        <li>
+                            <span>可用重量</span>
+                            <span>
+                                {{ enableqty(item) + getGoodsUnitName(item.goodunitid) }}
+                            </span>
+                        </li>
+                        <li>
+                            <span>订单价格</span>
+                            <span>{{ formatDecimal(item.openprice, item.decimalplace) }}</span>
+                        </li>
+                        <li>
+                            <span>已付定金</span>
+                            <span>{{ item.payeddeposit }}</span>
+                        </li>
+                        <li>
+                            <span>终止结余</span>
+                            <span :class="handlePriceColor(item.closepl)">{{ item.closepl }}</span>
+                        </li>
+                        <li v-if="riskType === 1">
+                            <span>已补定金</span>
+                            <span>{{ item.restockdeposit }}</span>
+                        </li>
+                        <li>
+                            <span>订单天数</span>
+                            <span>{{ item.holddays + 1 }}天</span>
+                        </li>
+                        <li>
+                            <span>滞纳金</span>
+                            <span>{{ item.callatefee }}</span>
+                        </li>
+                    </ul>
+                </div>
             </div>
-        </app-pull-refresh>
-    </app-view>
+        </div>
+    </app-pull-refresh>
 </template>
 
 <script lang="ts" setup>
@@ -98,7 +92,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeHolderDetail
         if (pageIndex.value === 1) {
             dataList.value = []
         }
-        dataList.value.filter(e => e.holderqty === 0).push(...res.data)
+        dataList.value.push(...res.data.filter(e => e.holderqty === 0))
     },
     onError: () => {
         error.value = true