xxxxxxx

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

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "TCE Spot Pre Order Platform"
     },
+    "common": {
+        "submitsuccess": "Submitted successfully, please place order again"
+    },
     "home": {
         "product": "Products",
         "pricing": "Price",
@@ -15,7 +18,10 @@
     "operation": {
         "transfer": "Unsubscribe",
         "close": "Unsubscribe",
-        "order": "Reservation"
+        "order": "Reservation",
+        "pickup": "Pick Up",
+        "buynow": "Buy Now",
+        "delivery": "Delivery"
     },
     "account": {
         "netWorth": "Balance ",
@@ -93,15 +99,19 @@
             "transferqty":"ReservationQty"
         },
         "goods": {
-            "closepl": "CLosePL",
+            "subtitle": "Order Information",
+            "orderid": "OrderID",
+            "closepl": "IncreaseOrDecrease",
             "buyorsell": "BuyOrSell",
             "holderqty": "OrderQty",
             "curpositionqty": "OrderQty",
             "freezeqty": "FreezeQty",
             "frozenqty": "FreezeQty",
+            "mindeliverylot": "MinDeliveryLot",
             "curholderamount": "OrderAmount",
             "holderamount": "OrderAmount",
             "tradetime": "OrderTime",
+            "holderprice": "OrderPrice",
             "transferprice": "ReservationPrice",
             "tips1": "Please Enter Reservation ReservationPrice",
             "tips2": "Please Enter Reservation quantity",
@@ -225,5 +235,11 @@
             "query_trade_pricing": "Pricing & Listing",
             "query_order_pricing": "Pricing & Listing"
         }
+    },
+    "tss": {
+        "title": "Categorys",
+        "tips1": "Please enter your search term",
+        "subtitle1": "FullPayment",
+        "subtitle2": "PrePayment"
     }
 }

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

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "แพลตฟอร์มการสั่งซื้อล่วงหน้าสปอตร์"
     },
+    "common": {
+        "submitsuccess": "สั่งเรียบร้อยแล้วค่ะสั่งอีกครั้งนะคะ"
+    },
     "home": {
         "product": "ผลิตภัณฑ์",
         "pricing": "ราคา",
@@ -15,7 +18,10 @@
     "operation": {
         "transfer": "ยกเลิกการจอง",
         "close": "ยกเลิกการจอง",
-        "order": "การจอง"
+        "order": "การจอง",
+        "pickup": "ไปรับของ",
+        "buynow": "ซื้อทันที",
+        "delivery": "จัดส่ง"
     },
     "account": {
         "netWorth": "ความสมดุล",
@@ -88,20 +94,24 @@
         }
     },
     "position": {
-        "goodscode": "商品代码：",
+        "goodscode": "รหัสสินค้า：",
         "transfer": {
             "transferqty":"ปริมาณการยกเลิก"
         },
         "goods": {
-            "closepl": "ส่วนต่างอ้างอิง",
+            "subtitle": "ข้อมูลคำสั่ง",
+            "orderid": "หมายเลขคำสั่ง",
+            "closepl": "ค่าเพิ่ม และลด",
             "buyorsell": "หมวดคำสั่งซื้อ",
             "holderqty": "จำนวนคำสั่งซื้อ",
             "curpositionqty": "จำนวนคำสั่งซื้อ",
             "freezeqty": "ราคาที่ล็อกไว้",
             "frozenqty": "ราคาที่ล็อกไว้",
+            "mindeliverylot": "ปริมาณน้อย ที่สุด",
             "curholderamount": "ราคารวมคำสั่งซื้อ",
             "holderamount": "ราคารวมคำสั่งซื้อ",
             "tradetime": "เวลาที่ทำการสั่งซื้อ",
+            "holderprice": "ราคาของคำสั่ง",
             "transferprice": "ราคาการยกเลิกการจอง",
             "tips1": "กรุณากรอกราคาการยกเลิกการจอง",
             "tips2": "กรุณากรอกปริมาณการยกเลิกการจอง",
@@ -225,5 +235,11 @@
             "query_trade_pricing": "การจองสินค้าสปอต",
             "query_order_pricing": "การจองสินค้าสปอต"
         }
+    },
+    "tss": {
+        "title": "เรียงลำดับ",
+        "tips1": "โปรดป้อนคำค้น",
+        "subtitle1": "เงินทั้งหมด",
+        "subtitle2": "จ่ายล่วงหน้า"
     }
 }

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

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "泰国商品交易所\r\n现货预订平台"
     },
+    "common": {
+        "submitsuccess": "订单提交成功,请再次下单"
+    },
     "home": {
         "product": "产品",
         "pricing": "价格",
@@ -15,7 +18,10 @@
     "operation": {
         "transfer": "退订",
         "close": "退订",
-        "order": "预订"
+        "order": "预订",
+        "pickup": "提货",
+        "delivery": "交货",
+        "buynow": "立即购买"
     },
     "account": {
         "netWorth": "余额",
@@ -93,15 +99,19 @@
             "transferqty":"退订量"
         },
         "goods": {
-            "closepl": "参考差额",
+            "subtitle": "订单信息",
+            "orderid": "订单号",
+            "closepl": "货值增减",
             "buyorsell": "订单类目",
             "holderqty": "订单数量",
             "curpositionqty": "订单数量",
             "freezeqty": "锁定量",
             "frozenqty": "锁定量",
+            "mindeliverylot": "最小提货量",
             "curholderamount": "订单金额",
             "holderamount": "订单金额",
             "tradetime": "订单时间",
+            "holderprice": "订单价格",
             "transferprice": "退订价格",
             "tips1": "请输入退订价格",
             "tips2": "请输入退订量",
@@ -225,5 +235,11 @@
             "query_trade_pricing": "现货预订",
             "query_order_pricing": "现货预订"
         }
+    },
+    "tss": {
+        "title": "分类",
+        "tips1": "请输入搜索关键词",
+        "subtitle1": "全款",
+        "subtitle2": "预付款"
     }
 }

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

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "泰國商品交易所\r\n現貨預訂平臺"
     },
+    "common": {
+        "submitsuccess": "訂單提交成功,請再次下單"
+    },
     "home": {
         "product": "產品",
         "pricing": "價格",
@@ -15,7 +18,10 @@
     "operation": {
         "transfer": "退訂",
         "close": "退訂",
-        "order": "預訂"
+        "order": "預訂",
+        "pickup": "提貨",
+        "buynow": "立即購買",
+        "delivery": "交貨"
     },
     "account": {
         "netWorth": "餘額",
@@ -93,15 +99,19 @@
             "transferqty":"退訂量"
         },
         "goods": {
-            "closepl": "參考差額",
+            "subtitle": "訂單信息",
+            "orderid": "訂單號",
+            "closepl": "貨值增減",
             "buyorsell": "訂單類目",
             "holderqty": "訂單數量",
             "curpositionqty": "訂單數量",
             "freezeqty": "鎖定量",
             "frozenqty": "鎖定量",
+            "mindeliverylot": "最小提貨量",
             "curholderamount": "訂單金額",
             "holderamount": "訂單金額",
             "tradetime": "訂單時間",
+            "holderprice": "訂單價格",
             "transferprice": "退訂價格",
             "tips1": "請輸入退訂價格",
             "tips2": "請輸入退訂量",
@@ -225,5 +235,11 @@
             "query_trade_pricing": "現貨預訂",
             "query_order_pricing": "現貨預訂"
         }
+    },
+    "tss": {
+        "title": "分類",
+        "tips1": "請輸入搜索關鍵詞",
+        "subtitle1": "全款",
+        "subtitle2": "預付款"
     }
 }

public/locales/en-US.json

@@ -93,6 +93,7 @@
     "operation": {
         "add": "Add",
         "all": "All",
+        "buynow": "Buy Now",
         "submit": "Submit",
         "edit": "Edit",
         "confirm": "Confirm",
@@ -694,6 +695,7 @@
             "frozenqty": "FrozenQty",
             "enableqty": "EnableQty",
             "mindeliverylot": "MinDeliveryLot",
+            "orderid": "OrderID",
             "closepl": "ClosePl",
             "last": "Last",
             "orderqty": "TransferQty",
@@ -1673,5 +1675,11 @@
         "cardno": "ID number is not in compliance",
         "bankcardno": "Bank card number is not in compliance"
         
+    },
+    "tss": {
+        "title": "Categorys",
+        "tips1": "Please enter your search term",
+        "subtitle1": "FullPayment",
+        "subtitle2": "PrePayment"
     }
 }

public/locales/th-TH.json

@@ -94,6 +94,7 @@
     "operation": {
         "add": "เพิ่มใหม่",
         "all": "ถอนทั้งหมด",
+        "buynow": "ซื้อทันที",
         "submit": "ส่ง",
         "edit": "แก้ไข",
         "confirm": "ยืนยัน",
@@ -697,6 +698,7 @@
             "frozenqty": "จำนวนที่ระงับไว้",
             "enableqty": "ปริมาณ ที่เหมาะสม",
             "mindeliverylot": "ค่าปริมาณ ที่น้อย ที่สุด",
+            "orderid": "หมายเลขคำสั่ง",
             "closepl": "อ้างอิงถึงการเก็บเกี่ยว",
             "last": "ค่าปัจจุบัน",
             "orderqty": "การถ่ายโอน",
@@ -1676,5 +1678,11 @@
         "enname": "พิมพ์ตัวอักษรภาษาอังกฤษตัวเลขขีดเส้นใต้เท่านั้น",
         "cardno": "หมายเลขบัตรประชาชนไม่ปฏิบัติตาม",
         "bankcardno": "หมายเลขบัตรธนาคารไม่สอดคล้อง"
+    },
+    "tss": {
+        "title": "เรียงลำดับ",
+        "tips1": "โปรดป้อนคำค้น",
+        "subtitle1": "เงินทั้งหมด",
+        "subtitle2": "จ่ายล่วงหน้า"
     }
 }

public/locales/zh-CN.json

@@ -94,6 +94,7 @@
     "operation": {
         "add": "新增",
         "all": "全部出金",
+        "buynow": "立即购买",
         "submit": "提交",
         "edit": "编辑",
         "confirm": "确认",
@@ -697,6 +698,7 @@
             "frozenqty": "冻结量",
             "enableqty": "可用量",
             "mindeliverylot": "最小交收量",
+            "orderid": "订单号",
             "closepl": "参考损益",
             "last": "当前价",
             "orderqty": "转让量",
@@ -1677,5 +1679,11 @@
         "cardno": "身份证号码不合规",
         "bankcardno": "银行卡号码不合规"
         
+    },
+    "tss": {
+        "title": "分类",
+        "tips1": "请输入搜索关键词",
+        "subtitle1": "全款",
+        "subtitle2": "预付款"
     }
 }

public/locales/zh-TW.json

@@ -94,6 +94,7 @@
     "operation": {
         "add": "新增",
         "all": "全部出金",
+        "buynow": "立即購買",
         "submit": "提交",
         "edit": "編輯",
         "confirm": "確認",
@@ -697,6 +698,7 @@
             "frozenqty": "凍結量",
             "enableqty": "可用量",
             "mindeliverylot": "最小交收量",
+            "orderid": "訂單號",
             "closepl": "參考損益",
             "last": "當前價",
             "orderqty": "轉讓量",
@@ -1677,5 +1679,11 @@
         "cardno": "身份證號碼不合規",
         "bankcardno": "銀行卡號碼不合規"
         
+    },
+    "tss": {
+        "title": "分類",
+        "tips1": "請輸入搜索關鍵詞",
+        "subtitle1": "全款",
+        "subtitle2": "預付款"
     }
 }

src/constants/order.ts

@@ -458,6 +458,23 @@ export function getDeliveryStatusName(value: number) {
 }
 
 /**
+ * 获取交收单状态2类型列表
+ * @returns 
+ */
+export function getDeliveryOrderStatusList() {
+    return getEnumTypeList('deliveryOrderStatus')
+}
+
+/**
+ * 获取交收单状态2类型名称
+ * @returns 
+ */
+export function getDeliveryOrderStatusName(value: number) {
+    const enums = getDeliveryOrderStatusList()
+    return getEnumTypeName(enums, value)
+}
+
+/**
  * 获取付款方式类型列表
  * @returns 
  */

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar :title="$t('operation.delivery')" @back="closed" />
+                <app-navbar :title="selectedRow.tHDetailEx.buyOrSell === 0 ? t('operation.pickup') : t('operation.delivery')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onDeliverySumit">
                 <CellGroup :title="$t('position.goods.subtitle')" inset>
@@ -11,7 +11,7 @@
                     <Cell :title="$t('position.goods.buyorsell')" :value="getBuyOrSellName(selectedRow.tHDetailEx.buyOrSell)" />
                     <Cell :title="$t('position.goods.curholderamount')" :value="formatDecimal(selectedRow.tHDetailEx.holderAmount, selectedRow.decimalPlace)" />
                     <Cell :title="$t('position.goods.curpositionqty')" :value="selectedRow.tHDetailEx.holderQty*selectedRow.agreeUnit + getGoodsUnitName(selectedRow.goodsUnitID)" />
-                    <Cell :title="$t('position.goods.frozenqty')" :value="selectedRow.tHDetailEx.freezeQty*selectedRow.agreeUnit + getGoodsUnitName(selectedRow.goodsUnitID)" />
+                    <!-- <Cell :title="$t('position.goods.frozenqty')" :value="selectedRow.tHDetailEx.freezeQty*selectedRow.agreeUnit + getGoodsUnitName(selectedRow.goodsUnitID)" /> -->
                     <Cell :title="$t('position.goods.enableqty')" :value="enableqty" />
                     <Cell :title="$t('position.goods.mindeliverylot')" :value="mindeliverylot" />
                     <Cell :title="$t('position.goods.closepl')">
@@ -43,7 +43,7 @@
             <app-contact v-model:show="showContact" @change="contactChange" />
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button :disabled="enableqty === 0" block square type="danger" @click="formRef?.submit">{{ $t('operation.delivery') }}</Button>
+                    <Button :disabled="enableqty === 0" block square type="danger" @click="formRef?.submit">{{ selectedRow.tHDetailEx.buyOrSell === 0 ? t('operation.pickup') : t('operation.delivery') }}</Button>
                 </div>
             </template>
         </app-view>

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

@@ -12,7 +12,7 @@
                     <Cell :title="$t('position.goods.holderprice')" :value="formatDecimal(selectedRow.tHDetailEx.holderPrice, selectedRow.decimalPlace)" />
                     <Cell :title="$t('position.goods.curholderamount')" :value="formatDecimal(selectedRow.tHDetailEx.holderAmount)" />
                     <Cell :title="$t('position.goods.curpositionqty')" :value="selectedRow.tHDetailEx.holderQty" />
-                    <Cell :title="$t('position.goods.freezeqty')" :value="selectedRow.tHDetailEx.freezeQty" />
+                    <!-- <Cell :title="$t('position.goods.freezeqty')" :value="selectedRow.tHDetailEx.freezeQty" /> -->
                     <Cell :title="$t('position.goods.enableqty')" :value="maxQty" />
                     <Cell :title="$t('position.goods.closepl')">
                         <template #value>

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

@@ -97,7 +97,7 @@
         <div class="g-form__footer" v-else>
             <template v-if="formData.BuyOrSell === BuyOrSell.Buy">
                 <Button type="danger" block square :disabled="!formData.OrderQty"
-                    @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">立即购买</Button>
+                    @click="onBeforeSubmit(BuildType.Open)" v-if="!quote?.iscannotbuy">{{ $t('operation.buynow') }}</Button>
             </template>
         </div>
         <Tabs class="van-tabs--list" v-model:active="active">

src/packages/tss/views/bank/wallet/components/deposit/Index.vue

@@ -21,6 +21,11 @@
                         <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
                     </template>
                 </Field>
+                <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
+                    <template #input>
+                        {{ sign.bankaccountname }}
+                    </template>
+                </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankname')">
                     <template #input>
                         {{ sign.bankname }}
@@ -31,11 +36,6 @@
                         {{ sign.bankaccountno }}
                     </template>
                 </Field>
-                <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
-                    <template #input>
-                        {{ sign.bankaccountname }}
-                    </template>
-                </Field>
                 <template v-for="(item, index) in configs" :key="index">
                     <Field v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype"
                         :name="item.fieldcode" :label="item.fieldname" v-model="item.value"

src/packages/tss/views/bank/wallet/components/withdraw/Index.vue

@@ -9,6 +9,11 @@
                         <span class="form-field__tips">{{ $t('banksign.wallet.withdraw.availableoutmoney') }}{{ fund.AvailableOutMoney }}</span>
                     </template>
                 </Field>
+                <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
+                    <template #input>
+                        {{ sign.bankaccountname }}
+                    </template>
+                </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankname')">
                     <template #input>
                         {{ sign.bankname }}
@@ -19,11 +24,6 @@
                         {{ sign.bankaccountno }}
                     </template>
                 </Field>
-                <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
-                    <template #input>
-                        {{ sign.bankaccountname }}
-                    </template>
-                </Field>
                 <template v-for="(item, index) in configs" :key="index">
                     <Field v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype"
                         :name="item.fieldcode" :label="item.fieldname" v-model="item.value"

src/packages/tss/views/home/index.vue

@@ -58,7 +58,7 @@ const tabList = computed(() => {
     },
     {
       name: 'home-group',
-      label: '分类',
+      label: t('tss.title'),
       icon: 'g-icon-group--line',
       activeIcon: 'g-icon-group--fill',
     },

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

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

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

@@ -6,11 +6,11 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.deliveryorderid }}</b>
+                        <b>{{ $t('position.goods.orderid') }}：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
-                            {{ getBuyOrSellName(item.buyorsell) }}
+                            {{ getDeliveryOrderStatusName(item.orderstatus) }}
                         </b>
                     </div>
                 </div>
@@ -47,9 +47,6 @@
                         </ul>
                     </div>
                 </div>
-                <!-- <div class="g-product-list__btnbar">
-                    <Button size="small" @click="onCancel(item)" v-if="item.orderstatus === 1" round>{{ $t('operation.cancel2') }}</Button>
-                </div> -->
             </div>
         </div>
     </app-pull-refresh>
@@ -57,9 +54,9 @@
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { Button, Image } from 'vant'
+import { Image } from 'vant'
 import { getFileUrl } from '@/filters'
-import { getBuyOrSellName } from '@/constants/order'
+import { getDeliveryOrderStatusName } from '@/constants/order'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { useRequest } from '@/hooks/request'

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

@@ -6,7 +6,7 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.deliveryorderid }}</b>
+                        <b>{{ $t('position.goods.orderid') }}：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">

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

@@ -6,7 +6,7 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.deliveryorderid }}</b>
+                        <b>{{ $t('position.goods.orderid') }}：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">

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

@@ -6,11 +6,11 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.deliveryorderid }}</b>
+                        <b>{{ $t('position.goods.orderid') }}：{{ item.deliveryorderid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
-                            {{ getBuyOrSellName(item.buyorsell) }}
+                            {{ getDeliveryOrderStatusName(item.orderstatus) }}
                         </b>
                     </div>
                 </div>
@@ -62,7 +62,7 @@ import { fullloading, dialog } from '@/utils/vant'
 import { formatDate, handleRequestBigNumber } from '@/filters'
 import { getFileUrl } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { getBuyOrSellName } from '@/constants/order'
+import { getDeliveryOrderStatusName } from '@/constants/order'
 import { queryMineTradeGoodsDeliveryOfflines } from '@/services/api/transfer'
 import { offlineDeliveryApplyCancelOrder } from '@/services/api/trade'
 import { i18n } from '@/stores'

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

@@ -5,7 +5,7 @@
             <div class="g-product-list__box" v-for="(item, index) in dataList" :key="index">
                 <div class="g-product-list__titlebar">
                     <div class="left">
-                        <b>订单号：{{ item.tradeid }}</b>
+                        <b>{{ $t('position.goods.orderid') }}：{{ item.tradeid }}</b>
                     </div>
                     <div class="right">
                         <b :class="!item.buyorsell ? 'g-price-up' : 'g-price-down'">
@@ -27,28 +27,16 @@
                                 <span>{{ $t('position.goods.holddetail.holderamount') }}：</span>
                                 <span>{{ formatDecimal(item.tradeamount, item.decimalplace) }}</span>
                             </li>
-                            <!-- <li>
-                                <span>{{ $t('position.goods.holddetail.usedMargin') }}：</span>
-                                <span>{{ formatDecimal(item.payeddeposit+item.refundabledeposit, item.decimalplace) }}</span>
-                            </li> -->
                             <li>
-                                <span>货值增减：</span>
+                                <span>{{ $t('position.goods.closepl') }}：</span>
                                 <span :class="handlePriceColor(item.floatpl)">
                                     {{ formatDecimal(item.floatpl) }}
                                 </span>
                             </li>
                             <li>
-                                <span>退订价：</span>
+                                <span>{{ $t('position.goods.holderamount') }}：</span>
                                 <span>{{ formatDecimal(item.holderprice, item.decimalplace) }}</span>
                             </li>
-                            <!-- <li>
-                                <span>{{ $t('position.goods.holddetail.freezeqty') }}：</span>
-                                <span>{{ item.freezeqty }}</span>
-                            </li>
-                            <li>
-                                <span>{{ $t('position.goods.holddetail.holderqty') }}：</span>
-                                <span>{{ enableqty(item) + getGoodsUnitName(item.goodunitid) }}</span>
-                            </li> -->
                             <li>
                                 <span>{{ $t('position.goods.holddetail.tradetime') }}：</span>
                                 <span>{{ formatDate(item.tradetime, "YYYY-MM-DD HH:mm:ss") }}</span>
@@ -66,16 +54,11 @@ import { shallowRef } from 'vue'
 import { Image } from 'vant'
 import { formatDecimal, handlePriceColor } from '@/filters'
 import { getFileUrl, formatDate } from '@/filters'
-import { getGoodsUnitName } from '@/constants/unit'
 import { getBuyOrSellName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryTradeHolderDetailEx } from '@/services/api/order'
-import { useGlobalStore } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
-const globalStore = useGlobalStore()
-const riskType = globalStore.getSystemInfo('riskType') // 风控类型
-
 const error = shallowRef(false)
 const dataList = shallowRef<Model.TradeHolderDetailExRsp[]>([])
 
@@ -96,11 +79,6 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeHolderDetail
     }
 })
 
-// 可用重量
-const enableqty = (item: Model.TradeHolderDetailExRsp) => {
-    return (item.holderqty - item.freezeqty) * item.agreeunit
-}
-
 const getImageUrl = (url: string) => {
     const [firstImg] = url.split(',')
     return firstImg ? getFileUrl(firstImg) : ''

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

@@ -17,7 +17,7 @@
                 <div class="g-product-list__box" v-for="(item, index) in orderComputedList" :key="index">
                     <div class="g-product-list__titlebar">
                         <div class="left">
-                            <b>订单号：{{ item.tHDetailEx.tradeID }}</b>
+                            <b>{{ $t('position.goods.orderid') }}：{{ item.tHDetailEx.tradeID }}</b>
                         </div>
                         <div class="right">
                             <b :class="!item.tHDetailEx.buyOrSell ? 'g-price-up' : 'g-price-down'">
@@ -81,7 +81,7 @@
                             {{ $t('operation.close') }}
                         </Button>
                         <Button size="small" @click="showComponent('delivery', item)" round>
-                            {{ item.tHDetailEx.buyOrSell === 0 ? '提货' : '交货' }}
+                            {{ item.tHDetailEx.buyOrSell === 0 ? $t('operation.pickup') : $t('operation.delivery') }}
                         </Button>
                     </div>
                 </div>

src/packages/tss/views/product/group/index.vue

@@ -1,15 +1,15 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="分类" :show-back-button="showBackButton">
+            <app-navbar :title="$t('tss.title')" :show-back-button="showBackButton">
                 <template #footer>
-                    <Search shape="round" background="transparent" placeholder="请输入搜索关键词" style="padding-top: 0;"
+                    <Search shape="round" background="transparent" :placeholder="$t('tss.tips1')" style="padding-top: 0;"
                         @click="$router.push({ name: 'search' })" />
                 </template>
             </app-navbar>
         </template>
-        <GroupList :market-id="53201" title="全款" />
-        <GroupList :market-id="10101" title="预付款" />
+        <GroupList :market-id="53201" :title="$t('tss.subtitle1')" />
+        <GroupList :market-id="10101" :title="$t('tss.subtitle2')" />
     </app-view>
 </template>
 

src/stores/modules/enum.ts

@@ -14,7 +14,7 @@ export interface EnumType {
     bankmappedvalue?: string
 }
 
-const enumKeys = ['confirmStatus', 'executetype', 'currency', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'gt_kksjdw', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'traderstatus', 'transferapplystatus', 'ePayFlag'] as const
+const enumKeys = ['confirmStatus', 'executetype', 'currency', 'deliveryOrderStatus', 'operatetypesearch', 'deliveryPayMode', 'applystatus', 'deliveryStatus', 'operateType', 'WRPresaleStatus', 'clientType', 'stepStatus', 'scoreConfigType', 'GZBSCPayStatus', 'gt_kksjdw', 'performanceStatus', 'handlestatus', 'performanceType', 'accountBusinessCode', 'certificatetype', 'signstatus', 'thjOrderStatus', 'THJDeliveryMode', 'goodsunit', 'WROutInApplyStatus2', 'THJTransferStatus', 'WRTradeOrderStatus', 'THJMarket', 'THJProfitRoleType', 'appointmentModelOut', 'orderstatus', 'Pricemode2', 'buildtype', 'listingselecttype', 'certypeperson', 'runstatus', 'traderstatus', 'transferapplystatus', 'ePayFlag'] as const
 
 const enumMap = new Map<typeof enumKeys[number], ShallowRef<Model.EnumRsp[]>>()