xxxxx

src/packages/mobile/views/order/delivery/components/offline/detail/Index.vue

@@ -7,7 +7,7 @@
             </template>
             <div class="g-form__container">
                 <CellGroup title="线下交收单信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode+'/'+selectedRow.goodsnamedisplay" />
+                    <Cell title="商品代码/名称" :value="selectedRow.goodsnamedisplay" />
                     <Cell title="交收方向" :value="selectedRow.buyorselldisplay" />
                     <Cell title="交收数量" :value="selectedRow.deliveryqty" />
                     <Cell title="交收价格" :value="selectedRow.deliveryprice" />

src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue

@@ -50,8 +50,9 @@ const onCancelSumit = () => {
         message: '确认要撤销吗？',
         showCancelButton: true,
     }).then(() => {
+        const { marketid, goodsid } = props.selectedRow
         /// 市场ID
-        formData.Header = { MarketID: props.selectedRow.marketid }
+        formData.Header = { MarketID: marketid, GoodsID: goodsid }
         formData.OldOrderId = props.selectedRow.orderid
 
         /// loding....

src/packages/mobile/views/order/list/components/transferorder/detail/Index.vue

@@ -26,7 +26,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, PropType } from 'vue'
-import { CellGroup, Cell } from 'vant'
+import { CellGroup, Cell, Button } from 'vant'
 import AppModal from '@/components/base/modal/index.vue'
 import { getOrderStatusName } from '@/constants/order'
 import { dialog, fullloading } from '@/utils/vant'

src/packages/mobile/views/order/position/components/presale/detail/Index.vue

@@ -14,7 +14,7 @@
                     <Cell title="认购数量" :value="selectedRow.tradeqty" />
                     <Cell title="预售价" :value="selectedRow.openprice" />
                     <Cell title="总货款" :value="selectedRow.tradeamount" />
-                    <Cell title="转让定金比例" :value="selectedRow.transferdepositratio" />
+                    <Cell title="转让定金比例" :value="parsePercent(selectedRow.transferdepositratio)" />
                     <Cell title="转让订金" :value="selectedRow.transferdeposit" />
                     <Cell title="未付订金" :value="selectedRow.depositremain" />
                     <Cell title="支付状态" :value="getPayStatusName(selectedRow.paystatus)" />
@@ -29,7 +29,7 @@
 import { shallowRef, PropType } from 'vue'
 import { CellGroup, Cell } from 'vant'
 import AppModal from '@/components/base/modal/index.vue'
-import { formatDate } from '@/filters'
+import { formatDate, parsePercent } from '@/filters'
 import { getPayStatusName } from '@/constants/order'
 
 defineProps({

src/packages/mobile/views/spot/detail/Index.vue

@@ -6,7 +6,7 @@
         <Banner :data-list="topBanners" />
         <div class="g-detail__buy" v-if="quoteItem">
             <div class="title">
-                <span>{{ quoteItem.wrstandardname }}</span>
+                <span> {{ quoteItem.wrstandardcode }} / {{ quoteItem.wrstandardname }}</span>
             </div>
             <div class="info">
                 <ul>
@@ -35,7 +35,7 @@
         </div>
         <div class="trade">
             <div class="trade-section sell" v-if="sellList.length">
-                <Cell title="卖价" />
+                <Cell title="卖出挂牌" />
                 <app-list :columns="columns" :data-list="sellList">
                     <template #operate="{ row }">
                         <Button size="small" round @click="delistingListing(row, BuyOrSell.Buy)">买入</Button>
@@ -43,7 +43,7 @@
                 </app-list>
             </div>
             <div class="trade-section buy" v-if="buyList.length">
-                <Cell title="买价" />
+                <Cell title="买入挂牌" />
                 <app-list :columns="columns" :data-list="buyList">
                     <template #operate="{ row }">
                         <Button size="small" round @click="delistingListing(row, BuyOrSell.Sell)">卖出</Button>
@@ -57,16 +57,16 @@
             </template>
         </div>
         <template #footer>
-            <div class="g-detail__footer">
-                <div class="price" v-if="quoteItem">
+            <div class="g-form__footer">
+                <!-- <div class="price" v-if="quoteItem">
                     <span class="price-text">参考价：</span>
                     <span class="price-unit">￥</span>
                     <span class="price-integer">{{ quoteItem.spotgoodsprice }}</span>
-                </div>
-                <div class="submit">
-                    <span class="submit-button warning" @click="toggleListing(BuyOrSell.Sell)">我要卖</span>
-                    <span class="submit-button danger" @click="toggleListing(BuyOrSell.Buy)">我要买</span>
-                </div>
+                </div> -->
+                <!-- <div class="submit"> -->
+                    <Button block type="primary" squar class="submit-button warning" @click="toggleListing(BuyOrSell.Sell)">我要卖</Button>
+                    <Button block type="danger" squar class="submit-button danger" @click="toggleListing(BuyOrSell.Buy)">我要买</Button>
+                <!-- </div> -->
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ quoteItem, quoteDetail, buyorsell }"
                 @closed="closeComponent" v-if="componentId" />