xxxx

oem/tss/locales/extras/en-US.json

@@ -4,9 +4,9 @@
         "slogan": "TCE Spot Pre Order Platform"
     },
     "operation": {
-        "transfer": "Reservation",
-        "close": "Reservation",
-        "order": "Unsubscribe"
+        "transfer": "Unsubscribe",
+        "close": "Unsubscribe",
+        "order": "Reservation"
     },
     "account": {
         "closepl": "CLosePL",

public/locales/en-US.json

@@ -352,8 +352,8 @@
             "holdlb": "HoldLB",
             "goods": "Goods",
             "buyorsell": "BuyOrSell",
-            "pricemode": "PriceMode",
-            "orderqty": "OrderQty",
+            "pricemode": "PMode",
+            "orderqty": "Qty",
             "marketmaxsub": "MaxSub",
             "marketmaxsub1": "MaxSub",
             "price": "OrderPrice",

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

@@ -7,7 +7,8 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup :title="$t('order.pricingorder.subtitle')">
-                    <Cell :title="$t('order.pricingorder.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell v-if="selectedRow.trademode != 10" :title="$t('order.pricingorder.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell v-else :title="$t('order.pricingorder.goodsname')" :value="selectedRow.goodscode" />
                     <Cell :title="$t('order.pricingorder.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
                     <Cell :title="$t('order.pricingorder.orderqty')" :value="formatDecimal(selectedRow.orderqty)" />
                     <Cell :title="$t('order.pricingorder.orderprice')" :value="formatDecimal(selectedRow.orderprice)" />
@@ -51,6 +52,8 @@ const onCancelSumit = () => {
     console.log('goodsid')
     dialog({
         message: t('order.pricingorder.tips1'),
+        confirmButtonText: t('operation.confirm'),
+        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = props.selectedRow

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

@@ -6,7 +6,8 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                        <h4 v-if="item.trademode != 10">{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                        <h4 v-else>{{ item.goodscode }}</h4>
                     </div>
                     <div class="right">
                         <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
@@ -97,6 +98,8 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail,
 const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
         message: t('order.pricingorder.tips1'),
+        confirmButtonText: t('operation.confirm'),
+        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }

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

@@ -7,7 +7,8 @@
             </template>
             <div class="order-detail__container g-form__container">
                 <CellGroup :title="$t('order.pricingtrade.subtitle')">
-                    <Cell :title="$t('order.pricingtrade.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell v-if="selectedRow.trademode != 10" :title="$t('order.pricingtrade.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell v-else :title="$t('order.pricingtrade.goodsname')" :value="selectedRow.goodscode" />
                     <Cell :title="$t('order.pricingtrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
                     <Cell :title="$t('order.pricingtrade.buildtype')" :value="getBuildTypeName(selectedRow.buildtype)" />
                     <Cell :title="$t('order.pricingtrade.tradeqty')" :value="selectedRow.tradeqty" />

src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue

@@ -6,7 +6,8 @@
             <div class="g-order-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-order-list__titlebar">
                     <div class="left">
-                        <h4>{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                        <h4 v-if="item.trademode != 10">{{ item.goodscode }}/{{ item.goodsname }}</h4>
+                        <h4 v-else>{{ item.goodscode }}</h4>
                     </div>
                 </div>
                 <div class="g-order-list__content">

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

@@ -391,7 +391,7 @@ const onSubmit = () => {
     fullloading((hideLoading) => {
         formSubmit().then(() => {
             hideLoading()
-            dialog(t('common.submitsuccess')).then(() => {
+            dialog({ message: t('common.submitsuccess'), confirmButtonText: t('operation.confirm') }).then(() => {
                 // 成交通知
                 eventBus.$emit('OrderDealedNtf')
             })

src/packages/tss/views/mine/Index.vue

@@ -79,9 +79,6 @@
                 <li @click="routerTo('order-delivery')">
                     <Iconfont label-direction="bottom" icon="g-icon-delivery--line">{{ $t('mine.delivery') }}</Iconfont>
                 </li>
-                <li @click="routerTo('order-performance')">
-                    <Iconfont label-direction="bottom" icon="g-icon-performance--line">{{ $t('mine.performance') }}</Iconfont>
-                </li>
             </ul>
         </app-block>
         <app-block class="g-navmenu">

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

@@ -30,17 +30,22 @@ import { i18n } from '@/stores'
 const { global: { t } } = i18n
 
 const components = [
+    // {
+    //     name: 'goodsorder',
+    //     title: t('delivery.online.title'),
+    //     component: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/online/list/Index.vue')),
+    //     history: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/online/history/Index.vue')),
+    // },
     {
-        name: 'goodsorder',
-        title: t('delivery.online.title'),
-        component: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/online/list/Index.vue')),
-        history: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/online/history/Index.vue')),
+        name: 'goodstrade',
+        title: t('delivery.offline.title'),
+        component: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/offline/list/Index.vue'))
     },
-    {
-        name: 'listingorder',
-        title: t('delivery.spot.title'),
-        component: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/spot/list/Index.vue')),
-    }
+    // {
+    //     name: 'listingorder',
+    //     title: t('delivery.spot.title'),
+    //     component: defineAsyncComponent(() => import('@mobile/views/order/delivery/components/spot/list/Index.vue')),
+    // }
 ]
 
 const active = shallowRef(0)