update

src/packages/mobile/views/mine/order/detail/purchasetrade/index.vue

@@ -13,7 +13,7 @@
                 <Cell title="每吨预付金" :value="handleNumberValue(detail.transferprice.toFixed(2), '元')" />
                 <Cell title="交收结算价" :value="handleNumberValue(detail.lastprice.toFixed(2), '元')" />
                 <Cell title="尾款" :value="handleNumberValue(detail.remainamount.toFixed(2), '元')" />
-                <Cell title="尾款支付截止日" value="若河钢招标价晚于交收月10号，待公布后顺延2个自然日付款" />
+                <Cell title="尾款支付截止日" label="若河钢招标价晚于交收月10号，待公布后顺延2个自然日付款" />
                 <Cell title="状态" :value="detail.thjorderstatusdisplay" />
                 <Cell title="采购时间" :value="formatDate(detail.tradetime)" />
                 <Cell title="合同转让截止日" :value="detail.enddate" />
@@ -29,7 +29,7 @@
                         <div style="white-space: pre-line">{{ detail.receiptinfo }}</div>
                     </template>
                 </Cell>
-                <Cell title="合同单号" :value="detail.wrtradedetailid" :is-link="!!detail.contractaddrbuy"
+                <Cell title="电子合同" :value="detail.wrtradedetailid" :is-link="!!detail.contractaddrbuy"
                     @click="openPDF(detail?.contractaddrbuy)" />
             </CellGroup>
             <CellGroup title="点价信息"

src/packages/mobile/views/mine/order/detail/transfer/index.vue

@@ -7,10 +7,10 @@
             <CellGroup title="转让信息">
                 <Cell title="商品" :value="details.wrstandardname" />
                 <Cell title="参考价" :value="details.tradeprice.toFixed(2) + '元/吨'" />
-                <Cell title="转让价格" :value="details.transferprice.toFixed(2) + '元'" />
+                <Cell title="每吨转让金额" :value="details.transferprice.toFixed(2) + '元'" />
                 <Cell title="数量" :value="details.transferqty + '吨'" />
-                <Cell title="转让金额" :value="details.transferamount.toFixed(2) + '元'" />
-                <Cell title="预付款(含定金)" :value="handleNumberValue(details.payeddeposit.toFixed(2), '元')" />
+                <Cell title="转让总金额" :value="details.transferamount.toFixed(2) + '元'" />
+                <Cell title="总预付款(含定金)" :value="handleNumberValue(details.payeddeposit.toFixed(2), '元')" />
                 <Cell title="付款比例" :value="parsePercent(details.depositrate)" />
                 <Cell title="状态" :value="getTHJTransferStatusName(details.transferstatus)" />
                 <Cell title="转让时间" :value="formatDate(details.createtime)" />
@@ -26,7 +26,7 @@
                         <div style="white-space: pre-line">{{ details.receiptinfo }}</div>
                     </template>
                 </Cell>
-                <Cell title="合同单号" :value="details.transferid" :is-link="!!details.contractaddr"
+                <Cell title="电子合同" :value="details.transferid" :is-link="!!details.contractaddr"
                     @click="openPDF(details?.contractaddr)" />
             </CellGroup>
             <CellGroup title="点价信息" v-if="details.pointflag && loginStore.userId === details.firstbuyuserid">

src/packages/mobile/views/mine/order/detail/wrorder/index.vue

@@ -9,7 +9,7 @@
                 <Cell title="仓库" :value="detail.warehousename" />
                 <Cell title="类型" :value="detail.wrtradetype === 1 ? '挂牌' : '摘牌'" />
                 <Cell title="方向" :value="getBuyOrSellName(detail.buyorsell)" />
-                <Cell title="委托价格" :value="detail.fixedprice.toFixed(2) + '元'" />
+                <Cell title="委托价格" :value="detail.fixedprice.toFixed(2) + '元/吨'" />
                 <Cell title="挂牌数量" :value="detail.orderqty + '吨'" />
                 <Cell title="撤销数量" :value="detail.cancelqty + '吨'" />
                 <Cell title="委托时间" :value="formatDate(detail.ordertime)" />

src/packages/mobile/views/mine/order/detail/wrtrade/index.vue

@@ -9,12 +9,12 @@
                 <Cell title="仓库" :value="detail.warehousename" />
                 <Cell title="类型" :value="detail.wrtradetype === 1 ? '挂牌' : '摘牌'" />
                 <Cell title="方向" :value="getBuyOrSellName(detail.buyorsell)" />
-                <Cell title="成交价格" :value="detail.tradeprice.toFixed(2) + '元'" />
+                <Cell title="成交价格" :value="detail.tradeprice.toFixed(2) + '元/吨'" />
                 <Cell title="成交数量" :value="detail.tradeqty + '吨'" />
                 <Cell title="成交金额" :value="(detail.tradeprice * detail.tradeqty).toFixed(2) + '元'" />
                 <Cell title="成交时间" :value="formatDate(detail.tradetime)" />
                 <Cell title="对手方" :value="detail.matchusername" />
-                <Cell title="成交单号" :value="detail.wrtradedetailid" :is-link="!!detail.contractaddr"
+                <Cell title="电子合同" :value="detail.wrtradedetailid" :is-link="!!detail.contractaddr"
                     @click="openPDF(detail?.contractaddr)" />
             </CellGroup>
         </div>

src/packages/mobile/views/mine/order/his/purchasetrade/index.vue

@@ -5,44 +5,54 @@
         </template>
         <app-pull-refresh class="order-list__wrapper" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
-                            <span>{{ item.enddatemonth }}</span>
-                            <span>{{ parsePercent(item.depositrate) }}</span>
-                            <span>{{ item.tradeqty }}{{ getGoodsUnitName(item.unitid) }}</span>
+                            <h4>
+                                {{ item.wrstandardname }}
+                                {{ item.enddatemonth }} /
+                                {{ parsePercent(item.depositrate) }} /
+                                {{ item.tradeqty }}{{ getGoodsUnitName(item.unitid) }}
+                            </h4>
                         </div>
                         <div class="right">
                             <span>{{ item.thjorderstatusdisplay }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>定金</th>
-                                <td>{{ handleNumberValue(item.payeddeposit, '元') }}</td>
-                                <th>参考价</th>
-                                <td>{{ handleNumberValue(item.tradeprice, '元/' + getGoodsUnitName(item.unitid)) }}</td>
-                                <th>到期日</th>
-                                <td>{{ item.enddate }}</td>
-                            </tr>
-                            <tr>
-                                <th>购买价</th>
-                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
-                                <th>实际价</th>
-                                <td>{{ handleNumberValue(item.lastprice, '元') }}</td>
-                                <th>尾款</th>
-                                <td>{{ handleNumberValue(item.remainamount, '元') }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>定金</span>
+                                <span>{{ handleNumberValue(item.payeddeposit, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>参考价</span>
+                                <span>{{ handleNumberValue(item.tradeprice, '元/' + getGoodsUnitName(item.unitid)) }}</span>
+                            </li>
+                            <li>
+                                <span>到期日</span>
+                                <span>{{ item.enddate }}</span>
+                            </li>
+                            <li>
+                                <span>购买价</span>
+                                <span>{{ handleNumberValue(item.transferprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>实际价</span>
+                                <span>{{ handleNumberValue(item.lastprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>尾款</span>
+                                <span>{{ handleNumberValue(item.remainamount, '元') }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>

src/packages/mobile/views/mine/order/his/transfer/index.vue

@@ -5,41 +5,45 @@
         </template>
         <app-pull-refresh class="order-list__wrapper" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
                             <span>{{ item.transferid }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>交收月份</th>
-                                <td>{{ item.enddatemonth }}</td>
-                                <th>交易日</th>
-                                <td>{{ item.tradedate }}</td>
-                            </tr>
-                            <tr>
-                                <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
-                                <th>数量</th>
-                                <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
-                            </tr>
-                            <tr>
-                                <th>委托时间</th>
-                                <td colspan="3">{{ item.createtime }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>交收月份</span>
+                                <span>{{ item.enddatemonth }}</span>
+                            </li>
+                            <li>
+                                <span>交易日</span>
+                                <span>{{ item.tradedate }}</span>
+                            </li>
+                            <li>
+                                <span>每吨转让金额</span>
+                                <span>{{ handleNumberValue(item.transferprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>数量</span>
+                                <span>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</span>
+                            </li>
+                            <li>
+                                <span>委托时间</span>
+                                <span>{{ formatDate(item.createtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -50,7 +54,7 @@ import { shallowRef } from 'vue'
 import { Button } from 'vant'
 import { useNavigation } from '@/hooks/navigation'
 import { getGoodsUnitName } from '@/constants/unit'
-import { handleNumberValue } from '@/filters'
+import { handleNumberValue, formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryTHJPurchaseTransferOrder } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'

src/packages/mobile/views/mine/order/his/wrorder/index.vue

@@ -6,37 +6,41 @@
         <Cell title="委托日期" :value="date" @click="show = true" is-link></Cell>
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"
             v-model:pageIndex="pageIndex" v-model:error="error" :page-count="pageCount" @refresh="onRefresh">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
                             <span>{{ getWRTradeOrderStatusName(item.wrtradeorderstatus) }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>挂牌数量</th>
-                                <td>{{ item.orderqty }}吨</td>
-                                <th>挂牌价格</th>
-                                <td>{{ item.fixedprice }}元</td>
-                                <th>成交数量</th>
-                                <td>{{ item.tradeqty }}吨</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ handleNoneValue(item.warehousename) }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>挂牌数量</span>
+                                <span>{{ item.orderqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>挂牌价格</span>
+                                <span>{{ item.fixedprice }}元/吨</span>
+                            </li>
+                            <li>
+                                <span>成交数量</span>
+                                <span>{{ item.tradeqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ handleNoneValue(item.warehousename) }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
         <Calendar :show="show" type="range" :max-date="new Date()" :min-date="moment().subtract(1, 'years').toDate()"
             @close="onClose" @confirm="onConfirm" />

src/packages/mobile/views/mine/order/his/wrtrade/index.vue

@@ -6,38 +6,44 @@
         <Cell title="成交日期" :value="date" @click="show = true" is-link></Cell>
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"
             v-model:pageIndex="pageIndex" :page-count="pageCount" v-model:error="error" @refresh="onRefresh">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
-                            <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <h4>
+                                {{ item.wrstandardname }}
+                                {{ getBuyOrSellName(item.buyorsell) }}
+                            </h4>
                         </div>
                         <div class="right">
                             <span>{{ formatDate(item.tradetime) }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>挂牌数量</th>
-                                <td>{{ item.tradeqty }}吨</td>
-                                <th>成交价格</th>
-                                <td>{{ item.tradeprice }}元</td>
-                                <th>金额</th>
-                                <td>{{ item.tradeqty }}元</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ handleNoneValue(item.warehousename) }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>挂牌数量</span>
+                                <span>{{ item.tradeqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>成交价格</span>
+                                <span>{{ item.tradeprice }}元/吨</span>
+                            </li>
+                            <li>
+                                <span>成交金额</span>
+                                <span>{{ (item.tradeqty * item.tradeprice).toFixed(2) }}元</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ handleNoneValue(item.warehousename) }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
         <Calendar :show="show" type="range" :max-date="new Date()" :min-date="moment().subtract(1, 'years').toDate()"
             @close="onClose" @confirm="onConfirm" />

src/packages/mobile/views/mine/order/list/components/purchasetrade/index.vue

@@ -20,28 +20,28 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>预付款</span>
-                            <span>{{ handleNumberValue(item.payeddeposit) }}元</span>
+                            <span>总预付款</span>
+                            <span>{{ handleNumberValue(item.payeddeposit, '元') }}</span>
                         </li>
                         <li>
                             <span>参考价</span>
-                            <span>{{ handleNumberValue(item.tradeprice) }}元/{{ getGoodsUnitName(item.unitid) }}</span>
+                            <span>{{ handleNumberValue(item.tradeprice, '元/' + getGoodsUnitName(item.unitid)) }}</span>
                         </li>
                         <li>
                             <span>到期日</span>
                             <span>{{ item.enddate }}</span>
                         </li>
                         <li>
-                            <span>购买价</span>
-                            <span>{{ handleNumberValue(item.transferprice) }}元/{{ getGoodsUnitName(item.unitid) }}</span>
+                            <span>每吨预付金</span>
+                            <span>{{ handleNumberValue(item.transferprice, '元/' + getGoodsUnitName(item.unitid)) }}</span>
                         </li>
                         <li>
-                            <span>实际价</span>
-                            <span>{{ handleNumberValue(item.lastprice) }}</span>
+                            <span>交收结算价</span>
+                            <span>{{ handleNumberValue(item.lastprice, '元') }}</span>
                         </li>
                         <li>
                             <span>尾款</span>
-                            <span>{{ handleNumberValue(item.remainamount) }}</span>
+                            <span>{{ handleNumberValue(item.remainamount, '元') }}</span>
                         </li>
                     </ul>
                 </div>

src/packages/mobile/views/mine/order/list/components/transferbuy/index.vue

@@ -3,47 +3,53 @@
     <app-view class="order-list-purchase">
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
-                            <span>{{ item.wrtradedetailid }}</span>
+                            <span>{{ item.transferid }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>交收月份</th>
-                                <td>{{ item.enddatemonth }}</td>
-                                <th>交易日</th>
-                                <td>{{ item.tradedate }}</td>
-                            </tr>
-                            <tr>
-                                <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
-                                <th>数量</th>
-                                <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
-                            </tr>
-                            <tr>
-                                <th>转让金额</th>
-                                <td>{{ handleNumberValue(item.transferamount, '元') }}</td>
-                                <th>预付款</th>
-                                <td>{{ handleNumberValue(item.tradeprice, '元') }}</td>
-                            </tr>
-                            <tr>
-                                <th>成交时间</th>
-                                <td>{{ item.transfertradetime }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>交收月份</span>
+                                <span>{{ item.enddatemonth }}</span>
+                            </li>
+                            <li>
+                                <span>交易日</span>
+                                <span>{{ item.tradedate }}</span>
+                            </li>
+                            <li>
+                                <span>每吨转让金额</span>
+                                <span>{{ handleNumberValue(item.transferprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>数量</span>
+                                <span>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</span>
+                            </li>
+                            <li>
+                                <span>转让总金额</span>
+                                <span>{{ handleNumberValue(item.transferamount, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>总预付款</span>
+                                <span>{{ handleNumberValue(item.tradeprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>成交时间</span>
+                                <span>{{ formatDate(item.transfertradetime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -53,7 +59,7 @@ import { shallowRef, onActivated } from 'vue'
 import { Button } from 'vant'
 import { useNavigation } from '@/hooks/navigation'
 import { getGoodsUnitName } from '@/constants/unit'
-import { handleNumberValue } from '@/filters'
+import { handleNumberValue, formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryTHJPurchaseTransferOrder } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'

src/packages/mobile/views/mine/order/list/components/transfersell/index.vue

@@ -3,41 +3,45 @@
     <app-view class="order-list-purchase">
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
                             <span>{{ item.transferid }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>交收月份</th>
-                                <td>{{ item.enddatemonth }}</td>
-                                <th>交易日</th>
-                                <td>{{ item.tradedate }}</td>
-                            </tr>
-                            <tr>
-                                <th>转让价格</th>
-                                <td>{{ handleNumberValue(item.transferprice, '元') }}</td>
-                                <th>数量</th>
-                                <td>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</td>
-                            </tr>
-                            <tr>
-                                <th>委托时间</th>
-                                <td colspan="3">{{ item.createtime }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>交收月份</span>
+                                <span>{{ item.enddatemonth }}</span>
+                            </li>
+                            <li>
+                                <span>交易日</span>
+                                <span>{{ item.tradedate }}</span>
+                            </li>
+                            <li>
+                                <span>每吨转让金额</span>
+                                <span>{{ handleNumberValue(item.transferprice, '元') }}</span>
+                            </li>
+                            <li>
+                                <span>数量</span>
+                                <span>{{ item.transferqty.toString() + getGoodsUnitName(item.unitid) }}</span>
+                            </li>
+                            <li>
+                                <span>委托时间</span>
+                                <span>{{ formatDate(item.createtime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -48,7 +52,7 @@ import { shallowRef, onActivated } from 'vue'
 import { Button } from 'vant'
 import { useNavigation } from '@/hooks/navigation'
 import { getGoodsUnitName } from '@/constants/unit'
-import { handleNumberValue } from '@/filters'
+import { handleNumberValue, formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryTHJPurchaseTransferOrder } from '@/services/api/order'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'

src/packages/mobile/views/mine/order/list/components/wrorder/index.vue

@@ -3,41 +3,45 @@
     <app-view class="wrorderdetail">
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"
             v-model:pageIndex="pageIndex" v-model:error="error" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
                             <span>{{ getWRTradeOrderStatusName(item.wrtradeorderstatus) }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>挂牌数量</th>
-                                <td>{{ item.orderqty }}吨</td>
-                                <th>挂牌价格</th>
-                                <td>{{ item.fixedprice }}元</td>
-                                <th>成交数量</th>
-                                <td>{{ item.tradeqty }}吨</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ handleNoneValue(item.warehousename) }}</td>
-                            </tr>
-                            <tr>
-                                <th>委托时间</th>
-                                <td colspan="5">{{ item.ordertime }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>挂牌数量</span>
+                                <span>{{ item.orderqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>挂牌价格</span>
+                                <span>{{ item.fixedprice }}元/吨</span>
+                            </li>
+                            <li>
+                                <span>成交数量</span>
+                                <span>{{ item.tradeqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ handleNoneValue(item.warehousename) }}</span>
+                            </li>
+                            <li>
+                                <span>委托时间</span>
+                                <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -45,7 +49,7 @@
 <script lang="ts" setup>
 import { shallowRef, onActivated } from 'vue'
 import { Button } from 'vant'
-import { handleNoneValue } from '@/filters'
+import { handleNoneValue, formatDate } from '@/filters'
 import { getWRTradeOrderStatusName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryWrOrderDetail } from '@/services/api/order'

src/packages/mobile/views/mine/order/list/components/wrtrade/index.vue

@@ -3,38 +3,44 @@
     <app-view class="wrtradedetail">
         <app-pull-refresh ref="pullRefreshRef" class="order-list__wrapper" v-model:loading="loading"
             v-model:pageIndex="pageIndex" :page-count="pageCount" v-model:error="error" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
-                            <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <h4>
+                                {{ item.wrstandardname }}
+                                {{ getBuyOrSellName(item.buyorsell) }}
+                            </h4>
                         </div>
                         <div class="right">
                             <span>{{ formatDate(item.tradetime) }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>挂牌数量</th>
-                                <td>{{ item.tradeqty }}吨</td>
-                                <th>成交价格</th>
-                                <td>{{ item.tradeprice }}元</td>
-                                <th>金额</th>
-                                <td>{{ item.tradeqty }}元</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ handleNoneValue(item.warehousename) }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>挂牌数量</span>
+                                <span>{{ item.tradeqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>成交价格</span>
+                                <span>{{ item.tradeprice }}元/吨</span>
+                            </li>
+                            <li>
+                                <span>成交金额</span>
+                                <span>{{ (item.tradeqty * item.tradeprice).toFixed(2) }}元</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ handleNoneValue(item.warehousename) }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" @click="onClick(item)" round>详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>

src/packages/mobile/views/mine/wareorder/components/listing/index.vue

@@ -18,22 +18,21 @@
                     </Field>
                     <Field label="参考价格">
                         <template #input>
-                            {{ selectedRow.spotgoodsprice }}
+                            {{ selectedRow.spotgoodsprice }}元/吨
                         </template>
                     </Field>
-                    <Field name="Price" label="挂牌价格" v-model="formData.FixedPrice" placeholder="请输入挂牌价格"
+                    <Field name="Price" label="挂牌价格(元)" v-model="formData.FixedPrice" placeholder="请输入挂牌价格"
                         :rules="formRules.FixedPrice" />
                     <Field label="可用数量">
                         <template #input>
-                            {{ selectedRow.enableqty }}
+                            {{ selectedRow.enableqty }}吨
                         </template>
                     </Field>
-                    <Field name="Qty" label="挂牌数量" v-model="formData.OrderQty" placeholder="请输入挂牌数量"
+                    <Field name="Qty" label="挂牌数量(吨)" v-model="formData.OrderQty" placeholder="请输入挂牌数量"
                         :rules="formRules.OrderQty" />
-
                     <Field label="货款金额">
                         <template #input>
-                            {{ amount }}
+                            {{ amount }}元
                         </template>
                     </Field>
                 </CellGroup>

src/packages/mobile/views/mine/wareorder/components/pickup/index.vue

@@ -17,7 +17,7 @@
                                 {{ selectedRow.warehousename }}
                             </template>
                         </Field>
-                        <Field name="OrderQty" label="提货数量" v-model="orderQty" placeholder="请输入提货数量"
+                        <Field name="OrderQty" label="提货数量(吨)" v-model="orderQty" placeholder="请输入提货数量"
                             :rules="formRules.orderQty" />
                         <Field label="提货方式" readonly>
                             <template #input>

src/packages/mobile/views/mine/wareorder/list/components/holdlb/index.vue

@@ -2,35 +2,39 @@
     <app-view class="wareorder-list-purchase">
         <app-pull-refresh ref="pullRefreshRef" class="wareorder-list__wrapper" v-model:loading="loading"
             v-model:error="error" v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>库存</th>
-                                <td>{{ item.qty }}</td>
-                                <th>冻结</th>
-                                <td>{{ item.freezerqty }}</td>
-                                <th>可用</th>
-                                <td>{{ item.enableqty }}</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ item.warehousename }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>库存</span>
+                                <span>{{ item.qty }}吨</span>
+                            </li>
+                            <li>
+                                <span>冻结</span>
+                                <span>{{ item.freezerqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>可用</span>
+                                <span>{{ item.enableqty }}吨</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ item.warehousename }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" round @click="listing(item)">挂牌</Button>
                         <Button size="small" round @click="pickup(item)">提货</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
         <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
             v-if="componentId" />

src/packages/mobile/views/mine/wareorder/list/components/wroutinapply/index.vue

@@ -2,37 +2,41 @@
     <app-view class="wareorder-list-purchase">
         <app-pull-refresh class="wareorder-list__wrapper" v-model:loading="loading" v-model:error="error"
             v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">
-            <ul class="section">
-                <li class="section-item" v-for="(item, index) in dataList" :key="index">
-                    <div class="section-item__titlebar">
+            <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">
-                            <span>{{ item.wrstandardname }}</span>
+                            <h4>{{ item.wrstandardname }}</h4>
                         </div>
                         <div class="right">
                             <span>{{ getApplyStatusName(item.applystatus) }}</span>
                         </div>
                     </div>
-                    <div class="section-item__content">
-                        <table cellspacing="0" cellpadding="0">
-                            <tr>
-                                <th>数量</th>
-                                <td>{{ item.qty }}</td>
-                                <th>类型</th>
-                                <td>{{ item.appointmentmodeldisplay }}</td>
-                                <th>申请时间</th>
-                                <td>{{ item.applytime }}</td>
-                            </tr>
-                            <tr>
-                                <th>仓库</th>
-                                <td colspan="5">{{ item.warehousename }}</td>
-                            </tr>
-                        </table>
+                    <div class="g-order-list__content">
+                        <ul>
+                            <li>
+                                <span>数量</span>
+                                <span>{{ item.qty }}吨</span>
+                            </li>
+                            <li>
+                                <span>类型</span>
+                                <span>{{ item.appointmentmodeldisplay }}</span>
+                            </li>
+                            <li>
+                                <span>申请时间</span>
+                                <span>{{ formatDate(item.applytime, 'YYYY-MM-DD') }}</span>
+                            </li>
+                            <li>
+                                <span>仓库</span>
+                                <span>{{ item.warehousename }}</span>
+                            </li>
+                        </ul>
                     </div>
-                    <div class="section-item__btnbar">
+                    <div class="g-order-list__btnbar">
                         <Button size="small" round @click="onClick(item)">详情</Button>
                     </div>
-                </li>
-            </ul>
+                </div>
+            </div>
         </app-pull-refresh>
     </app-view>
 </template>
@@ -40,6 +44,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { Button } from 'vant'
+import { formatDate } from '@/filters'
 import { useNavigation } from '@/hooks/navigation'
 import { useRequest } from '@/hooks/request'
 import { queryWrOutInApply } from '@/services/api/order'

src/packages/mobile/views/mine/wareorder/wroutinapplydetail/index.vue

@@ -7,7 +7,7 @@
             <CellGroup title="提货信息">
                 <Cell title="商品" :value="detail.wrstandardname" />
                 <Cell title="仓库" :value="detail.warehousename" />
-                <Cell title="提货数量" :value="detail.qty" />
+                <Cell title="提货数量" :value="detail.qty + '吨'" />
                 <Cell title="提货方式" :value="detail.appointmentmodeldisplay" />
                 <Cell title="联系人" :value="detail.contactname" />
                 <Cell title="联系方式" :value="detail.contactnum" />
@@ -43,4 +43,6 @@ if (item) {
 }
 </script>
 
-<style lang="less">@import './index.less';</style>
+<style lang="less">
+@import './index.less';
+</style>

src/packages/mobile/views/purchase/detail/index.vue

@@ -36,10 +36,10 @@
                 </Field>
                 <Field label="剩余数量" v-if="selectedDate">
                     <template #input>
-                        <span>{{ maxQty.toString() + ' ' + getGoodsUnitName(goodsinfo.unitid) }}</span>
+                        <span>{{ maxQty.toString() + getGoodsUnitName(goodsinfo.unitid) }}</span>
                     </template>
                 </Field>
-                <Field v-model="formData.Qty" name="Qty" type="digit" label="采购数量" :rules="formRules.Qty">
+                <Field v-model="formData.Qty" name="Qty" type="digit" label="采购数量(吨)" :rules="formRules.Qty">
                     <template #input>
                         <div class="form-qty">
                             <div class="form-qty__input">
@@ -50,7 +50,7 @@
                 </Field>
                 <Field label="总预付款(含定金)" name="PreAmount" :rules="formRules.PreAmount" v-if="selectedDate">
                     <template #input>
-                        <span style="color:#999">{{ `${totalAmount.toFixed(2)}(≤${accountStore.avaiableMoney.toFixed(2)}元)`
+                        <span style="color:#999">{{ `${totalAmount.toFixed(2)}元(≤${accountStore.avaiableMoney.toFixed(2)}元)`
                         }}</span>
                     </template>
                 </Field>

src/packages/mobile/views/supply-demand/detail/index.vue

@@ -19,7 +19,7 @@
                     <tr>
                         <td>
                             <span>卖价:</span>
-                            <span>{{ quoteItem.sellprice }}元</span>
+                            <span>{{ quoteItem.sellprice }}元/吨</span>
                         </td>
                         <td>
                             <span>卖量:</span>
@@ -35,7 +35,7 @@
                     <tr>
                         <td>
                             <span>买价:</span>
-                            <span>{{ quoteItem.buyprice }}元</span>
+                            <span>{{ quoteItem.buyprice }}元/吨</span>
                         </td>
                         <td>
                             <span>买量:</span>
@@ -118,7 +118,7 @@ const { dataList: sellList, getOrderQuoteList: getOrderSellList } = useOrderQuot
 const columns: Model.TableColumn[] = [
     { prop: 'username', label: '挂牌方' },
     { prop: 'orderqty', label: '数量(吨)' },
-    { prop: 'fixedprice', label: '价格(元)' },
+    { prop: 'fixedprice', label: '价格(元/吨)' },
     { prop: 'operate', label: '操作' },
 ]