xxxx

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

@@ -86,9 +86,9 @@
         }
     },
     "order": {
-        "title1": "Historical orders",
-        "title2": "Full payment orders",
-        "title3": "Deposit orders",
+        "title1": "Historical Orders",
+        "title2": "Full-Payment Orders",
+        "title3": "Deposit )rders",
         "feeTotal": "Service fee:",
         "goodsorder": {
             "buyorsell": "Select"

public/locales/en-US.json

@@ -704,7 +704,7 @@
             "subtitle": "Position Info",
             "subtitle2": "Settlement information",
             "subtitle3": "Transfer Info",
-            "agreeunit": "Product Specifications",
+            "agreeunit": "GoodsSpec",
             "pricemove": "Price Adjustment",
             "expressfees": "Freight",
             "otherfees": "Other Fees",

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

@@ -191,7 +191,7 @@ const usedMargin = computed(() => {
 const serivcefee = computed(() => {
     const { buyOrSell } = props.selectedRow.tHDetailEx
     const { tradefees = [], agreeunit = 0 } = quote.value ?? {}
-    const { FeeAlgorithm = 1, ExchangeValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 105 : 106)) ?? {}
+    const { FeeAlgorithm = 1, ExchangeValue = 0.0 } = tradefees.find((e) => e.FeeID === (buyOrSell === BuyOrSell.Buy ? 101 : 102)) ?? {}
     // 比例
     if (FeeAlgorithm === 1) {
         return enableqty.value * agreeunit * ExchangeValue

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

@@ -32,7 +32,7 @@
             <div class="order-total">
                 <ul class="order-total__top">
                     <li>
-                        <b>小计：</b>
+                        <b>{{ $t('tss.total') }}：</b>
                     </li>
                     <li>
                         <span>{{ $t('tss.orderQty') }}：</span>

src/packages/tss/views/mine/index.less

@@ -87,8 +87,8 @@
                         line-height: 20px;
 
                         &:first-child {
+                            font-size: 12px;
                             margin-right: 5px;
-                            color: #A1B1C5;
                         }
                     }
                 }

src/packages/tss/views/order/list/fullpayment/Index.vue

@@ -28,7 +28,7 @@
                                 </li>
                                 <li>
                                     <label>{{ $t('position.goods.agreeunit') }}：</label>
-                                    <span>{{ item.agreeunit }}{{ item.goodsunit }}</span>
+                                    <span>{{ item.agreeunit }}{{ getGoodsUnitName(item.goodunitid) }}</span>
                                 </li>
                                 <li>
                                     <label>{{ $t('delivery.offline.deliveryqty') }}：</label>
@@ -70,6 +70,7 @@ import { queryMineTradeGoodsDeliveryOfflines } from '@/services/api/transfer'
 import { offlineDeliveryApplyCancelOrder } from '@/services/api/trade'
 import { i18n } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
+import { getGoodsUnitName } from '@/constants/unit'
 
 const dataList = shallowRef<Model.MineTradeGoodsDeliveryOfflinesRsp[]>([])
 const error = shallowRef(false)

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

@@ -39,7 +39,7 @@
                                     </li>
                                     <li>
                                         <span>{{ $t('position.goods.agreeunit') }}：</span>
-                                        <span>{{ item.agreeUnit }}{{ item.goodsUnit }}</span>
+                                        <span>{{ item.agreeUnit }}{{ getGoodsUnitName(item.goodsUnitID) }}</span>
                                     </li>
                                     <li>
                                         <span>{{ $t('position.goods.holddetail.holderqty') }}：</span>
@@ -99,6 +99,7 @@ import { dialog, fullloading } from '@/utils/vant'
 import { EBuildType, EDelistingType, EListingSelectType, EValidType } from '@/constants/client'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import eventBus from '@/services/bus'
+import { getGoodsUnitName } from '@/constants/unit'
 
 defineProps({
     showBackButton: {

src/types/model/transfer.d.ts

@@ -326,6 +326,7 @@ declare namespace Model {
         goodsnameth: string; //
         goodsnamedisplay: string; // 商品名称
         goodsunit: string; // 单位
+        goodunitid: number; // 单位id
         marketid: number; // 市场ID
         matchaccountid: number; // 对手方AccountID
         matchuserid: number; // 对手方UserID