Handy_Cao 1 năm trước cách đây
mục cha
commit
e85ea2b72f

+ 2 - 1
oem/tss/locales/extras/en-US.json

@@ -132,13 +132,14 @@
         "cancel": "Unbind BankCard",
         "addbanksign": "Add BankCard",
         "modifybanksign": "Modify BankCard",
+        "youhavenotaddedasignedaccount": "You have not bound your bank card account",
         "tips1": "Please add bank card account information account information first!" ,
         "tips2": "Go to add bank card information ",
         "tips7": "No bank card information added ",
         "tips8": "Real-name authentication is under review, temporarily can not add bank card information request operation!" ,
         "tips9": "Please send a letter to the settlement center to modify the information before modifying, otherwise it will affect the recharge and withdrawal." ,
         "tips12": "Are you sure you want to unbind your bank card?" ,
-        "tips13": "The untied bank card was submitted successfully, please confirm the result later ",
+        "tips13": "submitted successfully, please confirm the result later ",
         "capital": {
             "title2": "Account Info",
             "totalprofit": "TotalProfit:",

+ 2 - 1
oem/tss/locales/extras/th-TH.json

@@ -132,13 +132,14 @@
         "cancel": "แก้มัดบัตรธนาคาร",
         "addbanksign": "เพิ่มบัตรธนาคาร",
         "modifybanksign": "แก้ไขบัตรธนาคาร",
+        "youhavenotaddedasignedaccount": "คุณยังไม่ได้ผูกบัญชีกับบัญชีธนาคาร",
         "tips1": "กรุณาเพิ่มข้อมูลบัญชีธนาคารก่อน!",
         "tips2": "เพิ่มข้อมูลบัตรธนาคาร",
         "tips7": "ไม่มีการเพิ่มข้อมูลบัตรธนาคาร",
         "tips8": "กำลังตรวจสอบการรับรอง ที่แท้จริง และไม่สามารถเพิ่มข้อมูลบัตรธนาคารเพื่อดำเนินการได้!",
         "tips9": "กรุณาส่งจดหมายไป ที่ศูนย์การชำระบัญชีก่อนแล้วค่อยแก้ไขข้อมูลไม่ เช่น นั้น จะมีผลต่อการเติมเงิน และการถอนเงิน",
         "tips12": "ยืนยันการถอนบัตรเครดิตไหม",
-        "tips13": "ส่งบัตรเครดิตเพื่อแก้ไขปัญหาเรียบร้อยแล้วโปรดยืนยันผลลัพธ์ในภายหลัง",
+        "tips13": "ส่งสำเร็จแล้วโปรดยืนยันผลลัพธ์ในภายหลัง",
         "capital": {
             "title2": "ข้อมูลบัญชีผู้ใช้",
             "totalprofit": "รายละเอียดส่วนต่าง:",

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

@@ -132,13 +132,14 @@
         "cancel": "解绑银行卡",
         "addbanksign": "添加银行卡",
         "modifybanksign": "修改银行卡",
+        "youhavenotaddedasignedaccount": "您还未绑定银行卡账户",
         "tips1": "请先添加银行卡账户信息账户信息!",
         "tips2": "去添加银行卡信息",
         "tips7": "未添加银行卡信息",
         "tips8": "实名认证正在审核中,暂不能进行添加银行卡信息请求操作!",
         "tips9": "请先发函到结算中心修改信息后再修改,否则将会影响充值、提现。",
         "tips12": "确认要解绑银行卡吗?",
-        "tips13": "解绑银行卡提交成功,请稍后确认结果",
+        "tips13": "提交成功,请稍后确认结果",
         "capital": {
             "title2": "账户信息",
             "totalprofit": "差额汇总:",

+ 2 - 1
oem/tss/locales/extras/zh-TW.json

@@ -132,13 +132,14 @@
         "cancel": "解綁銀行卡",
         "addbanksign": "添加銀行卡",
         "modifybanksign": "修改銀行卡",
+        "youhavenotaddedasignedaccount": "您還未綁定銀行卡賬戶",
         "tips1": "請先添加銀行卡賬戶信息賬戶信息!",
         "tips2": "去添加銀行卡信息",
         "tips7": "未添加銀行卡信息",
         "tips8": "實名認證正在審覈中,暫不能進行添加銀行卡信息請求操作!",
         "tips9": "請先發函到結算中心修改信息後再修改,否則將會影響充值、提現。",
         "tips12": "確認要解綁銀行卡嗎?",
-        "tips13": "解綁銀行卡提交成功,請稍後確認結果",
+        "tips13": "提交成功,請稍後確認結果",
         "capital": {
             "title2": "賬戶信息",
             "totalprofit": "差額彙總:",

+ 2 - 2
public/locales/zh-CN.json

@@ -1273,7 +1273,7 @@
         "Pleaseenterbranchbankname": "请输入开户行支行名称",
         "Pleaseenterbranchbankno": "请输入开户行支行号",
         "submitsuccess1": "签约信息修改提交成功。",
-        "submitsuccess2": "签约提交成功,请稍后确认结果。",
+        "submitsuccess2": "提交成功,请稍后确认结果。",
         "tips1": "请先添加签约账户信息!",
         "tips2": "去签约",
         "tips3": "请先实名认证,再进行该操作!",
@@ -1286,7 +1286,7 @@
         "tips10": "请前往手机App进行协议签署操作!",
         "tips11": "请选择银行信息!",
         "tips12": "确认要解约吗?",
-        "tips13": "解约提交成功,请稍后确认结果",
+        "tips13": "提交成功,请稍后确认结果",
         "tips14": "选择银行",
         "tips15": "请输入银行名称",
         "search": {

+ 11 - 9
src/packages/mobile/views/pricing/trade/v2/Index.vue

@@ -35,7 +35,7 @@
         <!-- 下单 -->
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
             <CellGroup inset>
-                <Field :label="$t('quote.pricing.pricemode')" v-if="quote?.trademode != 53">
+                <!-- <Field :label="$t('quote.pricing.pricemode')" v-if="quote?.trademode != 53">
                     <template #input>
                         <RadioGroup v-model="formData.PriceMode" direction="horizontal" @click="onPriceModeChanged">
                             <Radio v-for="(item, index) in getPricemode2List()" :key="index" :name="item.value">{{
@@ -43,7 +43,7 @@
                             }}</Radio>
                         </RadioGroup>
                     </template>
-                </Field> 
+                </Field>  -->
                 <Field name="OrderQty" :label="$t('quote.pricing.orderqty')">
                     <template #input>
                         <div class="g-qty-group">
@@ -115,7 +115,7 @@ import { useNavigation } from '@mobile/router/navigation'
 import { shallowRef, onMounted, computed, defineAsyncComponent } from 'vue'
 import { Form, Field, Button, FieldRule, FormInstance, Radio, RadioGroup, CellGroup, Icon, Tab, Tabs } from 'vant'
 import { useOrder } from '@/business/trade'
-import { BuyOrSell, BuildType, getPricemode2List, PriceMode } from '@/constants/order'
+import { BuyOrSell, BuildType, PriceMode } from '@/constants/order'
 import { useComponent } from '@/hooks/component'
 import { fullloading, dialog } from '@/utils/vant'
 import { formatDecimal, handleNumberValue } from '@/filters'
@@ -127,19 +127,21 @@ import AppContact from '@mobile/components/modules/contact/index.vue'
 const { getQueryString, getQueryStringToNumber } = useNavigation()
 const { global: { t } } = i18n
 const futuresStore = useFuturesStore()
-const goodsList = computed(() => {
-    return futuresStore.getGoodsListByTradeMode(10)
-})
 
-// 如果为空默认显示第一个商品
-const goodsCode = shallowRef(getQueryString('goodscode') ?? goodsList.value[0].goodscode)
-const goodsid = shallowRef(getQueryStringToNumber('goodsid') ?? goodsList.value[0].goodsid)
+
 const buyOrSell = getQueryStringToNumber('buyOrSell')
 const buildType = getQueryStringToNumber('buildType')
 const orderQty = getQueryStringToNumber('orderQty')
 const quote = shallowRef<Model.GoodsQuote>()
 const showContact = shallowRef(false) // 显示联系人选择列表
 
+const goodsList = computed(() => {
+    return futuresStore.getGoodsListByTradeMode(quote.value?.trademode ?? 10)
+})
+// 如果为空默认显示第一个商品
+const goodsCode = shallowRef(getQueryString('goodscode') ?? goodsList.value[0].goodscode)
+const goodsid = shallowRef(getQueryStringToNumber('goodsid') ?? goodsList.value[0].goodsid)
+
 const decimalplace = computed(() => {
     const { decimalplace = 0.0 } = futuresStore.getGoodsQuote(goodsCode.value).value ?? {}
     return decimalplace

+ 6 - 9
src/packages/tss/views/bank/wallet/components/deposit/Index.vue

@@ -142,13 +142,8 @@ const doDepositWarning = () => {
             const s = moment(startTime.value, 'HH:mm')
             const e = moment(endTime.value, 'HH:mm')
             if (n.isSameOrAfter(s) && n.isBefore(e)) {
-                dialog({ message: t('banksign.wallet.deposit.whetherthedeposittransferhasbeenmadeatthebankend'), showCancelButton: true, confirmButtonText: t('operation.confirm'), cancelButtonText: t('operation.cancel'), }).then(() => {
-                    /// 提交
-                    formSubmit()
-                }).catch(() => {
-                    /// 返回上一层
-                    router.back()
-                })
+                /// 提交
+                formSubmit()
             } else {
                 dialog({
                     title: t('common.tips'),
@@ -186,7 +181,9 @@ const formSubmit = () => {
         let isComplete = false // 请求是否结束
         const complete = () => {
             isComplete = true
-            dialog('提交成功,请稍后确认结果').then(() => {
+            dialog({
+                message: i18n.global.t('banksign.tips13')
+            }).then(() => {
                 router.back()
             })
         }
@@ -200,7 +197,7 @@ const formSubmit = () => {
             }
         }).catch((err) => {
             if (!isComplete) {
-                dialog(t('common.submitfailure') + err).then(() => {
+                dialog(i18n.global.t('common.submitfailure') + err).then(() => {
                     formData.Amount = undefined
                 })
             }