xxxxx

src/packages/mobile/views/order/position/components/pricing/detail2/Index.vue

@@ -63,7 +63,7 @@
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar" v-if="item.tHDetailEx.holderQty">
-                            <Button size="small" v-if="enableqty(item) != 0" @click="showComponent('close', item)" round>{{ $t('operation.close') }}</Button>
+                            <Button size="small" v-if="enableqty(item) != 0 && !onlyDelivery" @click="showComponent('close', item)" round>{{ $t('operation.close') }}</Button>
                             <Button size="small" @click="showComponent('delivery', item)" round>{{ $t('operation.delivery') }}</Button>
                         </div>
                     </div>
@@ -87,6 +87,13 @@ import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import eventBus from '@/services/bus'
 
+defineProps({
+    onlyDelivery: {
+        type: Boolean,
+        required: true
+    }
+})
+
 const showModal = shallowRef(true)
 const refresh = shallowRef(false) // 是否刷新父组件数据
 

src/packages/mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue

@@ -120,6 +120,8 @@ const contactChange = (item: Model.UserReceiveInfoRsp) => {
 const onDeliverySumit = () => {
     dialog({
         message: t('position.goods.tips5'),
+        confirmButtonText: t('operation.confirm'),
+        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { buyOrSell, tradeID } = props.selectedRow.tHDetailEx

src/packages/mobile/views/pricing/list/v2/index.vue

@@ -1,7 +1,7 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar :title="groupInfo ? groupInfo.goodsgroupname : '价格'" :show-back-button="showBackButton" />
+            <app-navbar :title="groupInfo ? groupInfo.goodsgroupname : $t('home.pricing')" :show-back-button="showBackButton" />
         </template>
         <div class="pricing-v2">
             <div class="pricing-v2-item" v-for="(item, index) in dataList" :key="index">

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

@@ -58,8 +58,7 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button v-if="enableqty(item) != 0" size="small" @click="callBack(item, 'close')" round>{{ $t('operation.close') }}</Button>
-                    <Button size="small" @click="callBack(item, 'delivery')" round>{{ $t('operation.delivery') }}</Button>
+                    <Button v-if="enableqty(item) != 0" size="small" @click="callBack(item)" round>{{ $t('operation.close') }}</Button>
                 </div>
             </div>
         </div>
@@ -95,8 +94,8 @@ const dataList = computed(() => {
 const pullRefreshRef = shallowRef()
 
 const emit = defineEmits(['callBack'])
-const callBack = (item: Model.SBYJMyOrderRsp, ids: string) => {
-    emit('callBack', ids === 'close' ? 2 : 3, item.tHDetailEx.buyOrSell, item.tHDetailEx.tradeID, item)
+const callBack = (item: Model.SBYJMyOrderRsp) => {
+    emit('callBack', 2, item.tHDetailEx.buyOrSell, item.tHDetailEx.tradeID, item)
 }
 
 // 可用重量

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

@@ -155,7 +155,7 @@ const itemBack = (isPosition: number, buyorsell: BuyOrSell, tradeId: string, ite
     formData.BuyOrSell = buyorsell === BuyOrSell.Buy ? BuyOrSell.Sell : BuyOrSell.Buy
     selectedRow.value = item
     // 打开退订
-    openComponent(isPosition === 2 ? 'transfer' : 'delivery')
+    openComponent('transfer')
 }
 
 const active = shallowRef(pictureurl.value != '' ? 'images' : 'cancel')
@@ -191,8 +191,7 @@ const components = [
     
 const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('../components/detail/Index.vue'))],
-    ['transfer', defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue'))],
-    ['delivery', defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue'))]
+    ['transfer', defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue'))]
 ])
 
 // 计算市价

src/packages/tss/views/order/position/Index.vue

@@ -16,7 +16,7 @@
                 </Tab>
             </template>
         </Tabs>
-        <component ref="componentRef" :is="selectedComponent.detail" @closed="closeComponent"
+        <component ref="componentRef" :is="selectedComponent.detail" @closed="closeComponent" v-bind="{ onlyDelivery }"
             v-if="componentId && selectedComponent.detail" />
     </app-view>
 </template>
@@ -29,6 +29,8 @@ import { i18n } from '@/stores'
 
 const { global: { t } } = i18n
 
+const onlyDelivery = shallowRef(false)
+
 const components = [
     {
         name: 'pricing',
@@ -36,21 +38,6 @@ const components = [
         component: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/list/Index.vue')),
         detail: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/Index.vue')),
     },
-    // {
-    //     name: 'spot',
-    //     title: t('position.spot.title'),
-    //     component: defineAsyncComponent(() => import('@mobile/views/order/position/components/spot/list/Index.vue')),
-    // },
-    // {
-    //     name: 'presale',
-    //     title: t('position.presale.title'),
-    //     component: defineAsyncComponent(() => import('@mobile/views/order/position/components/presale/list/Index.vue')),
-    // },
-    // {
-    //     name: 'transfer',
-    //     title: t('position.transfer.title'),
-    //     component: defineAsyncComponent(() => import('@mobile/views/order/position/components/transfer/list/Index.vue')),
-    // }
 ]
 
 const active = shallowRef(0)