xxxxx

src/constants/client.ts

@@ -174,6 +174,8 @@ export enum ETradeMode {
     TRADEMODE_TJMD = 46,
     /// 廣陈优品-仓单预售
     TRADEMODE_CDYS = 47,
+    /// 全款
+    TRADEMODE_FULLPAYMENT = 53,
     /// 千海金-铂金宝
     TRADEMODE_QHJ_BJB = 69,
     /// 海商报业商城

src/packages/mobile/components/modules/quote/price/index.vue

@@ -60,7 +60,7 @@
                             {{ handleNumberValue(quote.highest.toFixed(quote.decimalplace)) }}
                         </span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.limitup') }}</span>
                         <span class="g-price-up">
                             {{ handleNumberValue(quote.limitup.toFixed(quote.decimalplace)) }}
@@ -78,7 +78,7 @@
                             {{ handleNumberValue(quote.lowest.toFixed(quote.decimalplace)) }}
                         </span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.limitdown') }}</span>
                         <span class="g-price-down">
                             {{ handleNumberValue(quote.limitdown.toFixed(quote.decimalplace)) }}
@@ -93,11 +93,11 @@
             </Divider>
             <div class="app-quote-price__more" v-if="quote">
                 <ul v-show="showMore">
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.bidvolume') }}</span>
                         <span>{{ handleNumberValue(quote.bidvolume) }}</span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.askvolume') }}</span>
                         <span>{{ handleNumberValue(quote.askvolume) }}</span>
                     </li>
@@ -109,7 +109,7 @@
                         <span>{{ $t('quote.ask') }}</span>
                         <span :class="quote.askColor">{{ handleNumberValue(quote.ask.toFixed(quote.decimalplace)) }}</span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.averageprice') }}</span>
                         <span :class="quote.averagepriceColor">{{
                             handleNumberValue(quote.averageprice.toFixed(quote.decimalplace)) }}</span>
@@ -118,11 +118,11 @@
                         <span>{{ $t('quote.amplitude') }}</span>
                         <span>{{ parsePercent(quote.amplitude) }}</span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.totalvolume') }}</span>
                         <span :class="quote.averagepriceColor">{{ changeUnit(quote.totalvolume) }}</span>
                     </li>
-                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE">
+                    <li v-if="quote.trademode != ETradeMode.TRADEMODE_MARKETMAKE && quote.trademode != ETradeMode.TRADEMODE_FULLPAYMENT">
                         <span>{{ $t('quote.totalturnover') }}</span>
                         <span>{{ changeUnit(quote.totalturnover) }}</span>
                     </li>

src/packages/tss/views/order/delivery/components/offline/Index.vue

@@ -2,47 +2,54 @@
 <template>
     <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="g-product-list">
+            <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-product-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodsnamedisplay }}</h4>
+                        <b>订单号：{{ item.tradeid }}</b>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderstatusdisplay }}</span>
+                        <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </b>
                     </div>
                 </div>
-                <div class="g-order-list__content">
-                    <ul>
-                        <li>
-                            <span>{{ $t('delivery.offline.buyorselldisplay') }}</span>
-                            <span>{{ item.buyorselldisplay }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
-                            <span>{{ item.deliveryqty }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
-                            <span>{{ item.deliveryinfo }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.applydate') }}</span>
-                            <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                    </ul>
+                <div class="g-product-list__content">
+                    <div class="left">
+                        <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                    </div>
+                    <div class="right">
+                        <ul>
+                            <li>
+                                <span>{{ $t('delivery.offline.buyorselldisplay') }}：</span>
+                                <span>{{ item.buyorselldisplay }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
+                                <span>{{ item.deliveryqty }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryprice') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryamount') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryinfo') }}：</span>
+                                <span>{{ item.deliveryinfo }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-                <div class="g-order-list__btnbar">
+                <!-- <div class="g-product-list__btnbar">
                     <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
-                </div>
+                </div> -->
             </div>
         </div>
     </app-pull-refresh>
@@ -50,7 +57,9 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button } from 'vant'
+import { Button, Image } from 'vant'
+import { getFileUrl } from '@/filters'
+import { getBuyOrSellName } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { useRequest } from '@/hooks/request'
@@ -103,4 +112,9 @@ const onCancel = (row: Model.MineTradeGoodsDeliveryOfflinesRsp) => {
         })
     })
 }
+
+const getImageUrl = (url: string) => {
+    const [firstImg] = url.split(',')
+    return firstImg ? getFileUrl(firstImg) : ''
+}
 </script>

src/packages/tss/views/order/delivery/components/online/Index.vue

@@ -2,45 +2,52 @@
 <template>
     <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="g-product-list">
+            <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-product-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodsnamedisplay }}</h4>
+                        <b>订单号：{{ item.tradeid }}</b>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderstatusdisplay }}</span>
+                        <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </b>
                     </div>
                 </div>
-                <div class="g-order-list__content">
-                    <ul>
-                        <li>
-                            <span>{{ $t('delivery.offline.buyorselldisplay') }}</span>
-                            <span>{{ item.buyorselldisplay }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
-                            <span>{{ item.deliveryqty }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
-                            <span>{{ item.deliveryinfo }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.applydate') }}</span>
-                            <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                    </ul>
+                <div class="g-product-list__content">
+                    <div class="left">
+                        <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                    </div>
+                    <div class="right">
+                        <ul>
+                            <li>
+                                <span>{{ $t('delivery.offline.buyorselldisplay') }}：</span>
+                                <span>{{ item.buyorselldisplay }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
+                                <span>{{ item.deliveryqty }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryprice') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryamount') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryinfo') }}：</span>
+                                <span>{{ item.deliveryinfo }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-                <div class="g-order-list__btnbar">
+                <div class="g-product-list__btnbar">
                     <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
                 </div>
             </div>
@@ -50,10 +57,12 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button } from 'vant'
+import { Button, Image } from 'vant'
+import { getBuyOrSellName } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { useRequest } from '@/hooks/request'
+import { getFileUrl } from '@/filters'
 import { queryMineTradeGoodsDeliveryOfflines } from '@/services/api/transfer'
 import { offlineDeliveryApplyCancelOrder } from '@/services/api/trade'
 import { i18n } from '@/stores'
@@ -104,4 +113,9 @@ const onCancel = (row: Model.MineTradeGoodsDeliveryOfflinesRsp) => {
         })
     })
 }
+
+const getImageUrl = (url: string) => {
+    const [firstImg] = url.split(',')
+    return firstImg ? getFileUrl(firstImg) : ''
+}
 </script>

src/packages/tss/views/order/delivery/components/spot/Index.vue

@@ -2,48 +2,52 @@
 <template>
     <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="g-product-list">
+            <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-product-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodsnamedisplay }}</h4>
+                        <b>订单号：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderstatusdisplay }}</span>
+                        <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </b>
                     </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>{{ $t('delivery.offline.buyorselldisplay') }}</span>
-                            <span>{{ item.buyorselldisplay }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
-                            <span>{{ item.deliveryqty }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
-                            <span>{{ item.deliveryinfo }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.applydate') }}</span>
-                            <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                    </ul>
+                <div class="g-product-list__content">
+                    <div class="left">
+                        <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                    </div>
+                    <div class="right">
+                        <ul>
+                            <li>
+                                <span>{{ $t('position.goodscode') }}</span>
+                                <span>{{ item.goodscode }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
+                                <span>{{ item.deliveryqty }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryprice') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryamount') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryinfo') }}：</span>
+                                <span>{{ item.deliveryinfo }}</span>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-                <div class="g-order-list__btnbar">
+                <div class="g-product-list__btnbar">
                     <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
                 </div>
             </div>
@@ -53,7 +57,8 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button } from 'vant'
+import { Button, Image } from 'vant'
+import { getBuyOrSellName } from '@/constants/order'
 import { getFileUrl } from '@/filters'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'

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

@@ -2,45 +2,52 @@
 <template>
     <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="g-product-list">
+            <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-product-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodsnamedisplay }}</h4>
+                        <b>订单号：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
-                        <span>{{ item.orderstatusdisplay }}</span>
+                        <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </b>
                     </div>
                 </div>
-                <div class="g-order-list__content">
-                    <ul>
-                        <li>
-                            <span>{{ $t('delivery.offline.buyorselldisplay') }}</span>
-                            <span>{{ item.buyorselldisplay }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryqty') }}</span>
-                            <span>{{ item.deliveryqty }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryprice') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryamount') }}</span>
-                            <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.deliveryinfo') }}</span>
-                            <span>{{ item.deliveryinfo }}</span>
-                        </li>
-                        <li>
-                            <span>{{ $t('delivery.offline.applydate') }}</span>
-                            <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
-                        </li>
-                    </ul>
+                <div class="g-product-list__content">
+                    <div class="left">
+                        <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                    </div>
+                    <div class="right">
+                        <ul>
+                            <li>
+                                <span>{{ $t('position.goodscode') }}</span>
+                                <span>{{ item.goodscode }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryqty') }}：</span>
+                                <span>{{ item.deliveryqty }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryprice') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryprice }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryamount') }}：</span>
+                                <span>{{ item.orderstatus === 1 ? '--' : item.deliveryamount }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.applydate') }}：</span>
+                                <span>{{ formatDate(item.reqtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                            <li>
+                                <span>{{ $t('delivery.offline.deliveryinfo') }}：</span>
+                                <span>{{ item.deliveryinfo }}</span>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-                <div class="g-order-list__btnbar">
+                <div class="g-product-list__btnbar">
                     <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
                 </div>
             </div>
@@ -50,10 +57,12 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button } from 'vant'
+import { Button, Image } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
+import { getFileUrl } from '@/filters'
 import { useRequest } from '@/hooks/request'
+import { getBuyOrSellName } from '@/constants/order'
 import { queryMineTradeGoodsDeliveryOfflines } from '@/services/api/transfer'
 import { offlineDeliveryApplyCancelOrder } from '@/services/api/trade'
 import { i18n } from '@/stores'
@@ -103,4 +112,9 @@ const onCancel = (row: Model.MineTradeGoodsDeliveryOfflinesRsp) => {
         })
     })
 }
+
+const getImageUrl = (url: string) => {
+    const [firstImg] = url.split(',')
+    return firstImg ? getFileUrl(firstImg) : ''
+}
 </script>

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

@@ -1,65 +1,68 @@
 <template>
     <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="g-product-list">
+            <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
+                <div class="g-product-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>
+                        <b>订单号：{{ item.tradeid }}</b>
+                    </div>
+                    <div class="right">
+                        <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
+                            {{ getBuyOrSellName(item.buyorsell) }}
+                        </b>
                     </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 class="g-product-list__content">
+                    <div class="left">
+                        <Image width="100" height="100" radius="4" :src="getImageUrl(item.thumurls)" />
+                    </div>
+                    <div class="right">
+                        <ul>
+                            <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>
             </div>
         </div>
@@ -68,10 +71,11 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { Image } from 'vant'
 import { formatDecimal, handlePriceColor } from '@/filters'
-import { BuyOrSell } from '@/constants/order'
 import { getFileUrl } from '@/filters'
 import { getGoodsUnitName } from '@/constants/unit'
+import { getBuyOrSellName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryTradeHolderDetailEx } from '@/services/api/order'
 import { useGlobalStore } from '@/stores'

src/packages/tss/views/product/list/components/waterfall-list/index.vue

@@ -9,7 +9,7 @@
                 <div class="goods-info">
                     <div class="goods-info__title">{{ item.goodscode }}</div>
                     <div class="goods-info__price">
-                        <span :class="['integer', item.askColor]">{{ handleNumberValue(item.ask) }}</span>
+                        <span :class="['integer', item.askColor]">{{ handleNumberValue(formatDecimal(item.ask)) }}</span>
                     </div>
                 </div>
             </div>
@@ -20,7 +20,7 @@
 <script lang="ts" setup>
 import { PropType } from 'vue'
 import { Image } from 'vant'
-import { getFileUrl, handleNumberValue } from '@/filters'
+import { formatDecimal, getFileUrl, handleNumberValue } from '@/filters'
 import { useNavigation } from '@mobile/router/navigation'
 import { BuyOrSell, BuildType } from '@/constants/order'
 import Waterfall from '@mobile/components/base/waterfall/index.vue'