Handy_Cao пре 1 година
родитељ
комит
8efe743580

+ 5 - 2
public/locales/en-US.json

@@ -335,7 +335,8 @@
             "tips10": "Please enter the listing basis",
             "tips11": "Please enter delisting price",
             "tips12": "Please enter the delisting quantity",
-            "tips13": "The submission was successful."
+            "tips13": "The submission was successful.",
+            "tips14": "Delisting immediately?"
         },
         "pricing": {
             "title": "Trade",
@@ -461,7 +462,9 @@
                 "title": "Quick Clear",
                 "goodsId": "Goods",
                 "buyOrSell": "BuySell",
-                "price": "Price"
+                "price": "Price",
+                "tips1": "Please select the goods to be commissioned",
+                "tips2": "Please enter the cancellation price"
             }
         },
         "goodstrade": {

+ 5 - 2
public/locales/th-TH.json

@@ -336,7 +336,8 @@
             "tips10": "กรุณาพิมพ์คำสั่งลงไป",
             "tips11": "กรุณาใส่ราคาบัตร ที่เลือกไว้",
             "tips12": "กรุณาใส่จำนวนบัตร ที่ถอดออก",
-            "tips13": "ส่งสำเร็จแล้ว"
+            "tips13": "ส่งสำเร็จแล้ว",
+            "tips14": "คุณจะถอดการ์ดทันที หรือไม่"
         },
         "pricing": {
             "title": "สั่งซื้อสินค้า",
@@ -463,7 +464,9 @@
                 "title": "ถอยไป!",
                 "goodsId": "จัดหาสินค้า",
                 "buyOrSell": "เส้นทาง ที่มอบหมาย",
-                "price": "เลิกราคา"
+                "price": "เลิกราคา",
+                "tips1": "โปรดเลือกสินค้า ที่ได้รับมอบหมาย",
+                "tips2": "โปรดป้อนราคา ที่ยกเลิก"
             }
         },
         "goodstrade": {

+ 6 - 3
public/locales/zh-CN.json

@@ -318,7 +318,7 @@
             "pricemove": "价格类型",
             "currentaccount": "交易账户",
             "goodsname": "商品/代码",
-            "buyorsell": "挂牌/方向",
+            "buyorsell": "挂牌方向",
             "marketprice": "市价",
             "limitprice": "限价",
             "enableqty": "可摘量",
@@ -336,7 +336,8 @@
             "tips10": "请输入挂牌基差",
             "tips11": "请输入摘牌价格",
             "tips12": "请输入摘牌量",
-            "tips13": "提交成功。"
+            "tips13": "提交成功。",
+            "tips14": "是否立即摘牌?"
         },
         "pricing": {
             "title": "交易下单",
@@ -463,7 +464,9 @@
                 "title": "快撤",
                 "goodsId": "委托商品",
                 "buyOrSell": "委托方向",
-                "price": "撤销价格"
+                "price": "撤销价格",
+                "tips1": "请选择委托商品",
+                "tips2": "请输入撤销价格"
             }
         },
         "goodstrade": {

+ 8 - 8
src/packages/pc/components/modules/goods-detail/order/delisting/index.vue

@@ -1,17 +1,17 @@
 <!-- 买卖大厅-摘牌 -->
 <template>
-    <app-drawer title="摘牌" v-model:show="show" :width="400" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('quote.goods.title')" v-model:show="show" :width="400" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
-            <el-form-item label="挂牌方">
+            <el-form-item :label="t('quote.goods.username')">
                 <span>{{ selectedRow.username }}</span>
             </el-form-item>
-            <el-form-item label="挂牌价格">
+            <el-form-item :label="t('quote.goods.listingprice')">
                 <span>{{ selectedRow.orderprice }}</span>
             </el-form-item>
-            <el-form-item label="剩余量">
+            <el-form-item :label="t('quote.goods.remainqty')">
                 <span>{{ selectedRow.orderqty }}</span>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="摘牌量">
+            <el-form-item prop="OrderQty" :label="t('quote.goods.delistingqty')">
                 <div class="g-qty-group">
                     <el-input-number :placeholder="t('common.pleaseenter')" :min="0" :max="selectedRow.orderqty" :precision="0" :step="qtyStep"
                         v-model="formData.OrderQty" />
@@ -91,7 +91,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入摘牌量'))
+                callback(new Error(t('quote.swap.tips12')))
             }
         }
     }],
@@ -110,8 +110,8 @@ const onSubmit = (buildType: number) => {
     formRef.value?.validate((valid) => {
         if (valid) {
             ElMessageBox.confirm(
-                isTrademode16.value ? '是否立即摘牌?' : '*若存在价格匹配的反方向委托订单,系统将会自动撤销。',
-                isTrademode16.value ? t('common.tips') : '是否立即摘牌?'
+                isTrademode16.value ? t('quote.swap.tips14') : t('quote.goods.tips2'),
+                isTrademode16.value ? t('common.tips') : t('quote.swap.tips14')
             ).then(() => {
                 const { goodsid, orderid, orderprice, buyorsell } = props.selectedRow
                 const { marketid = 0 } = quote.value ?? {}

+ 17 - 17
src/packages/pc/views/account/sign/components/certification/index.vue

@@ -1,25 +1,25 @@
 <!-- 账户管理-实名认证 -->
 <template>
-    <app-drawer title="实名认证" v-model:show="show" :width="500" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('user.authentication.title')" v-model:show="show" :width="500" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="证件类型" prop="cardtype">
+            <el-form-item :label="t('user.authentication.cardtype')" prop="cardtype">
                 <el-select effect="dark" v-model="formData.cardtype">
                     <el-option :label="item.label" :value="item.value" v-for="(item, index) in getCertificateTypeList()"
                         :key="index" />
                 </el-select>
             </el-form-item>
-            <el-form-item prop="username" label="姓名">
-                <el-input placeholder="请输入用户姓名" v-model="formData.username" />
+            <el-form-item prop="username" :label="t('user.authentication.customername')">
+                <el-input :placeholder="t('user.authentication.pleaseentertheusername')" v-model="formData.username" />
             </el-form-item>
-            <el-form-item prop="cardnum" label="证件号码">
-                <el-input placeholder="请输入证件号码" v-model="formData.cardnum" />
+            <el-form-item prop="cardnum" :label="t('user.authentication.cardnum')">
+                <el-input :placeholder="t('user.authentication.pleaseenterthecardnum')" v-model="formData.cardnum" />
             </el-form-item>
-            <el-form-item prop="cardfrontphotourl" label="证件正面照片">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="b_afterRead"
+            <el-form-item prop="cardfrontphotourl" :label="t('user.authentication.cardfrontphoto')">
+                <app-upload :file-types="['image']" :type-message="t('user.avater.tips')" @change="b_afterRead"
                     :rules="formRules.cardfrontphotourl" />
             </el-form-item>
-            <el-form-item prop="cardbackphotourl" label="证件反面照片">
-                <app-upload :file-types="['image']" type-message="请选择正确的图片类型" @change="f_afterRead"
+            <el-form-item prop="cardbackphotourl" :label="t('user.authentication.cardbackphoto')">
+                <app-upload :file-types="['image']" :type-message="t('user.avater.tips')" @change="f_afterRead"
                     :rules="formRules.cardbackphotourl" />
             </el-form-item>
         </el-form>
@@ -62,7 +62,7 @@ const f_afterRead = ({ filePath }: { filePath: string }) => {
 const formRules: FormRules = {
     username: [{
         required: true,
-        message: '请输入用户姓名',
+        message: t('user.authentication.pleaseentertheusername'),
         trigger: 'blur'
     }],
     cardnum: [{
@@ -72,7 +72,7 @@ const formRules: FormRules = {
         validator: (rule, value, callback) => {
             if (validateRules.cardno.validate(value)) {
                 if (getIdCardAge(value)) {
-                    return callback(new Error('开户失败,您的年龄不符合开户要求'))
+                    return callback(new Error(t('user.authentication.openfailure')))
                 } 
                 return callback()
             }
@@ -81,11 +81,11 @@ const formRules: FormRules = {
     }],
     cardbackphotourl: [{
         required: true,
-        message: '请上传证件背面照片',
+        message: t('user.authentication.pleaseuploadthecardbackphoto'),
     }],
     cardfrontphotourl: [{
         required: true,
-        message: '请上传证件正面照片',
+        message: t('user.authentication.pleaseuploadthecardfrontphoto'),
     }],
 }
 
@@ -99,13 +99,13 @@ const onSubmit = () => {
         if (valid) {
             formSubmit().then((res) => {
                 if (res.code != '0') {
-                    ElMessage.error('实名认证提交请求失败:' + res.message)
+                    ElMessage.error(t('common.tips9')  + res.message)
                     return
                 }
-                ElMessage.success('实名认证提交请求成功')
+                ElMessage.success(t('user.authentication.opensuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('实名认证提交请求失败:' + err)
+                ElMessage.error(t('common.tips9') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/footer/goods/order/clear/index.vue

@@ -62,7 +62,7 @@ const goodsList = computed(() => props.dataList.filter((e, i, arr) => arr.findIn
 const formRules: FormRules = {
     goodsId: [{
         required: true,
-        message: '请选择委托商品'
+        message: t('order.goodsorder.clear.tips1')
     }],
     price: [{
         required: true,
@@ -70,7 +70,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入撤销价格'))
+                callback(new Error(t('order.goodsorder.clear.tips2')))
             }
         }
     }]

+ 1 - 1
src/packages/pc/views/footer/pricing/order/clear/index.vue

@@ -70,7 +70,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入撤销价格'))
+                callback(new Error(t('order.goodsorder.clear.tips2')
             }
         }
     }]

+ 8 - 8
src/packages/pc/views/market/trade/presell/bidding/detail/delisting/index.vue

@@ -1,22 +1,22 @@
 <!-- 交易市场-预售转让-竞拍预售-详情-出价 -->
 <template>
-    <app-drawer title="出价" :width="400" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('quote.presale.bidfor')" :width="400" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="80px" :model="formData" :rules="formRules">
-            <el-form-item label="起拍价">
+            <el-form-item :label="t('quote.presale.startprice')">
                 <span>{{ selectedRow.startprice }}</span>
             </el-form-item>
-            <el-form-item prop="OrderPrice" label="认购价">
+            <el-form-item prop="OrderPrice" :label="t('quote.presale.SubscriptionPrice')">
                 <el-input-number :placeholder="t('common.pleaseenter')" :min="selectedRow.startprice" :precision="quote?.decimalplace" :step="quote?.decimalvalue"
                     v-model="formData.OrderPrice" />
             </el-form-item>
-            <el-form-item prop="OrderQty" label="认购量">
+            <el-form-item prop="OrderQty" :label="t('quote.presale.SubscriptionQty')">
                 <el-input-number :placeholder="t('common.pleaseenter')" :min="0" :max="selectedRow.presaleqty" :precision="0"
                     v-model="formData.OrderQty" />
             </el-form-item>
-            <el-form-item label="预售定金">
+            <el-form-item :label="t('quote.presale.earnest')">
                 <span>{{ deposit }}</span>
             </el-form-item>
-            <el-form-item label="可用资金">
+            <el-form-item :label="t('quote.presale.avaiableMoney')">
                 <span>{{ accountStore.currentAccount.avaiableMoney?.toFixed(2) }}</span>
             </el-form-item>
         </el-form>
@@ -80,10 +80,10 @@ const formRules: FormRules = {
                 if (value <= maxbuyqty) {
                     callback()
                 } else {
-                    callback(new Error('认购量不能大于' + maxbuyqty))
+                    callback(new Error(t('quote.ballot.ordercannotbegreaterthan') + maxbuyqty))
                 }
             } else {
-                callback(new Error('请输入认购量'))
+                callback(new Error(t('quote.ballot.pleaseenterthesubscriptionquantity')))
             }
         }
     }],

+ 1 - 1
src/packages/pc/views/market/trade/spot/order/delisting/index.vue

@@ -111,7 +111,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入摘牌量'))
+                callback(new Error(t('quote.goods.tips4')))
             }
         }
     }],

+ 10 - 10
src/packages/pc/views/market/trade/swap/detail/order/delisting/index.vue

@@ -14,7 +14,7 @@
                     <el-radio :label="3" v-if="selectedRow.pricemode === 3">浮动价</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="挂牌方向">
+            <el-form-item :label="t('quote.swap.buyorsell')">
                 <span>{{ getBuyOrSellName(selectedRow.buyorsell) }}</span>
             </el-form-item>
             <el-form-item label="挂牌价格">
@@ -26,25 +26,25 @@
                     <el-radio :label="2">限价</el-radio>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="可摘量">
+            <el-form-item :label="t('quote.swap.enableqty')">
                 <span>{{ selectedRow.orderqty }}</span>
             </el-form-item>
-            <el-form-item label="挂牌金额" v-if="priceMove === 2">
+            <el-form-item :label="t('quote.swap.orderamount')" v-if="priceMove === 2">
                 <span>{{ amount.toFixed(2) }}</span>
             </el-form-item>
-            <el-form-item label="估算金额" v-if="priceMove === 3">
+            <el-form-item :label="t('quote.swap.estimateamount')" v-if="priceMove === 3">
                 <span>{{ amount.toFixed(2) }}</span>
             </el-form-item>
-            <el-form-item label="履约保证金">
+            <el-form-item :label="t('quote.swap.permargin')">
                 <span>{{ permargin.toFixed(2) }}</span>
             </el-form-item>
-            <el-form-item label="可用资金">
+            <el-form-item :label="t('quote.swap.avaiablemoney')">
                 <span>{{ accountStore.currentAccount.avaiableMoney?.toFixed(2) }}</span>
             </el-form-item>
             <el-form-item v-if="priceMode != 1" prop="OrderPrice" :label="selectedRow.buyorsell === 0 ? '卖出价格' : '买入价格'">
                 <el-input-number :placeholder="t('common.pleaseenter')" :min="0.0" :step="Math.pow(10, -1*(goods?.decimalplace ?? 0))" :precision="(goods?.decimalplace ?? 2)" v-model="formData.OrderPrice" @change="calculateDelistingAmount"/>
             </el-form-item>
-            <el-form-item prop="OrderQty" label="摘牌量">
+            <el-form-item prop="OrderQty" :label="t('quote.swap.orderqty2')">
                 <div class="g-qty-group">
                     <el-input-number :placeholder="t('common.pleaseenter')" :min="0" :max="selectedRow.orderqty" :precision="0" :step="qtyStep"
                         v-model="formData.OrderQty" @change="calculateDelistingAmount"/>
@@ -174,7 +174,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入摘牌量'))
+                callback(new Error(t('quote.goods.tips4')))
             }
         }
     }],
@@ -184,7 +184,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入摘牌价格'))
+                callback(new Error(t('quote.swap.tips11')))
             }
         }
     }],
@@ -205,7 +205,7 @@ const onSubmit = (buildType: number) => {
     formRef.value?.validate((valid) => {
         if (valid) {
             ElMessageBox.confirm(
-                '是否立即摘牌?'
+                t('quote.swap.tips14')
             ).then(() => {
                 const { goodsid, orderid, buyorsell } = props.selectedRow
                 const { marketid = 0 } = goods.value ?? {}