xxxxx

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

@@ -9,15 +9,22 @@
         "order": "Unsubscribe"
     },
     "account": {
+        "profitLoss": "ProfitLoss",
         "freezeMargin2": "Deposit"
     },
     "quote": {
+        "bid": "BuyPrice",
+        "ask": "SellPrice",
+        "holdvolume": "HoldVolume",
         "deposit": "Deposit",
         "orderbuy": "Reservation",
         "transferbuy": "Buyback",
         "ordersell": "Cancel Reservation",
         "transfersell": "Cancel Unsubscribe",
+        "buy": "Reservation",
+        "selll": "Buyback",
         "goods": {
+            "buyorsell": "Choice",
             "taaccount": "Account"
         },
         "swap": {
@@ -27,11 +34,14 @@
             "permargin": "Deposit"
         },
         "pricing": {
+            "buyorsell": "Choice",
             "title": "Order",
             "deposit": "Deposit",
             "title1": "Pricing & Listing"
         },
         "spot": {
+            "buyprice": "BuyPrice",
+            "sellprice": "SellPrice",
             "title": "Unsubscribe Detail",
             "listingprice": "UnsubscribePrice"
         },
@@ -39,22 +49,87 @@
             "title1": "Unsubscribe Detail"
         }
     },
+    "order": {
+        "feeTotal": "ServiceCharge：",
+        "goodsorder": {
+            "buyorsell": "Choice"
+        },
+        "pricingorder": {
+             "buyorsell": "Choice"
+        },
+        "pricingtrade": {
+            "buyorsell": "Choice",
+            "charge": "ServiceCharge",
+            "closepl": "CLosePL"
+        }
+    },
     "position": {
         "transfer": {
             "transferqty":"ReservationQty"
         },
         "goods": {
+            "buyorsell": "BuyOrSell",
+            "holderqty": "OrderQty",
+            "curpositionqty": "OrderQty",
+            "freezeqty": "FreezeQty",
+            "frozenqty": "FreezeQty",
+            "curholderamount": "OrderAmount",
+            "holderamount": "OrderAmount",
+            "tradetime": "OrderTime",
             "transferprice": "ReservationPrice",
             "tips1": "Please Enter Reservation ReservationPrice",
             "tips2": "Please Enter Reservation quantity",
             "qty": "ReservationQty",
             "orderqty": "ReservationQty",
-            "subtitle3": "Reservation Info"
+            "averageprice": "AveragePrice",
+            "subtitle3": "Reservation Info",
+            "holddetail": {
+                "holderqty": "OrderQty",
+                "freezeqty": "FreezeQty",
+                "profitLoss": "ProfitLoss",
+                "holderamount": "OrderAmount",
+                "tradetime": "OrderTime"
+            }
+        },
+        "pricing": {
+            "buyorsell": "Choice",
+            "frozenqty": "FreezeQty",
+            "curholderamount": "OrderTime",
+            "averageprice": "AveragePrice"
+        }
+    },
+    "banksign": {
+        "capital": {
+            "totalcharge": "TotalServiceCharge:"
+        }
+    },
+    "report": {
+        "title": "User Statement",
+        "closepl": "CLosePL",
+        "trade": {
+            "buyorselldisplay": "Choice"
+        },
+        "position": {
+            "buyorselldisplay": "Choice",
+            "frozenqty": "FreezeQty"
+        }
+    },
+    "mine": {
+        "setting": {
+            "orderBuyOrSell": "Default"
         }
     },
     "pcroute": {
         "bottom": {
-            "bottom_pricing": "Pricing & Listing"
+            "bottom_goods_position_transfer": "Reservation",
+            "bottom_goods_position": "OrderPosition",
+            "bottom_pricing": "Pricing & Listing",
+            "bottom_pricing_position": "OrderPosition",
+            "bottom_swap_position": "OrderPosition"
+        },
+        "market": {
+            "title": "Spots Market",
+            "market_trade": "Spots Market"
         },
         "query": {
             "query_order_pricing": "Pricing & Listing"

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

@@ -9,15 +9,22 @@
         "order": "การจอง"
     },
     "account": {
+        "profitLoss": "กำไร/ขาดทุนลอยตัว",
         "freezeMargin2": "เงินทุน"
     },
     "quote": {
+        "bid": "ราคาจอง",
+        "ask": "ราคาส่งคืน",
+        "holdvolume": "จำนวนคำสั่งซื้อ",
         "deposit": "เงินทุน",
         "orderbuy": "จอง",
         "transferbuy": "ส่งคืน",
         "ordersell": "ยกเลิกการจอง",
         "transfersell": "ยกเลิกการส่งคืน",
+        "buy": "จอง",
+        "selll": "ส่งคืน",
         "goods": {
+            "buyorsell": "เลือก",
             "taaccount": "บัญชี"
         },
         "swap": {
@@ -27,11 +34,14 @@
             "permargin": "เงินทุน"
         },
         "pricing": {
+            "buyorsell": "เลือก",
             "title": "สั่งซื้อ",
             "deposit": "เงินทุน",
             "title1": "การจองสินค้าสปอต"
         },
         "spot": {
+            "buyprice": "ราคาจอง",
+            "sellprice": "ราคาส่งคืน",
             "title": "รายละเอียดการจอง",
             "listingprice": "ราคาจอง"
         },
@@ -39,22 +49,87 @@
             "title1": "รายละเอียดการส่งคืน"
         }
     },
+    "order": {
+        "feeTotal": "ค่าธรรมเนียม：",
+        "goodsorder": {
+            "buyorsell": "เลือก"
+        },
+        "pricingorder": {
+             "buyorsell": "เลือก"
+        },
+        "pricingtrade": {
+            "buyorsell": "เลือก",
+            "charge": "ค่าธรรมเนียม",
+            "closepl": "กำไร/ขาดทุนจากการยกเลิกคำสั่งซื้อ"
+        }
+    },
     "position": {
         "transfer": {
             "transferqty":"ปริมาณการยกเลิก"
         },
         "goods": {
+            "buyorsell": "หมวดคำสั่งซื้อ",
+            "holderqty": "จำนวนคำสั่งซื้อ",
+            "curpositionqty": "จำนวนคำสั่งซื้อ",
+            "freezeqty": "ราคาที่ล็อกไว้",
+            "frozenqty": "ราคาที่ล็อกไว้",
+            "curholderamount": "ราคารวมคำสั่งซื้อ",
+            "holderamount": "ราคารวมคำสั่งซื้อ",
+            "tradetime": "เวลาที่ทำการสั่งซื้อ",
             "transferprice": "ราคาการยกเลิกการจอง",
             "tips1": "กรุณากรอกราคาการยกเลิกการจอง",
             "tips2": "กรุณากรอกปริมาณการยกเลิกการจอง",
             "qty": "ปริมาณการยกเลิก",
             "orderqty": "ปริมาณการยกเลิก",
-            "subtitle3": "ข้อมูลการยกเลิกการจอง"
+            "averageprice": "ราคาเฉลี่ยคำสั่งซื้อ",
+            "subtitle3": "ข้อมูลการยกเลิกการจอง",
+            "holddetail": {
+                "holderqty": "จำนวนคำสั่งซื้อ",
+                "freezeqty": "ราคาที่ล็อกไว้",
+                "profitLoss": "กำไร/ขาดทุนลอยตัว",
+                "holderamount": "ราคารวมคำสั่งซื้อ",
+                "tradetime": "เวลาที่ทำการสั่งซื้อ"
+            }
+        },
+        "pricing": {
+            "buyorsell": "เลือก",
+            "frozenqty": "ราคาที่ล็อกไว้",
+            "curholderamount": "ราคารวมคำสั่งซื้อ",
+            "averageprice": "ราคาเฉลี่ยคำสั่งซื้อ"
+        }
+    },
+    "banksign": {
+        "capital": {
+            "totalcharge": "รายละเอียดค่าธรรมเนียม："
+        }
+    },
+    "report": {
+        "title": "รายการหักบัญชีของผู้ใช้งาน",
+        "closepl": "กำไร/ขาดทุนจากการยกเลิกคำสั่งซื้อ",
+        "trade": {
+            "buyorselldisplay": "เลือก"
+        },
+        "position": {
+            "buyorselldisplay": "เลือก",
+            "frozenqty": "ราคาที่ล็อกไว้"
+        }
+    },
+    "mine": {
+        "setting": {
+            "orderBuyOrSell": "ค่าเริ่มต้น"
         }
     },
     "pcroute": {
         "bottom": {
-            "bottom_pricing": "การจองสินค้าสปอต"
+            "bottom_goods_position_transfer": "ยกเลิกการจอง",
+            "bottom_goods_position": "รายละเอียดคำสั่งซื้อ",
+            "bottom_pricing": "การจองสินค้าสปอต",
+            "bottom_pricing_position": "รายละเอียดคำสั่งซื้อ",
+            "bottom_swap_position": "รายละเอียดคำสั่งซื้อ"
+        },
+        "market": {
+            "title": "ตลาดจองซื้อสินค้า",
+            "market_trade": "ตลาดจองซื้อสินค้า"
         },
         "query": {
             "query_order_pricing": "การจองสินค้าสปอต"

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

@@ -9,15 +9,22 @@
         "order": "预订"
     },
     "account": {
+        "profitLoss": "浮动损益",
         "freezeMargin2": "履约准备金"
     },
     "quote": {
+        "bid": "预订价",
+        "ask": "回购价",
+        "holdvolume": "订单数量",
         "deposit": "履约准备金",
         "orderbuy": "预订",
         "transferbuy": "回购",
         "ordersell": "取消预订",
         "transfersell": "取消回购",
+        "buy": "预订",
+        "selll": "回购",
         "goods": {
+            "buyorsell": "选择",
             "taaccount": "账户"
         },
         "swap": {
@@ -27,11 +34,14 @@
             "permargin": "履约准备金"
         },
         "pricing": {
+            "buyorsell": "选择",
             "title": "下单",
             "deposit": "履约准备金",
             "title1": "现货预订"
         },
         "spot": {
+            "buyprice": "预订价",
+            "sellprice": "回购价",
             "title": "预订详情",
             "listingprice": "预定价格"
         },
@@ -39,22 +49,87 @@
             "title1": "回购详情"
         }
     },
+    "order": {
+        "feeTotal": "服务费：",
+        "goodsorder": {
+            "buyorsell": "选择"
+        },
+        "pricingorder": {
+             "buyorsell": "选择"
+        },
+        "pricingtrade": {
+            "buyorsell": "选择",
+            "charge": "服务费",
+            "closepl": "退订损益"
+        }
+    },
     "position": {
         "transfer": {
             "transferqty":"退订量"
         },
         "goods": {
+            "buyorsell": "订单类目",
+            "holderqty": "订单数量",
+            "curpositionqty": "订单数量",
+            "freezeqty": "锁定量",
+            "frozenqty": "锁定量",
+            "curholderamount": "订单金额",
+            "holderamount": "订单金额",
+            "tradetime": "订单时间",
             "transferprice": "退订价格",
             "tips1": "请输入退订价格",
             "tips2": "请输入退订量",
             "qty": "退订量",
             "orderqty": "退订量",
-            "subtitle3": "退订信息"
+            "averageprice": "订单均价",
+            "subtitle3": "退订信息",
+            "holddetail": {
+                "holderqty": "订单数量",
+                "freezeqty": "锁定量",
+                "profitLoss": "浮动损益",
+                "holderamount": "订单金额",
+                "tradetime": "订单时间"
+            }
+        },
+        "pricing": {
+            "buyorsell": "选择",
+            "frozenqty": "锁定量",
+            "curholderamount": "订单金额",
+            "averageprice": "订单均价"
+        }
+    },
+    "banksign": {
+        "capital": {
+            "totalcharge": "服务费汇总："
+        }
+    },
+    "report": {
+        "title": "用户结算单",
+        "closepl": "退订损益",
+        "trade": {
+            "buyorselldisplay": "选择"
+        },
+        "position": {
+            "buyorselldisplay": "选择",
+            "frozenqty": "锁定量"
+        }
+    },
+    "mine": {
+        "setting": {
+            "orderBuyOrSell": "默认"
         }
     },
     "pcroute": {
         "bottom": {
-            "bottom_pricing": "现货预订"
+            "bottom_goods_position_transfer": "退订",
+            "bottom_goods_position": "订单汇总",
+            "bottom_pricing": "现货预订",
+            "bottom_pricing_position": "订单汇总",
+            "bottom_swap_position": "订单汇总"
+        },
+        "market": {
+            "title": "现货市场",
+            "market_trade": "现货市场"
         },
         "query": {
             "query_order_pricing": "现货预订"

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

@@ -9,15 +9,22 @@
         "order": "預訂"
     },
     "account": {
+        "profitLoss": "浮動損益",
         "freezeMargin2": "履約準備金"
     },
     "quote": {
+        "bid": "預訂價",
+        "ask": "回購價",
+        "holdvolume": "訂單數量",
         "deposit": "履約準備金",
         "orderbuy": "預訂",
         "transferbuy": "回購",
         "ordersell": "取消預訂",
         "transfersell": "取消回購",
+        "buy": "預訂",
+        "selll": "回購",
         "goods": {
+            "buyorsell": "選擇",
             "taaccount": "賬戶"
         },
         "swap": {
@@ -27,11 +34,14 @@
             "permargin": "履約準備金"
         },
         "pricing": {
+            "buyorsell": "選擇",
             "title": "下單",
             "deposit": "履約準備金",
             "title1": "現貨預訂"
         },
         "spot": {
+            "buyprice": "預訂價",
+            "sellprice": "回購價",
             "title": "預訂詳情",
             "listingprice": "預定價格"
         },
@@ -39,22 +49,87 @@
             "title1": "回購詳情"
         }
     },
+    "order": {
+        "feeTotal": "服務費：",
+        "goodsorder": {
+            "buyorsell": "選擇"
+        },
+        "pricingorder": {
+             "buyorsell": "選擇"
+        },
+        "pricingtrade": {
+            "buyorsell": "選擇",
+            "charge": "服務費",
+            "closepl": "退訂損益"
+        }
+    },
     "position": {
         "transfer": {
             "transferqty":"退訂量"
         },
         "goods": {
+            "buyorsell": "訂單類目",
+            "holderqty": "訂單數量",
+            "curpositionqty": "訂單數量",
+            "freezeqty": "鎖定量",
+            "frozenqty": "鎖定量",
+            "curholderamount": "訂單金額",
+            "holderamount": "訂單金額",
+            "tradetime": "訂單時間",
             "transferprice": "退訂價格",
             "tips1": "請輸入退訂價格",
             "tips2": "請輸入退訂量",
             "qty": "退訂量",
             "orderqty": "退訂量",
-            "subtitle3": "退訂信息"
+            "averageprice": "訂單均價",
+            "subtitle3": "退訂信息",
+            "holddetail": {
+                "holderqty": "訂單數量",
+                "freezeqty": "鎖定量",
+                "profitLoss": "浮動損益",
+                "holderamount": "訂單金額",
+                "tradetime": "訂單時間"
+            }
+        },
+        "pricing": {
+            "buyorsell": "選擇",
+            "frozenqty": "鎖定量",
+            "curholderamount": "訂單金額",
+            "averageprice": "訂單均價"
+        }
+    },
+    "banksign": {
+        "capital": {
+            "totalcharge": "服務費彙總："
+        }
+    },
+    "report": {
+        "title": "用戶結算單",
+        "closepl": "退訂損益",
+        "trade": {
+            "buyorselldisplay": "選擇"
+        },
+        "position": {
+            "buyorselldisplay": "選擇",
+            "frozenqty": "鎖定量"
+        }
+    },
+    "mine": {
+        "setting": {
+            "orderBuyOrSell": "默認"
         }
     },
     "pcroute": {
         "bottom": {
-            "bottom_pricing": "現貨預訂"
+            "bottom_goods_position_transfer": "退訂",
+            "bottom_goods_position": "訂單彙總",
+            "bottom_pricing": "現貨預訂",
+            "bottom_pricing_position": "訂單彙總",
+            "bottom_swap_position": "訂單彙總"
+        },
+        "market": {
+            "title": "現貨市場",
+            "market_trade": "現貨市場"
         },
         "query": {
             "query_order_pricing": "現貨預訂"

src/packages/mobile/views/mine/profile/Index.vue

@@ -6,7 +6,7 @@
         <CellGroup>
             <Cell :title="$t('mine.profile.invoiceinfo')" :to="{ name: 'mine-invoice' }" is-link />
             <Cell :title="$t('mine.profile.addressinfo')" :to="{ name: 'mine-address' }" is-link />
-            <Cell :title="$t('mine.profile.wechat')" :to="{ name: 'mine-wechat' }" :value="decryptAES(userStore.userInfo.wechat ?? '')" is-link />
+            <Cell v-if="!showLoginAlert" :title="$t('mine.profile.wechat')" :to="{ name: 'mine-wechat' }" :value="decryptAES(userStore.userInfo.wechat ?? '')" is-link />
             <Cell :title="$t('mine.profile.email')" :to="{ name: 'mine-email' }" :value="decryptAES(userStore.userInfo.email ?? '')" is-link />
         </CellGroup>
     </app-view>
@@ -14,19 +14,23 @@
 
 <script lang="ts" setup>
 import { Cell, CellGroup } from 'vant'
-import { useUserStore } from '@/stores'
+import { useUserStore, useGlobalStore, i18n } from '@/stores'
 import { decryptAES } from '@/services/websocket/package/crypto'
 import { onActivated } from 'vue'
 
 defineProps({
     title: {
         type: String,
-        default: '个人信息', 
+        default: i18n.global.t('mine.profile.title'), 
     }
 })
 
 // userStore
 const userStore = useUserStore()
+const globalStore = useGlobalStore()
+
+// 是否需要弹出提示信息
+const showLoginAlert = globalStore.getSystemInfo('showLoginAlert')
 
 onActivated(() => {
     userStore.getUserData()