Handy_Cao преди 1 година
родител
ревизия
c9bcf03ac1

+ 3 - 0
oem/tss/locales/extras/en-US.json

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "TCE Spot Pre Order Platform"
     },
+    "tabbar": {
+        "trade": "Reservation"
+    },
     "operation": {
         "transfer": "Unsubscribe",
         "close": "Unsubscribe",

+ 3 - 0
oem/tss/locales/extras/th-TH.json

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "แพลตฟอร์มการสั่งซื้อล่วงหน้าสปอตร์"
     },
+    "tabbar": {
+        "trade": "การจอง"
+    },
     "operation": {
         "transfer": "ยกเลิกการจอง",
         "close": "ยกเลิกการจอง",

+ 3 - 0
oem/tss/locales/extras/zh-CN.json

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "泰国商品交易所\r\n现货预订平台"
     },
+    "tabbar": {
+        "trade": "预订"
+    },
     "operation": {
         "transfer": "退订",
         "close": "退订",

+ 3 - 0
oem/tss/locales/extras/zh-TW.json

@@ -3,6 +3,9 @@
         "name": "TCE",
         "slogan": "泰國商品交易所\r\n現貨預訂平臺"
     },
+    "tabbar": {
+        "trade": "預訂"
+    },
     "operation": {
         "transfer": "退訂",
         "close": "退訂",

+ 1 - 0
public/locales/en-US.json

@@ -368,6 +368,7 @@
             "enableQty": "Estimate Buy Qty",
             "deposit": "Deposit",
             "avaiableMoney": "Avaiable Funds",
+            "orderdetails": "OrderDetails",
             "tips1": "Enter order qty",
             "tips2": "Enter order price",
             "tips3": "Enter market maxsub"

+ 1 - 0
public/locales/th-TH.json

@@ -369,6 +369,7 @@
             "enableQty": "คาดการณ์ได้",
             "deposit": "มัดจำ",
             "avaiableMoney": "เงิน ที่มีอยู่",
+            "orderdetails": "รายละเอียดการสั่งซื้อ",
             "tips1": "กรุณาใส่จำนวน",
             "tips2": "กรุณาใส่ราคา",
             "tips3": "โปรดป้อนช่วงต่าง ๆ ของจุด"

+ 1 - 0
public/locales/zh-CN.json

@@ -369,6 +369,7 @@
             "enableQty": "预估可订立量",
             "deposit": "预扣保证金",
             "avaiableMoney": "可用资金",
+            "orderdetails": "订单明细",
             "tips1": "请输入数量",
             "tips2": "请输入价格",
             "tips3": "请输入点差范围"

+ 1 - 0
public/locales/zh-TW.json

@@ -369,6 +369,7 @@
             "enableQty": "預估可訂立量",
             "deposit": "預扣保證金",
             "avaiableMoney": "可用資金",
+            "orderdetails": "訂單明細",
             "tips1": "請輸入數量",
             "tips2": "請輸入價格",
             "tips3": "請輸入點差範圍"

+ 1 - 1
src/packages/mobile/views/mine/setting/Index.vue

@@ -15,7 +15,7 @@
                         <app-iconfont icon="g-icon-cancel">{{ $t('routes.usercancel') }}</app-iconfont>
                     </template>
                 </Cell>
-                <Field is-link v-if="globalStore.getSystemInfo('i18nEnabled')">
+                <Field readonly is-link v-if="globalStore.getSystemInfo('i18nEnabled')">
                     <template #left-icon>
                         <app-iconfont icon="g-icon-lang">{{ $t('mine.setting.language') }}</app-iconfont>
                     </template>

+ 2 - 2
src/packages/mobile/views/pricing/trade/Index.vue

@@ -136,7 +136,7 @@
                 </Button> -->
             </template>
         </div>
-        <Tabs class="van-tabs--list" v-model:active="active">
+        <Tabs class="van-tabs--list" v-model:active="active" >
             <template v-for="(item, index) in components.filter(e => e.show === true)" :key="index">
                 <Tab :title="item.title" :name="item.name">
                     <component :is="item.component" v-bind="{ goodsCode, goodsid, fromTrade, pictureurl }" @callBack="itemBack"/>
@@ -244,7 +244,7 @@ const components = [
 // },
 {
     name: 'holdlb2',
-    title: t('pcroute.bottom.bottom_pricing_detail2'),
+    title: t('quote.pricing.orderdetails'),
     component: defineAsyncComponent(() => import('../trade/holdlb2/Index.vue')),
     detail: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/detail2/Index.vue')),
     show: true

+ 5 - 2
src/packages/pc/components/layouts/page/index.vue

@@ -44,7 +44,7 @@
       </div>
       <div class="statusbar-right">
         <ul>
-          <li>
+          <li v-if="!showLoginAlert">
             <el-popover trigger="hover" :title="t('account.formula')" :content="t('account.tips1')" :width="220">
               <template #reference>
                 <span :class="accountStore.currentAccount.hazardRatioColor" style="cursor: pointer;">{{
@@ -53,7 +53,7 @@
               </template>
             </el-popover>
           </li>
-          <li>
+          <li v-if="!showLoginAlert">
             <el-popover trigger="hover" :title="t('account.formula')" :content="t('account.tips2')" :width="280">
               <template #reference>
                 <span :class="accountStore.currentAccount.hazardRatioColor" style="cursor: pointer;">{{
@@ -114,6 +114,9 @@ const serverTime = ref<Moment>()
 const meta = document.getElementsByTagName('meta')
 const version = meta.namedItem('revised')?.content ?? '0'
 
+// 是否需要弹出提示信息
+const showLoginAlert = globalStore.getSystemInfo('showLoginAlert')
+
 const { t } = i18n.global
 
 // 手动给组件添加 name 属性,处理缓存 exclude 无效的问题

+ 1 - 1
src/packages/pc/views/market/trade/pricing/list/listing/index.vue

@@ -102,7 +102,7 @@ const formRef = shallowRef<FormInstance>()
 // 数量步长列表
 const qtyStepList = computed(() => {
     const system_1009 = Number(getSystemParamValue('1009')) ?? 1
-    return [1*system_1009, 5*system_1009, 10*system_1009]
+    return [1*system_1009, 10*system_1009, 100*system_1009]
 }) 
 const qtyStep = shallowRef(qtyStepList.value[0]) // 数量步长
 const { t } = i18n.global

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

@@ -54,12 +54,12 @@
                             <span>{{ $t('mine.availableFunds') }}</span>
                             <span>{{ currentAccount.avaiableMoney?.toFixed(2) }}</span>
                         </li>
-                        <li>
+                        <!-- <li>
                             <span>{{ $t('mine.riskRate') }}</span>
                             <span :class="currentAccount.hazardRatioColor">
                                 {{ parsePercent(currentAccount.hazardRatio) }}
                             </span>
-                        </li>
+                        </li> -->
                     </ul>
                 </div>
                 <div class="button">