From 17b88895c5412e037e00ce07b47b0f49f858f55d Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Thu, 25 Jan 2024 14:08:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- canvas-container/components/Upload/index.vue | 8 +- canvas-container/components/canvasEditPage.vue | 4 +- .../components/toolBar/BasicsComp/brandList.vue | 4 +- .../components/toolBar/BasicsComp/headerTool.vue | 2 +- .../components/toolBar/BasicsComp/imageText.vue | 2 +- .../toolBar/BasicsComp/imageTextList.vue | 6 +- .../components/toolBar/BasicsComp/imageTextNav.vue | 2 +- .../components/toolBar/BasicsComp/shopTop.vue | 2 +- .../components/toolBar/BasicsComp/textTool.vue | 4 +- .../components/toolBar/BasicsComp/videoTool.vue | 8 +- .../components/toolBar/goodsComp/categoryTool.vue | 2 +- .../components/toolBar/goodsComp/productList.vue | 2 +- .../components/toolBar/shopComp/groupTool.vue | 2 +- .../components/toolBar/shopComp/newProductTool.vue | 2 +- .../components/toolBar/shopComp/priceTool.vue | 2 +- .../components/toolBar/shopComp/spikeTool.vue | 2 +- .../components/toolBar/shopComp/vipTool.vue | 2 +- .../toolBar/toolModule/font-size-select.vue | 2 +- .../toolBar/toolModule/product-select.vue | 4 +- .../toolBar/toolModule/tool-select-category.vue | 2 +- src/App.vue | 4 +- src/locales/en.json | 96 ++++++++++++++++++++- src/locales/zh-CN.json | 99 +++++++++++++++++++++- src/views/active/activeData.vue | 2 +- src/views/active/getActive.vue | 8 +- src/views/active/index.vue | 2 +- src/views/commodity/commdityClass/Edit.vue | 2 +- .../commodityList copy/commodityGroup.vue | 4 +- src/views/commodity/commodityList copy/index.vue | 4 +- .../commodity/commodityList/commodityGroup.vue | 2 +- src/views/commodity/commodityList/index.vue | 4 +- src/views/commodity/commoditySystem/index.vue | 10 +-- src/views/customer/addClustering.vue | 6 +- src/views/customer/addOperate.vue | 6 +- src/views/customer/clusteringList/index.vue | 2 +- src/views/customer/customerList/customerDetail.vue | 6 +- src/views/customer/customerList/index.vue | 24 +++--- src/views/customer/operate/index.vue | 8 +- src/views/customer/tagList.vue | 6 +- src/views/customerService/service/index.vue | 10 +-- src/views/dashboard/index.vue | 36 ++++---- src/views/distributor/achievement/humens.vue | 8 +- src/views/distributor/achievement/order.vue | 10 +-- src/views/distributor/achievement/programme.vue | 4 +- src/views/distributor/customer/popSearch.vue | 2 +- src/views/distributor/customer/popSys.vue | 2 +- src/views/distributor/personnel/list.vue | 12 +-- src/views/distributor/personnel/msg.vue | 10 +-- src/views/distributor/personnel/sys.vue | 2 +- src/views/finance/account/index.vue | 16 ++-- src/views/finance/list/index.vue | 8 +- src/views/liveMenu/liveProduct/index.vue | 8 +- src/views/liveMenu/liveRoom/index.vue | 6 +- src/views/marketing/channelActivity/form.vue | 9 +- src/views/marketing/channelActivity/index.vue | 4 +- .../channelActivity/selectChannelCoupons.vue | 15 ++-- src/views/marketing/channelManage/add.vue | 16 ++-- src/views/marketing/channelManage/index.vue | 14 +-- src/views/marketing/compose/add.vue | 8 +- src/views/marketing/compose/index.vue | 6 +- src/views/marketing/coupon/add.vue | 10 +-- src/views/marketing/coupon/index.vue | 14 +-- src/views/marketing/discount/add.vue | 8 +- src/views/marketing/discount/index.vue | 6 +- src/views/marketing/group/add.vue | 8 +- src/views/marketing/group/index.vue | 6 +- src/views/marketing/price/add.vue | 8 +- src/views/marketing/price/index.vue | 6 +- src/views/marketing/scene/add.vue | 18 ++-- src/views/marketing/scene/index.vue | 2 +- src/views/marketing/spike/add.vue | 8 +- src/views/marketing/spike/index.vue | 6 +- src/views/order/aftersale/afterDetails.vue | 44 +++++----- src/views/order/aftersale/index.vue | 82 +++++++++--------- src/views/order/pending/index.vue | 62 +++++++------- src/views/order/pending/pendDetails.vue | 74 ++++++++-------- src/views/setup/phone/index.vue | 28 +++--- src/views/setup/privacy/index.vue | 34 ++++---- src/views/setup/role/index.vue | 4 +- src/views/setup/tabs/Icons.vue | 4 +- src/views/setup/user/index.vue | 14 +-- src/views/shop/material/index.vue | 4 +- src/views/shop/myshop/index.vue | 10 +-- src/views/stock/stocknote/index.vue | 4 +- src/views/system/logistics/Edit.vue | 10 +-- src/views/system/logistics/index.vue | 2 +- src/views/system/storehouse/index.vue | 4 +- 87 files changed, 616 insertions(+), 429 deletions(-) diff --git a/canvas-container/components/Upload/index.vue b/canvas-container/components/Upload/index.vue index 75755c7..9599e74 100644 --- a/canvas-container/components/Upload/index.vue +++ b/canvas-container/components/Upload/index.vue @@ -266,8 +266,8 @@ export default { return true } return await this.$confirm('此操作将会删除已上传的文件, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: this.$t('common.sure'), + cancelButtonText: this.$t('common.cancel'), type: 'warning' }) }, @@ -303,8 +303,8 @@ export default { this.previewObj.show = true }else{ this.$confirm('需要下载才能预览此文件, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: this.$t('common.sure'), + cancelButtonText: this.$t('common.cancel'), type: 'warning' }).then(() => { let htmlAnchorElement = document.createElement('a'); diff --git a/canvas-container/components/canvasEditPage.vue b/canvas-container/components/canvasEditPage.vue index 85f4c9d..f49312e 100644 --- a/canvas-container/components/canvasEditPage.vue +++ b/canvas-container/components/canvasEditPage.vue @@ -119,8 +119,8 @@ // 删除组件 delComponent (item, index) { this.$confirm('确定删除吗?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: this.$t('common.sure'), + cancelButtonText: this.$t('common.cancel'), type: 'warning' }).then(() => { this.activeComponent = -1 diff --git a/canvas-container/components/toolBar/BasicsComp/brandList.vue b/canvas-container/components/toolBar/BasicsComp/brandList.vue index 6ddfe79..ea75098 100644 --- a/canvas-container/components/toolBar/BasicsComp/brandList.vue +++ b/canvas-container/components/toolBar/BasicsComp/brandList.vue @@ -4,7 +4,7 @@
- +
@@ -39,7 +39,7 @@
- +
删除内容
diff --git a/canvas-container/components/toolBar/BasicsComp/headerTool.vue b/canvas-container/components/toolBar/BasicsComp/headerTool.vue index fb780fa..b195c82 100644 --- a/canvas-container/components/toolBar/BasicsComp/headerTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/headerTool.vue @@ -15,7 +15,7 @@
LOGO文本
- +
文本大小
diff --git a/canvas-container/components/toolBar/BasicsComp/imageText.vue b/canvas-container/components/toolBar/BasicsComp/imageText.vue index 46f0125..f63150b 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageText.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageText.vue @@ -8,7 +8,7 @@
文本设置
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/imageTextList.vue b/canvas-container/components/toolBar/BasicsComp/imageTextList.vue index 1ff0f56..ea44f2c 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageTextList.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageTextList.vue @@ -4,7 +4,7 @@
- +
@@ -46,14 +46,14 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue b/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue index 62cf347..fe80649 100644 --- a/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue +++ b/canvas-container/components/toolBar/BasicsComp/imageTextNav.vue @@ -22,7 +22,7 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/shopTop.vue b/canvas-container/components/toolBar/BasicsComp/shopTop.vue index 9853c92..d9492f4 100644 --- a/canvas-container/components/toolBar/BasicsComp/shopTop.vue +++ b/canvas-container/components/toolBar/BasicsComp/shopTop.vue @@ -71,7 +71,7 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/textTool.vue b/canvas-container/components/toolBar/BasicsComp/textTool.vue index 4658b25..7e8757c 100644 --- a/canvas-container/components/toolBar/BasicsComp/textTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/textTool.vue @@ -4,14 +4,14 @@
- +
diff --git a/canvas-container/components/toolBar/BasicsComp/videoTool.vue b/canvas-container/components/toolBar/BasicsComp/videoTool.vue index a30b3ad..b556784 100644 --- a/canvas-container/components/toolBar/BasicsComp/videoTool.vue +++ b/canvas-container/components/toolBar/BasicsComp/videoTool.vue @@ -5,12 +5,12 @@
- +
- +
@@ -18,14 +18,14 @@ - +
- +
diff --git a/canvas-container/components/toolBar/goodsComp/categoryTool.vue b/canvas-container/components/toolBar/goodsComp/categoryTool.vue index 43b5cb9..51ef96d 100644 --- a/canvas-container/components/toolBar/goodsComp/categoryTool.vue +++ b/canvas-container/components/toolBar/goodsComp/categoryTool.vue @@ -4,7 +4,7 @@
- +
添加类别
diff --git a/canvas-container/components/toolBar/goodsComp/productList.vue b/canvas-container/components/toolBar/goodsComp/productList.vue index b0e43a2..529c031 100644 --- a/canvas-container/components/toolBar/goodsComp/productList.vue +++ b/canvas-container/components/toolBar/goodsComp/productList.vue @@ -4,7 +4,7 @@
- +
diff --git a/canvas-container/components/toolBar/shopComp/groupTool.vue b/canvas-container/components/toolBar/shopComp/groupTool.vue index ff59371..25eccf5 100644 --- a/canvas-container/components/toolBar/shopComp/groupTool.vue +++ b/canvas-container/components/toolBar/shopComp/groupTool.vue @@ -4,7 +4,7 @@ - +
diff --git a/canvas-container/components/toolBar/shopComp/newProductTool.vue b/canvas-container/components/toolBar/shopComp/newProductTool.vue index 3b081b4..43e44e0 100644 --- a/canvas-container/components/toolBar/shopComp/newProductTool.vue +++ b/canvas-container/components/toolBar/shopComp/newProductTool.vue @@ -4,7 +4,7 @@
- +
diff --git a/canvas-container/components/toolBar/shopComp/priceTool.vue b/canvas-container/components/toolBar/shopComp/priceTool.vue index d11052a..ca32714 100644 --- a/canvas-container/components/toolBar/shopComp/priceTool.vue +++ b/canvas-container/components/toolBar/shopComp/priceTool.vue @@ -4,7 +4,7 @@ - +
diff --git a/canvas-container/components/toolBar/shopComp/spikeTool.vue b/canvas-container/components/toolBar/shopComp/spikeTool.vue index b91082d..0275a30 100644 --- a/canvas-container/components/toolBar/shopComp/spikeTool.vue +++ b/canvas-container/components/toolBar/shopComp/spikeTool.vue @@ -4,7 +4,7 @@ - +
diff --git a/canvas-container/components/toolBar/shopComp/vipTool.vue b/canvas-container/components/toolBar/shopComp/vipTool.vue index 37dfc91..04fa88b 100644 --- a/canvas-container/components/toolBar/shopComp/vipTool.vue +++ b/canvas-container/components/toolBar/shopComp/vipTool.vue @@ -4,7 +4,7 @@
- +
diff --git a/canvas-container/components/toolBar/toolModule/font-size-select.vue b/canvas-container/components/toolBar/toolModule/font-size-select.vue index d920f12..36190e5 100644 --- a/canvas-container/components/toolBar/toolModule/font-size-select.vue +++ b/canvas-container/components/toolBar/toolModule/font-size-select.vue @@ -1,5 +1,5 @@ diff --git a/src/views/setup/user/index.vue b/src/views/setup/user/index.vue index 5b236b3..2921507 100644 --- a/src/views/setup/user/index.vue +++ b/src/views/setup/user/index.vue @@ -8,7 +8,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -119,7 +119,7 @@ @@ -186,11 +186,11 @@ export default { ], name: [{ required: true, message: '请输入姓名', trigger: 'blur' }], phone: [ - { required: true, message: '请输入手机号', trigger: 'blur' }, + { required: true, message: this.$t('common.phonenumber_empty'), trigger: 'blur' }, { min: 11, max: 11, message: "请输入11位手机号码", trigger: "blur" }, { pattern: /^1[3456789]\d{9}$/, - message: "请输入正确的手机号码" + message: this.$t('common.phonenumber_error') } ], }, @@ -316,8 +316,8 @@ export default { // 删除用户 async del(row) { this.$confirm('此操作将永久删除该用户, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: this.$t('common.sure'), + cancelButtonText: this.$t('common.cancel'), type: 'warning' }) .then(() => { diff --git a/src/views/shop/material/index.vue b/src/views/shop/material/index.vue index 00ce3a5..670c48e 100644 --- a/src/views/shop/material/index.vue +++ b/src/views/shop/material/index.vue @@ -291,7 +291,7 @@ export default { labelId: this.tipsList[this.findIndex].labelId }) if (res.code === '') { - this.$message.success($t('common.deletesuccess')) + this.$message.success(this.$t('common.deletesuccess')) this.getAllTips() this.tipsShow = false } @@ -342,7 +342,7 @@ export default { link: arr.link }) if (res.code === '') { - this.$message.success($t('common.deletesuccess')) + this.$message.success(this.$t('common.deletesuccess')) this.getAllTips() this.getTips(this.findIndex, { labelName: this.tipsName, diff --git a/src/views/shop/myshop/index.vue b/src/views/shop/myshop/index.vue index dbc6183..2b2ccbe 100644 --- a/src/views/shop/myshop/index.vue +++ b/src/views/shop/myshop/index.vue @@ -32,7 +32,7 @@ KG/件 @@ -81,7 +81,7 @@ maxlength="9" type="text" :readonly="isDisabled" - placeholder="请输入内容" + :placeholder="$t('common.defaulthint')" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" /> --> 元 @@ -93,7 +93,7 @@ v-model="logisticsDetail.secondWeight" maxlength="9" :readonly="isDisabled" - placeholder="请输入内容" + :placeholder="$t('common.defaulthint')" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" /> --> KG/件 @@ -102,7 +102,7 @@ v-model="logisticsDetail.secondPrice" maxlength="9" :readonly="isDisabled" - placeholder="请输入内容" + :placeholder="$t('common.defaulthint')" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" /> --> 元 diff --git a/src/views/system/logistics/index.vue b/src/views/system/logistics/index.vue index 9157dac..864de7b 100644 --- a/src/views/system/logistics/index.vue +++ b/src/views/system/logistics/index.vue @@ -174,7 +174,7 @@ export default { }, // 删除 del(row) { - this.$confirm($t('common.deletedialogtitle'), $t('common.notice_dialog_title'), { + this.$confirm(this.$t('common.deletedialogtitle'), $t('common.notice_dialog_title'), { confirmButtonText: $t('common.sure'), cancelButtonText: $t('common.cancel'), type: 'warning' diff --git a/src/views/system/storehouse/index.vue b/src/views/system/storehouse/index.vue index b20c33f..15acf50 100644 --- a/src/views/system/storehouse/index.vue +++ b/src/views/system/storehouse/index.vue @@ -179,8 +179,8 @@ export default { // 删除 del(row) { this.$confirm('选中数据将被永久删除, 是否继续?', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + confirmButtonText: this.$t('common.sure'), + cancelButtonText: this.$t('common.cancel'), type: 'warning' }) .then(() => {