Handy_Cao 1 年之前
父節點
當前提交
4629ead8b0
共有 36 個文件被更改,包括 111 次插入103 次删除
  1. 11 6
      public/locales/en-US.json
  2. 6 1
      public/locales/zh-CN.json
  3. 2 2
      src/packages/pc/components/layouts/header/components/avater/index.vue
  4. 1 1
      src/packages/pc/components/layouts/header/components/cancel/index.vue
  5. 1 1
      src/packages/pc/components/modules/delivery/index.vue
  6. 2 2
      src/packages/pc/components/modules/goods-detail/order/delisting/index.vue
  7. 4 4
      src/packages/pc/views/account/address/components/default/index.vue
  8. 4 4
      src/packages/pc/views/account/address/components/delete/index.vue
  9. 14 14
      src/packages/pc/views/account/address/components/edit/index.vue
  10. 5 7
      src/packages/pc/views/account/address/index.vue
  11. 3 3
      src/packages/pc/views/account/receipt/components/delete/index.vue
  12. 2 2
      src/packages/pc/views/account/receipt/components/edit/index.vue
  13. 8 8
      src/packages/pc/views/account/receipt/index.vue
  14. 1 1
      src/packages/pc/views/account/sign/components/cancel/index.vue
  15. 1 1
      src/packages/pc/views/footer/goods/delivery/cancel/index.vue
  16. 1 1
      src/packages/pc/views/footer/goods/order/cancel/index.vue
  17. 2 2
      src/packages/pc/views/footer/performance/components/contracted/index.vue
  18. 2 2
      src/packages/pc/views/footer/performance/components/delay/index.vue
  19. 2 2
      src/packages/pc/views/footer/performance/components/edit/index.vue
  20. 2 2
      src/packages/pc/views/footer/performance/components/manual/index.vue
  21. 2 2
      src/packages/pc/views/footer/presell/presellposition/deposit/index.vue
  22. 1 1
      src/packages/pc/views/footer/presell/transferorder/cancel/index.vue
  23. 2 2
      src/packages/pc/views/footer/presell/transferposition/append/index.vue
  24. 1 1
      src/packages/pc/views/footer/presell/transferposition/listing/index.vue
  25. 2 2
      src/packages/pc/views/footer/pricing/order/cancel/index.vue
  26. 2 2
      src/packages/pc/views/footer/spot/order/cancel/index.vue
  27. 2 2
      src/packages/pc/views/footer/swap/order/cancel/index.vue
  28. 2 2
      src/packages/pc/views/footer/swap/position/close/index.vue
  29. 9 9
      src/packages/pc/views/market/trade/goods/list/listing/index.vue
  30. 2 2
      src/packages/pc/views/market/trade/presell/ballot/detail/delisting/index.vue
  31. 2 2
      src/packages/pc/views/market/trade/presell/bidding/detail/delisting/index.vue
  32. 2 2
      src/packages/pc/views/market/trade/spot/listing/index.vue
  33. 2 2
      src/packages/pc/views/market/trade/spot/order/delisting/index.vue
  34. 2 2
      src/packages/pc/views/market/trade/spot/order/listing/index.vue
  35. 2 2
      src/packages/pc/views/market/trade/swap/detail/listing/index.vue
  36. 2 2
      src/packages/pc/views/market/trade/swap/detail/order/delisting/index.vue

+ 11 - 6
public/locales/en-US.json

@@ -216,12 +216,14 @@
             "pleaseenterthesubscriptionquantity": "Please enter the subscription quantity"
         },
         "goods": {
-            "title": "delisting",
-            "orderprice": "price",
-            "orderqty": "qty",
-            "username": "listinger",
+            "title": "Delisting",
+            "title1": "Order Trade",
+            "orderprice": "Price",
+            "orderqty": "Qty",
+            "goods": "Goods",
+            "username": "Listinger",
             "nodeal": "You can't make a deal with yourself",
-            "buyorsell": "buyorsell",
+            "buyorsell": "Direction",
             "pleaseenterorderprice": "pleaseenterorderprice",
             "pleaseenterorderqty": "pleaseenterorderqty",
             "tips1": "Are you sure to submit it?",
@@ -1038,13 +1040,16 @@
             "phoneNum": "Mobile",
             "receiverName": "UserName",
             "region": "Region",
+            "address": "Address",
+            "isdefault": "IsDefault",
             "modifyaddressinfo": "Modify",
             "addaddressinfo": "Add Address",
             "tips1": "Please enter the consignee",
             "tips2": "Please enter your contact number",
             "tips3": "Please select the delivery area",
             "tips4": "Please enter the address details",
-            "tips5": "Delete the shipping address?"
+            "tips5": "Delete the shipping address?",
+            "tips6": "Is the address set as the default?"
         },
         "invoice": {
             "title": "Invoice",

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

@@ -218,11 +218,13 @@
         },
         "goods": {
             "title": "摘牌",
+            "title1": "订单交易",
             "orderprice": "价格",
             "orderqty": "数量",
             "username": "挂牌方",
             "nodeal": "不能与自己成交",
             "buyorsell": "方向",
+            "goods": "商品",
             "pleaseenterorderprice": "请输入价格",
             "pleaseenterorderqty": "请输入数量",
             "tips1": "确认要提交吗?",
@@ -1042,13 +1044,16 @@
             "phoneNum": "联系电话",
             "receiverName": "收货人",
             "region": "收货地区",
+            "address": "收货地址",
+            "isdefault": "是否默认",
             "modifyaddressinfo": "修改收货地址",
             "addaddressinfo": "新增收货地址",
             "tips1": "请输入收货人",
             "tips2": "请输入联系电话",
             "tips3": "请选择收货地区",
             "tips4": "请输入详细地址",
-            "tips5": "是否删除该收货地址?"
+            "tips5": "是否删除该收货地址?",
+            "tips6": "该地址是否设为默认?"
         },
         "invoice": {
             "title": "发票信息",

+ 2 - 2
src/packages/pc/components/layouts/header/components/avater/index.vue

@@ -61,10 +61,10 @@ const onSubmit = () => {
                 data: formData
             }).then(() => {
                 userStore.getUserData()
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 1 - 1
src/packages/pc/components/layouts/header/components/cancel/index.vue

@@ -41,7 +41,7 @@ const onSubmit = () => {
         ElMessage.success('提交成功,请等待审核。')
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

+ 1 - 1
src/packages/pc/components/modules/delivery/index.vue

@@ -177,7 +177,7 @@ const onSubmit = async () => {
         if (errMessage.length) {
             ElMessage.error('部分交收失败:' + errMessage[0])
         } else {
-            ElMessage.success('提交成功')
+            ElMessage.success(t('common.submitsuccess'))
         }
         onCancel(true)
     } else {

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

@@ -130,10 +130,10 @@ const onSubmit = (buildType: number) => {
                 formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
 
                 formSubmit().then(() => {
-                    ElMessage.success('提交成功')
+                    ElMessage.success(t('common.submitsuccess'))
                     onCancel(true)
                 }).catch((err) => {
-                    ElMessage.error('提交失败:' + err)
+                    ElMessage.error(t('common.submitfailure') + err)
                 })
             })
         }

+ 4 - 4
src/packages/pc/views/account/address/components/default/index.vue

@@ -1,7 +1,7 @@
 <!-- 账户管理-收货地址管理-设为默认 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">该地址是否设为默认?</div>
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">{{ t('mine.address.tips6') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -36,10 +36,10 @@ const onCancel = (isRefresh = false) => {
 
 const onSubmit = () => {
     updateAddressIsDefault().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

+ 4 - 4
src/packages/pc/views/account/address/components/delete/index.vue

@@ -1,7 +1,7 @@
 <!-- 账户管理-收货地址管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">是否删除该地址?</div>
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">{{ t('mine.address.tips5') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.cancel') }}</el-button>
@@ -36,10 +36,10 @@ const onCancel = (isRefresh = false) => {
 
 const onSubmit = () => {
     deleteAddress().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

+ 14 - 14
src/packages/pc/views/account/address/components/edit/index.vue

@@ -1,9 +1,9 @@
 <!-- 账户管理-收货地址管理-编辑 -->
 <template>
-    <app-drawer :title="selectedRow?.autoid ? '修改地址' : '新增地址'" :width="800" v-model:show="show" :loading="loading"
+    <app-drawer :title="selectedRow?.autoid ? t('mine.address.modifyaddressinfo') : t('mine.address.addaddressinfo')" :width="800" v-model:show="show" :loading="loading"
         :refresh="refresh">
         <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules">
-            <el-form-item label="收货人" prop="ReceiverName">
+            <el-form-item :label="t('mine.address.receiverName')" prop="ReceiverName">
                 <el-input :placeholder="t('common.pleaseenter')" v-model="formData.ReceiverName" />
             </el-form-item>
             <!-- <el-form-item label="证件类型" prop="CardTypeID">
@@ -12,18 +12,18 @@
                         :key="index" />
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="联系电话" prop="PhoneNum">
+            <el-form-item :label="t('mine.address.phoneNum')" prop="PhoneNum">
                 <el-input :placeholder="t('common.pleaseenter')" v-model="formData.PhoneNum" />
             </el-form-item>
             <!-- <el-form-item label="证件号码" prop="CardNum">
                 <el-input :placeholder="t('common.pleaseenter')" v-model="formData.CardNum" />
             </el-form-item> -->
-            <el-form-item class="el-form-item--row" label="收货地址" prop="area">
+            <el-form-item class="el-form-item--row" :label="t('mine.address.address')" prop="area">
                 <app-region class="el-form-item--col" v-model:province="formData.ProvinceID"
                     v-model:city="formData.CityID" v-model:district="formData.DistrictID" />
             </el-form-item>
-            <el-form-item class="el-form-item--row" label="详细地址" prop="Address">
-                <el-input placeholder="请输入详细地址" v-model="formData.Address" />
+            <el-form-item class="el-form-item--row" :label="t('mine.address.detail')" prop="Address">
+                <el-input :placeholder="t('mine.address.tips4')" v-model="formData.Address" />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -57,11 +57,11 @@ const refresh = ref(false)
 const formRef = ref<FormInstance>()
 
 const formRules: FormRules = {
-    ReceiverName: [{ required: true, message: '请输入收货人', trigger: 'blur' }],
-    CardTypeID: [{ required: true, message: '请选择证件类型' }],
-    PhoneNum: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
-    CardNum: [{ required: true, message: '请输入证件号码', trigger: 'blur' }],
-    Address: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
+    ReceiverName: [{ required: true, message: t('mine.address.tips1'), trigger: 'blur' }],
+    // CardTypeID: [{ required: true, message: '请选择证件类型' }],
+    PhoneNum: [{ required: true, message: t('mine.address.tips2'), trigger: 'blur' }],
+    // CardNum: [{ required: true, message: '请输入证件号码', trigger: 'blur' }],
+    Address: [{ required: true, message: t('mine.address.tips4'), trigger: 'blur' }],
     area: [
         {
             required: true,
@@ -70,7 +70,7 @@ const formRules: FormRules = {
                 if ((formData.ProvinceID && formData.CityID && formData.DistrictID) || ids.includes(formData.ProvinceID ?? 0)) {
                     callback()
                 } else {
-                    callback(new Error('请选择收货地区'))
+                    callback(new Error(t('mine.address.tips3')))
                 }
             }
         }
@@ -86,10 +86,10 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             addOrUpdate().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 5 - 7
src/packages/pc/views/account/address/index.vue

@@ -59,17 +59,15 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'receivername', label: '收货人' },
-    // { field: 'cardtypeid', label: '证件类型' },
-    // { field: 'cardnum', label: '证件号码' },
-    { field: 'phonenum', label: '联系电话' },
-    { field: 'address', label: '收货地址' },
-    { field: 'isdefault', label: '是否默认' },
+    { field: 'receivername', label: t('mine.address.receiverName') },
+    { field: 'phonenum', label: t('mine.address.phoneNum') },
+    { field: 'address', label: t('mine.address.address') },
+    { field: 'isdefault', label: t('mine.address.isdefault') },
 ])
 
 filterOptons.buttonList = [
     {
-        lable: '新增地址', className: 'el-button--primary', onClick: () => {
+        lable: t('mine.address.add'), className: 'el-button--primary', onClick: () => {
             selectedRow.value = undefined
             openComponent('edit')
         }

+ 3 - 3
src/packages/pc/views/account/receipt/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 账户管理-发票信息管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否删除该发票?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -36,10 +36,10 @@ const onCancel = (isRefresh = false) => {
 
 const onSubmit = () => {
     deleteInvoice().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('提交失败:' + err)
+        ElMessage.error(t('common.submitfailure') + err)
     })
 }
 </script>

+ 2 - 2
src/packages/pc/views/account/receipt/components/edit/index.vue

@@ -74,10 +74,10 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             addOrUpdate().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 8 - 8
src/packages/pc/views/account/receipt/index.vue

@@ -48,18 +48,18 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'receipttype', label: '发票类型' },
-    { field: 'username', label: '发票抬头' },
-    { field: 'taxpayerid', label: '税号' },
-    { field: 'receiptbank', label: '开户银行' },
-    { field: 'receiptaccount', label: '银行账号' },
-    { field: 'contactinfo', label: '企业电话' },
-    { field: 'address', label: '企业地址' },
+    { field: 'receipttype', label: t('mine.invoice.receipttype') },
+    { field: 'username', label:  t('mine.invoice.UserName') },
+    { field: 'taxpayerid', label: t('mine.invoice.TaxpayerID') },
+    { field: 'receiptbank', label: t('mine.invoice.ReceiptBank') },
+    { field: 'receiptaccount', label: t('mine.invoice.ReceiptAccount') },
+    { field: 'contactinfo', label: t('mine.invoice.ContactInfo') },
+    { field: 'address', label: t('mine.invoice.Address') },
 ])
 
 filterOptons.buttonList = [
     {
-        lable: '新增发票', className: 'el-button--primary', onClick: () => {
+        lable: t('mine.invoice.addinvoice'), className: 'el-button--primary', onClick: () => {
             selectedRow.value = undefined
             openComponent('edit')
         }

+ 1 - 1
src/packages/pc/views/account/sign/components/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 账户管理-签约账号管理-解约 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认要解约吗?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/footer/goods/delivery/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 商品订单-线下交收-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否撤销该交收单?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/footer/goods/order/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 商品订单-委托-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh" :style="styles">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh" :style="styles">
         <div class="g-text-message">确认要撤销吗?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>

+ 2 - 2
src/packages/pc/views/footer/performance/components/contracted/index.vue

@@ -72,10 +72,10 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             formSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/footer/performance/components/delay/index.vue

@@ -61,10 +61,10 @@ const onSubmit = () => {
             formRef.value?.validate((valid) => {
                 if (valid) {
                     formSubmit().then(() => {
-                        ElMessage.success('提交成功')
+                        ElMessage.success(t('common.submitsuccess'))
                         onCancel(true)
                     }).catch((err) => {
-                        ElMessage.error('提交失败:' + err)
+                        ElMessage.error(t('common.submitfailure') + err)
                     })
                 }
             })

+ 2 - 2
src/packages/pc/views/footer/performance/components/edit/index.vue

@@ -157,10 +157,10 @@ const onSubmit = () => {
             formRef.value?.validate((valid) => {
                 if (valid) {
                     formSubmit().then(() => {
-                        ElMessage.success('提交成功')
+                        ElMessage.success(t('common.submitsuccess'))
                         onCancel(true)
                     }).catch((err) => {
-                        ElMessage.error('提交失败:' + err)
+                        ElMessage.error(t('common.submitfailure') + err)
                     })
                 }
             })

+ 2 - 2
src/packages/pc/views/footer/performance/components/manual/index.vue

@@ -52,10 +52,10 @@ const onSubmit = () => {
     formRef.value?.validate((valid) => {
         if (valid) {
             confirmSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/footer/presell/presellposition/deposit/index.vue

@@ -1,6 +1,6 @@
 <!-- 预售转让-预售持仓-补足定金 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否补足转让定金?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -45,7 +45,7 @@ const onMakeUpDeposit = () => {
             TradeID: handleRequestBigNumber(props.selectedRow.tradeid)
         }
     }).then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败:' + err)

+ 1 - 1
src/packages/pc/views/footer/presell/transferorder/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 预售转让-预售委托-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否撤销该委托单?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>

+ 2 - 2
src/packages/pc/views/footer/presell/transferposition/append/index.vue

@@ -1,6 +1,6 @@
 <!-- 预售转让-预售持仓-补足定金 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :refresh="refresh">
         <div class="g-text-message">是否追加未付转让定金?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -39,7 +39,7 @@ const onMakeUpDeposit = () => {
             GoodsID: props.selectedRow.goodsid
         }
     }).then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败:' + err)

+ 1 - 1
src/packages/pc/views/footer/presell/transferposition/listing/index.vue

@@ -21,7 +21,7 @@
                 <el-input-number placeholder="转让量" v-model="formData.OrderQty" :max="enableqty" :min="0" />
             </el-form-item>
             <el-form-item prop="OrderPrice" label="转让价">
-                <el-input-number placeholder="请输入转让价格" :max="quote?.limitup" :min="quote?.limitdown"
+                <el-input-number :placeholder="t('position.goods.tips1')" :max="quote?.limitup" :min="quote?.limitdown"
                     :step="quote?.decimalvalue" :precision="quote?.decimalplace"
                     v-model="formData.OrderPrice" />
             </el-form-item>

+ 2 - 2
src/packages/pc/views/footer/pricing/order/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 挂牌点价-挂单-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认要撤销吗?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -40,7 +40,7 @@ const onCancelSumit = () => {
     formData.OldOrderId = handleRequestBigNumber(props.selectedRow.orderid)
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败:' + err)

+ 2 - 2
src/packages/pc/views/footer/spot/order/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 掉期市场-挂单-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认要撤销吗?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -43,7 +43,7 @@ const onCancelSumit = () => {
     formData.BuyOrSell = buyorsell
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败:' + err)

+ 2 - 2
src/packages/pc/views/footer/swap/order/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 掉期市场-挂单-撤销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认要撤销吗?</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -41,7 +41,7 @@ const onCancelSumit = () => {
     formData.OldOrderId = handleRequestBigNumber(props.selectedRow.orderid)
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('提交成功')
+        ElMessage.success(t('common.submitsuccess'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error('提交失败:' + err)

+ 2 - 2
src/packages/pc/views/footer/swap/position/close/index.vue

@@ -127,10 +127,10 @@ const onCloseSubmit = (row: Model.TradeHolderDetailRsp) => {
         formData.TradeID = handleRequestBigNumber(tradeid)
 
         holderCloseSubmit().then(() => {
-            ElMessage.success('提交成功')
+            ElMessage.success(t('common.submitsuccess'))
             run()
         }).catch((err) => {
-            ElMessage.error('提交失败:' + err)
+            ElMessage.error(t('common.submitfailure') + err)
         })
     })
 }

+ 9 - 9
src/packages/pc/views/market/trade/goods/list/listing/index.vue

@@ -4,23 +4,23 @@
             <Forex v-bind="{ goodsCode: selectedGoods.goodscode }" @price-click="onPriceClick" />
         </div>
         <div class="goods-listing__form">
-            <h4 class="header-title">订单交易</h4>
+            <h4 class="header-title">{{ t('quote.goods.title1') }}</h4>
             <el-form ref="formRef" class="el-form--vertical" label-width="60px" :show-message="false" :model="formData"
                 :rules="formRules">
-                <el-form-item prop="GoodsID" label="商品">
+                <el-form-item prop="GoodsID" :label="t('quote.goods.goods')">
                     <el-select effect="dark" :placeholder="t('common.choice')" v-model="selectedGoodsId" filterable>
                         <el-option :label="item.goodsname" :value="item.goodsid" v-for="(item, index) in marketGoodsList"
                             :key="index" />
                     </el-select>
                 </el-form-item>
-                <el-form-item prop="BuyOrSell" label="方向">
+                <el-form-item prop="BuyOrSell" :label="t('quote.goods.buyorsell')">
                     <el-radio-group v-model="formData.BuyOrSell">
                         <el-radio v-for="(item, index) in getBuyOrSellList()" :key="index" :label="item.value">
                             {{ item.label }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item prop="OrderPrice" label="价格">
+                <el-form-item prop="OrderPrice" :label="t('quote.goods.orderprice')">
                     <div class="el-form-item--col">
                         <el-input-number ref="priceRef" :placeholder="t('common.pleaseenter')" :min="0" :step="selectedGoods?.decimalvalue"
                             :precision="selectedGoods?.decimalplace" :disabled="isDisabled" v-model="formData.OrderPrice"
@@ -37,7 +37,7 @@
                         </div>
                     </div>
                 </el-form-item>
-                <el-form-item prop="OrderQty" label="数量">
+                <el-form-item prop="OrderQty" :label="t('quote.goods.orderqty')">
                     <div class="g-qty-group">
                         <el-input-number ref="qtyRef" :placeholder="t('common.pleaseenter')" :min="0" :max="9999999999" :precision="0" :step="qtyStep || 1"
                             v-model="formData.OrderQty" @keyup.enter="submitFocus" />
@@ -48,7 +48,7 @@
                             v-if="(formData.BuyOrSell === BuyOrSell.Buy || selectedGoods?.tradeproperty !== 2) && settingStore.getSettingValue('showOrderEnableQty')">
                             <div
                                 style="display: flex;flex-direction: column;line-height: normal;font-size: 12px;color: #7a8a94;">
-                                <span>预估可订立量:{{ total.enableQty }}</span>
+                                <span>{{ t('quote.enableQty')}}:{{ total.enableQty }}</span>
                                 <span>预扣保证金:{{ total.deposit.toFixed(2) }}</span>
                             </div>
                         </template>
@@ -160,7 +160,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入价格'))
+                callback(new Error(t('quote.goods.pleaseenterorderprice')))
             }
         }
     }],
@@ -170,7 +170,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入数量'))
+                callback(new Error(t('quote.goods.pleaseenterorderqty')))
             }
         }
     }],
@@ -219,7 +219,7 @@ const onBeforeSubmit = (buildType: EBuildType) => {
                         ).then(() => onSubmit())
                     } else {
                         ElMessageBox.confirm(
-                            '*若存在价格匹配的反方向委托订单,系统将会自动撤销。',
+                            t('quote.goods.tips2'),
                             '是否立即挂牌?'
                         ).then(() => onSubmit())
                     }

+ 2 - 2
src/packages/pc/views/market/trade/presell/ballot/detail/delisting/index.vue

@@ -100,10 +100,10 @@ const onSubmit = () => {
             formData.TimevalidType = EValidType.VALIDTYPE_YZ
             /// 代码提交
             formSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

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

@@ -106,10 +106,10 @@ const onSubmit = () => {
             formData.TimevalidType = EValidType.VALIDTYPE_YZ
             /// 代码提交
             formSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/market/trade/spot/listing/index.vue

@@ -153,10 +153,10 @@ const onSubmit = () => {
         if (valid) {
             formData.BuyOrSell = BuyOrSell.Buy
             listingSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

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

@@ -143,10 +143,10 @@ const onSubmit = () => {
             }
 
             formSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/market/trade/spot/order/listing/index.vue

@@ -128,10 +128,10 @@ const onSubmit = () => {
             }
 
             listingSubmit().then(() => {
-                ElMessage.success('提交成功')
+                ElMessage.success(t('common.submitsuccess'))
                 onCancel(true)
             }).catch((err) => {
-                ElMessage.error('提交失败:' + err)
+                ElMessage.error(t('common.submitfailure') + err)
             })
         }
     })

+ 2 - 2
src/packages/pc/views/market/trade/swap/detail/listing/index.vue

@@ -215,10 +215,10 @@ const onSubmit = () => {
                 formData.ValidTime = ""
 
                 formSubmit().then(() => {
-                    ElMessage.success('提交成功')
+                    ElMessage.success(t('common.submitsuccess'))
                     onCancel(true)
                 }).catch((err) => {
-                    ElMessage.error('提交失败:' + err)
+                    ElMessage.error(t('common.submitfailure') + err)
                 })
             })
         }

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

@@ -223,10 +223,10 @@ const onSubmit = (buildType: number) => {
                 formData.OperateType = EOrderOperateType.ORDEROPERATETYPE_NORMAL
                 
                 formSubmit().then(() => {
-                    ElMessage.success('提交成功')
+                    ElMessage.success(t('common.submitsuccess'))
                     onCancel(true)
                 }).catch((err) => {
-                    ElMessage.error('提交失败:' + err)
+                    ElMessage.error(t('common.submitfailure') + err)
                 })
             })
         }