Handy_Cao 1 سال پیش
والد
کامیت
16c5c551ff

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

@@ -71,15 +71,15 @@
         }
     },
     "delivery": {
-        "title1": "全款提货",
-        "title2": "预付款提货",
-        "title3": "预付款交货",
-        "title4": "退换货"
+        "title1": "Full-Pay Delivery",
+        "title2": "Pre-Pay PickUp",
+        "title3": "Pre-Pay Delivery",
+        "title4": "Refunds"
     },
     "order": {
-        "title1": "历史订单",
-        "title2": "全款订单",
-        "title3": "预付款订单",
+        "title1": "History Orders",
+        "title2": "FullPayOrders",
+        "title3": "PrePayOrders",
         "feeTotal": "ServiceCharge:",
         "goodsorder": {
             "buyorsell": "Choice"
@@ -209,7 +209,7 @@
         "cashin": "Cash In",
         "cashout": "Cash Out",
         "myposition": "MyPosition",
-        "myorder": "MyOrder",
+        "myorder": "HistoryOrders",
         "setting": {
             "orderBuyOrSell": "Default"
         }

+ 8 - 8
oem/tss/locales/extras/th-TH.json

@@ -71,15 +71,15 @@
         }
     },
     "delivery": {
-        "title1": "全款提货",
-        "title2": "预付款提货",
-        "title3": "预付款交货",
-        "title4": "退换货"
+        "title1": "ไปรับเองค่ะ",
+        "title2": "จ่ายล่วงหน้าเพื่อรับของ",
+        "title3": "การชำระเงินล่วงหน้า",
+        "title4": "ส่งคืนสินค้า"
     },
     "order": {
-        "title1": "历史订单",
-        "title2": "全款订单",
-        "title3": "预付款订单",
+        "title1": "คำสั่งทางประวัติศาสตร์",
+        "title2": "รายการทั้งหมด",
+        "title3": "ชำระเงินล่วงหน้า",
         "feeTotal": "ค่าธรรมเนียม:",
         "goodsorder": {
             "buyorsell": "เลือก"
@@ -209,7 +209,7 @@
         "cashin": "เติมเงิน",
         "cashout": "ถอนเงิน",
         "myposition": "ของฉัน",
-        "myorder": "สถานะของฉัน",
+        "myorder": "คำสั่งทางประวัติศาสตร์",
         "setting": {
             "orderBuyOrSell": "ค่าเริ่มต้น"
         }

+ 2 - 2
oem/tss/locales/extras/zh-CN.json

@@ -208,8 +208,8 @@
         "delivery": "交货提货",
         "cashin": "充值",
         "cashout": "提现",
-        "myposition": "我的订单",
-        "myorder": "订单详情",
+        "myposition": "持有订单",
+        "myorder": "历史订单",
         "setting": {
             "orderBuyOrSell": "默认"
         }

+ 9 - 9
oem/tss/locales/extras/zh-TW.json

@@ -71,15 +71,15 @@
         }
     },
     "delivery": {
-        "title1": "全款提",
-        "title2": "预付款提货",
-        "title3": "预付款交货",
-        "title4": "退换货"
+        "title1": "全款提",
+        "title2": "預付款提貨",
+        "title3": "預付款交貨",
+        "title4": "退換貨"
     },
     "order": {
-        "title1": "历史订单",
-        "title2": "全款订单",
-        "title3": "预付款订单",
+        "title1": "歷史訂單",
+        "title2": "全款訂單",
+        "title3": "預付款訂單",
         "feeTotal": "服務費:",
         "goodsorder": {
             "buyorsell": "選擇"
@@ -208,8 +208,8 @@
         "delivery": "交貨提貨",
         "cashin": "充值",
         "cashout": "提現",
-        "myposition": "我的訂單",
-        "myorder": "訂單詳情",
+        "myposition": "持有訂單",
+        "myorder": "歷史訂單",
         "setting": {
             "orderBuyOrSell": "默認"
         }

+ 2 - 2
src/packages/tss/views/mine/Index.vue

@@ -51,10 +51,10 @@
         <app-block class="mine-iconbar">
             <ul>
                 <li @click="routerTo('order-position')">
-                    <Iconfont label-direction="bottom" icon="g-icon-position--line">持有订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-position--line">{{ $t('mine.myposition') }}</Iconfont>
                 </li>
                 <li @click="routerTo('order-list')">
-                    <Iconfont label-direction="bottom" icon="g-icon-order--line">历史订单</Iconfont>
+                    <Iconfont label-direction="bottom" icon="g-icon-order--line">{{ $t('mine.myorder') }}</Iconfont>
                 </li>
                 <li @click="routerTo('order-delivery')">
                     <Iconfont label-direction="bottom" icon="g-icon-case--line">{{ $t('mine.delivery') }}</Iconfont>

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

@@ -22,7 +22,7 @@
                         <ul>
                             <li>
                                 <span>{{ $t('delivery.offline.buyorselldisplay') }}:</span>
-                                <span>{{ item.buyorselldisplay }}</span>
+                                <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                             </li>
                             <li>
                                 <span>{{ $t('delivery.offline.deliveryqty') }}:</span>
@@ -56,7 +56,7 @@
 import { shallowRef } from 'vue'
 import { Image } from 'vant'
 import { getFileUrl } from '@/filters'
-import { getDeliveryOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getDeliveryOrderStatusName } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { useRequest } from '@/hooks/request'

+ 1 - 1
src/packages/tss/views/product/list/index.vue

@@ -4,7 +4,7 @@
             <app-navbar :title="groupInfo ? groupInfo.goodsgroupname : $t('home.pricing')" />
         </template>
         <ProductList :data-list="dataList" v-if="dataList.length" />
-        <Empty description="暂无数据" v-else />
+        <Empty :description="$t('common.nodatas')" v-else />
     </app-view>
 </template>