From 6eabee887393157484ae7a8563f9b10c2449c4aa Mon Sep 17 00:00:00 2001 From: xh-pan1 Date: Thu, 25 Jan 2024 14:08:47 +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 --- src/components/base/aftersaleList.vue | 4 +- src/components/base/deleteGoods.vue | 4 +- src/components/base/orderList.vue | 12 +- src/components/base/topNav.vue | 2 +- src/components/orderInfo/addAddress.vue | 8 +- src/components/userCenter/changeAddress.vue | 6 +- src/locales/en.json | 118 ++++++++++++++++++- src/locales/zh-CN.json | 125 ++++++++++++++++++++- src/main.js | 2 +- src/views/afterSale/index.vue | 16 +-- src/views/login/login.vue | 21 ++-- src/views/orderDetail/components/expressInfo.vue | 2 +- src/views/orderDetail/components/orderInfo.vue | 4 +- src/views/orderDetail/components/status.vue | 30 ++--- src/views/orderDetail/index.vue | 12 +- src/views/product/components/productAnswer.vue | 4 +- src/views/shopping-trolley/deleteGoods.vue | 4 +- src/views/shopping-trolley/index.vue | 2 +- .../userCenter/browseRecords/browseRecords.vue | 6 +- src/views/userCenter/changeInfo/changePhone.vue | 12 +- src/views/userCenter/changeInfo/changePwd.vue | 12 +- src/views/userCenter/changeInfo/changeRealName.vue | 6 +- src/views/userCenter/changeInfo/unbindPhone.vue | 6 +- src/views/userCenter/favorites/favorites.vue | 4 +- src/views/userCenter/messageCenter/message.vue | 4 +- src/views/userCenter/messageCenter/qalist.vue | 12 +- src/views/userCenter/myOrder/myOrder.vue | 24 ++-- .../userCenter/orderAfterSale/orderAfterSale.vue | 2 +- .../userCenter/signingAddress/signingAddress.vue | 2 +- src/views/userCenter/userInfo/userInfo.vue | 2 +- 30 files changed, 348 insertions(+), 120 deletions(-) diff --git a/src/components/base/aftersaleList.vue b/src/components/base/aftersaleList.vue index b636290..cc2541c 100644 --- a/src/components/base/aftersaleList.vue +++ b/src/components/base/aftersaleList.vue @@ -53,7 +53,7 @@

审核不通过

评审中

退货完成，拒绝退款

-

已关闭

+

{{$t('page.closed')}}

审核通过

@@ -93,7 +93,7 @@ diff --git a/src/components/base/deleteGoods.vue b/src/components/base/deleteGoods.vue index 00a9c09..1327cd1 100644 --- a/src/components/base/deleteGoods.vue +++ b/src/components/base/deleteGoods.vue @@ -9,8 +9,8 @@

删除后购物车将不存在该商品，确定要删除吗？

-

确定

-

取消

+

{{$t('common.sure')}}

+

{{$t('common.cancel')}}

diff --git a/src/components/base/orderList.vue b/src/components/base/orderList.vue index a5aa554..0c9d166 100644 --- a/src/components/base/orderList.vue +++ b/src/components/base/orderList.vue @@ -106,7 +106,7 @@ class="fs13 mar-bot-5 colorRed" v-if="item.state == 1" > - 待付款 + {{$t('page.due')}}

@@ -122,31 +122,31 @@ class="fs13 mar-bot-5 colorGlod" v-if="item.state == 2" > - 待发货 + {{$t('page.goodswaitingtobesent')}}

- 待收货 + {{$t('page.waittobereceived')}}

- 已完成 + {{$t('common.completed')}}

- 已关闭 + {{$t('page.closed')}}

- 待成团 + {{$t('common.orderstatus_dct')}}

订单详情 diff --git a/src/components/base/topNav.vue b/src/components/base/topNav.vue index 3c63f2a..5bd95da 100644 --- a/src/components/base/topNav.vue +++ b/src/components/base/topNav.vue @@ -291,7 +291,7 @@ export default { }) this.setCartNumber(this.cartNumber - 1) this.getTrolleyList() - this.$message.success($t('common.deletesuccess')) + this.$message.success(this.$t('common.deletesuccess')) }, outLoginBtn () { this.outLoginDialog = true diff --git a/src/components/orderInfo/addAddress.vue b/src/components/orderInfo/addAddress.vue index dde9d35..21d14aa 100644 --- a/src/components/orderInfo/addAddress.vue +++ b/src/components/orderInfo/addAddress.vue @@ -26,13 +26,13 @@

*收货人姓名：
- +
*手机号码：
- +
@@ -81,7 +81,7 @@ export default { } else if (this.newAddress.receiveName === '') { this.$message.error('请填写收件人姓名!') } else if (this.newAddress.receivePhone === '') { - this.$message.error('请填写手机号码!') + this.$message.error(this.$t('common.phonenumber_empty')) } else { let reg = /^1[13456789]\d{9}$/ if (!reg.test(this.newAddress.receivePhone)) { @@ -99,7 +99,7 @@ export default { } else if (this.newAddress.receiveName === '') { this.$message.error('请填写收件人姓名!') } else if (this.newAddress.receivePhone === '') { - this.$message.error('请填写手机号码!') + this.$message.error(this.$t('common.phonenumber_empty')) } else { let reg = /^1[13456789]\d{9}$/ if (!reg.test(this.newAddress.receivePhone)) { diff --git a/src/components/userCenter/changeAddress.vue b/src/components/userCenter/changeAddress.vue index 953a81f..eed510f 100644 --- a/src/components/userCenter/changeAddress.vue +++ b/src/components/userCenter/changeAddress.vue @@ -26,13 +26,13 @@
*收货人姓名：
- +
*手机号码：
- +
@@ -91,7 +91,7 @@ export default { } else if (this.newAddress.address === '') { this.$message.error('请填写详细地址!') } else if (this.newAddress.phone === '') { - this.$message.error('请填写手机号码!') + this.$message.error(this.$t('common.phonenumber_empty')) } else { this.$emit('hideAddDialog', this.newAddress) this.newAddress = {isDefault: false, diff --git a/src/locales/en.json b/src/locales/en.json index 1bceca1..dcf1eae 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -31,7 +31,7 @@ "common.query":"Query", "common.reset":"Reset", "common.operate":"Operate", - "common.createTIme":"Created Time", + "common.createTime":"Created Time", "common.contactPhone":"Phone", "common.contactPerson":"Contact", "common.nodata":"No Data", @@ -453,7 +453,7 @@ "common.stocknum":"Stock {number}", "common.understock":"Insufficient", "common.mobilephone_hint":"Please Enter the Phone Number", - "common.autologin":"Automatic login", + "common.autologin":"Auto login", "common.forgetpassword":"Forget Password", "common.sjdl":"Business Login", "common.account_hint":"Please Enter the username", @@ -490,5 +490,117 @@ "common.distributor":"Distributor", "common.persons":"persons", "common.deletefail":"Delete Fail", - "common.undosuccess":"Undo successfully" + "common.undosuccess":"Undo successfully", + "product.ifnew_tips":"新品推荐", + "product.iffirst_tips":"尖端首发", + "product.iflowprice_tips":"低价优选", + "product.group_hint":"请选择商家商品分组", + "product.category_hint":"请选择商家商品分类", + "product.logistics_hint":"请选择是否需要物流", + "product.shelve_state_hint":"请选择是否上架", + "product.ifoversold_hint":"请选择是否允许超卖", + "product.iffirst_hint":"请选择是否尖端首发", + "product.ifnew_hint":"请选择是否新品推荐", + "product.iflowprice_hint":"请选择是否低价优选", + "product.credit_hint":"请选择是否支持积分兑换", + "product.credit_limit_hint":"请输入单笔最大抵扣", + "product.credit_tips":"单笔最大抵扣积分", + "product.credit_tips_1":"开启积分兑换后，积分所抵扣的金额由商户承担", + "product.credit_tips_2":"限制一笔订单中该商品最多抵扣多少积分", + "product.credit_tips_3":"注：1积分 = {integralProportion}元 请输入整数", + "product.productname_hint":"请输入商品名称", + "common.inoutsuccess_hint":"请填写正确的信息", + "common.successful":"Successful", + "common.addsuccessful":"Add Successful", + "common.editsuccessful":"Update Successful", + "common.turnover":"Turnover", + "common.pendingorder":"Pending Order", + "common.aftersaleorder":"After-sale Order", + "common.visits":"visits", + "common.today":"Today", + "common.yesterday":"Yesterday", + "common.last7days":"Last 7 days", + "common.last30days":"Last 30 days", + "common.unit_times":"times", + "common.unit_yuan":"yuan", + "common.unit_wan_yuan":"10000 yuan", + "common.unit_piece":"piece", + "common.sold_piece_num":"sold {number} piece", + "common.exporting":"Do not repeat operations during data export!", + "common.yhfwsj":"User_access_data", + "common.ddtjsj":"Order_statistics", + "common.rmspsj":"Hot_selling_goods_data", + "common.unit_time_name":"time", + "common.completed":"Completed", + "common.verificationcode":"Verification code", + "common.administratortelephone":"Administrator telephone", + "common.administratortelephone_hint":"Please Enter the Administrator telephone", + "common.certificationdate":"Certification date", + "common.uncertificated":"uncertificated", + "common.newphonenum_hint":"Please Enter the New Phone Number", + "common.getcodesuccess_notify":"Send successfully, please pay attention to check the mobile phone SMS", + "common.privacysuccess_notify":"If the second authentication is successful, the authentication is valid within 24 hours. If the second authentication is successful, the second authentication is valid within 24 hours", + "page.goodsalreadysent":"Sended", + "page.closed":"Closed", + "page.canceled":"Canceled", + "common.ordertime":"Order time", + "common.defaulthint":"Please Enter the content", + "common.starttime":"Start Time", + "common.endtime":"End Time", + "common.startdate":"Start Date", + "common.enddate":"End Date", + "common.betweentime":"To", + "common.choosetime":"Please choose the time range", + "common.buyeraccount":"Buyer", + "common.receivername":"Receiver Name", + "common.receivermobilenum":"Receiver Phonenumber", + "common.exportorder":"Export Order", + "common.orderstatus_dct":"To be grouped", + "common.product_number_tips":"Quantity", + "common.orderstatus":"Status", + "common.orderaccount":"Order Account", + "common.changeprice":"Change price", + "common.send":"Send", + "common.exportorder_filename":"orderdatadetail.xls", + "common.paymentcode":"Payment Code", + "common.paymenttime":"Payment Time", + "logistics.logisticsplan":"Logistics Plan", + "common.after-salestatus":"After-sale status", + "common.placeorderinfo":"Place Order Info", + "common.historyordernum":"Historical order total", + "common.orderremark":"Order Remark", + "common.receivinginfo":"Receiving Info", + "common.productinfo":"Product Info", + "common.product":"Product", + "common.quantity":"Quantity", + "common.total_small":"Total", + "common.producttotalprice":"Product Amount", + "common.freightamount":"Freight Amount", + "common.totalamount":"Total Amount", + "common.logisticscompany":"Logistics Company", + "common.hwbnumber":"HWB Number", + "common.logisticscompany_hint":"Please enter the Courier name", + "common.logistics_number_hint":"Please enter the tracking number", + "common.logisticscompany_choose_hint":"Please select a Courier", + "common.sendsuccess":"Send Success", + "common.privacytips":"In order to protect personal privacy information, the system automatically desensitizes sensitive data. If you need to edit and view the complete information, you can verify it through the 'User Privacy Secondary authentication' function. After the verification is passed, you can view the complete information within 24 hours.", + "common.close":"Close", + "common.dsjcl":"Pending merchant", + "common.dsjsh":"Waiting merchant receive", + "common.afterId":"After ID", + "common.productId":"Product ID", + "common.orderstatus_hint":"Please select the order status", + "common.after-salestatus_hint":"Please select the after-sale status", + "common.after-salestatus_shz":"After sale", + "common.after-salestatus_shcg":"After-sale success", + "common.after-salestatus_shgb":"After-sale closing", + "common.after-sales_type":"After-sale type", + "common.after-sales_type_hint":"Please select the after-sale type", + "common.after-sales_type_jtk":"Refund", + "common.after-sales_type_thtk":"Return", + "common.aftercode":"After-sale code", + "common.refundamount":"Refund Amount", + "common.deal":"Deal", + "common.exportafterorder_filename":"afterorderdatadetail.xls", + "common.after-salestatus_info":"After-sale Info" } \ No newline at end of file diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index a8ad4cd..78a35b5 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -18,7 +18,7 @@ "navbar.newPassword":"新密码", "navbar.confirmPassword":"确认密码", "common.sure":"确定", - "common.common.cancel":"取消", + "common.cancel":"取消", "common.export":"导出", "common.view":"查看", "common.seemore":"查看更多", @@ -31,7 +31,7 @@ "common.query":"查询", "common.reset":"重置", "common.operate":"操作", - "common.createTIme":"创建时间", + "common.createTime":"创建时间", "common.contactPhone":"联系电话", "common.contactPerson":"负责人", "common.nodata":"暂无数据", @@ -443,7 +443,7 @@ "common.fans":"粉丝数", "client.tobedistributor":"成为分销员", "common.collectsuccess":"收藏成功", - "common.common.cancelcollectsuccess":"取消收藏成功", + "common.cancelcollectsuccess":"取消收藏成功", "common.express":"快递", "common.choosesimple":"选择", "client.commodityqa":"商品问答", @@ -472,8 +472,8 @@ "common.company":"公司", "common.school":"学校", "common.returnperson_empty":"请输入收货人！", - "common.phonenumber_empty":"请输入手机号！", - "common.phonenumber_error":"请输入正确的手机号！", + "common.phonenumber_empty":"请输入手机号", + "common.phonenumber_error":"请输入正确的手机号", "common.location_empty":"所在地不能为空！", "common.location_detail_empty":"请输入详细地址！", "common.removeaddress_tips":"是否删除此地址？", @@ -490,5 +490,118 @@ "common.distributor":"分销员", "common.persons":"(人）", "common.deletefail":"删除失败", - "common.undosuccess":"撤销成功" + "common.undosuccess":"撤销成功", + "product.ifnew_tips":"新品推荐", + "product.iffirst_tips":"尖端首发", + "product.iflowprice_tips":"低价优选", + "product.group_hint":"请选择商家商品分组", + "product.category_hint":"请选择商家商品分类", + "product.logistics_hint":"请选择是否需要物流", + "product.shelve_state_hint":"请选择是否上架", + "product.ifoversold_hint":"请选择是否允许超卖", + "product.iffirst_hint":"请选择是否尖端首发", + "product.ifnew_hint":"请选择是否新品推荐", + "product.iflowprice_hint":"请选择是否低价优选", + "product.credit_hint":"请选择是否支持积分兑换", + "product.credit_limit_hint":"请输入单笔最大抵扣", + "product.credit_tips":"单笔最大抵扣积分", + "product.credit_tips_1":"开启积分兑换后，积分所抵扣的金额由商户承担", + "product.credit_tips_2":"限制一笔订单中该商品最多抵扣多少积分", + "product.credit_tips_3":"注：1积分 = {integralProportion}元 请输入整数", + "product.productname_hint":"请输入商品名称", + "common.inoutsuccess_hint":"请填写正确的信息", + "common.successful":"成功", + "common.addsuccessful":"添加成功", + "common.editsuccessful":"修改成功", + "common.turnover":"成交金额", + "common.pendingorder":"待处理订单", + "common.aftersaleorder":"售后订单", + "common.visits":"店铺访问次数", + "common.today":"今天", + "common.yesterday":"昨天", + "common.last7days":"最近7天", + "common.last30days":"最近30天", + "common.unit_times":"次", + "common.unit_yuan":"元", + "common.unit_wan_yuan":"万元", + "common.unit_piece":"件", + "common.sold_piece_num":"已售 {number} 件", + "common.exporting":"数据导出中，请勿重复操作！", + "common.yhfwsj":"用户访问数据", + "common.ddtjsj":"订单统计数据", + "common.rmspsj":"热卖商品数据", + "common.unit_time_name":"次数", + "common.completed":"已完成", + "common.verificationcode":"验证码", + "common.administratortelephone":"管理员电话" , + "common.administratortelephone_hint":"请输入管理员电话", + "common.certificationdate":"认证时间", + "common.uncertificated":"未认证", + "common.newphonenum_hint":"请输入新手机号", + "common.getcodesuccess_notify":"发送成功，请注意查看手机短信", + "common.privacysuccess_notify":"二次认证成功，该认证24小时内有效，超过时间需要重新认证", + "page.goodsalreadysent":"已发货", + "page.closed":"已关闭", + "page.canceled":"已取消", + "common.ordertime":"下单时间", + "common.defaulthint":"请输入内容", + "common.starttime":"开始时间", + "common.endtime":"结束时间", + "common.startdate":"开始日期", + "common.enddate":"结束日期", + "common.betweentime":"至", + "common.choosetime":"请选择时间范围", + "common.buyeraccount":"买家账户", + "common.receivername":"收件人姓名", + "common.receivermobilenum":"收件人手机号", + "common.exportorder":"导出订单", + "common.orderstatus_dct":"待成团", + "common.product_number_tips":"商品数量（件）", + "common.orderstatus":"订单状态", + "common.orderaccount":"下单账户", + "common.changeprice":"改价", + "common.send":"发货", + "common.exportorder_filename":"订单数据明细表.xls", + "common.paymentcode":"支付单号", + "common.paymenttime":"支付时间", + "logistics.logisticsplan":"物流方案", + "common.after-salestatus":"售后状态", + "common.placeorderinfo":"下单信息", + "common.historyordernum":"历史订单总数", + "common.orderremark":"下单备注", + "common.receivinginfo":"收货信息", + "common.productinfo":"商品信息", + "common.product":"商品", + "common.quantity":"数量", + "common.total_small":"小计", + "common.producttotalprice":"商品总价", + "common.freightamount":"运费金额", + "common.totalamount":"总金额", + "common.logisticscompany":"物流公司", + "common.hwbnumber":"运单号", + "common.logisticscompany_hint":"请输入快递公司名称", + "common.logistics_number_hint":"请输入快递单号", + "common.logisticscompany_choose_hint":"请选择快递公司", + "common.sendsuccess":"发货成功", + "common.privacytips":"为保护个人隐私信息，系统自动对敏感数据进行脱敏。如需编辑、查看完整信息，可通过“用户隐私二次认证”功能进行验证，验证通过之后，24小时内可查看完整信息。", + "common.close":"关闭", + "common.dsjcl":"待商家处理", + "common.dsjsh":"待商家收货", + "common.afterId":"售后ID", + "common.productId":"商品ID", + "common.orderstatus_hint":"请选择订单状态", + "common.after-salestatus_hint":"请选择售后状态", + "common.after-salestatus_shz":"售后中", + "common.after-salestatus_shcg":"售后成功", + "common.after-salestatus_shgb":"售后关闭", + "common.after-sales_type":"售后类型", + "common.after-sales_type_hint":"请选择售后类型", + "common.after-sales_type_jtk":"仅退款", + "common.after-sales_type_thtk":"退货退款", + "common.aftercode":"售后单号", + "common.refundamount":"退款金额(元)", + "common.deal":"处理", + "common.exportafterorder_filename":"售后订单数据明细表.xls", + "common.after-salestatus_info":"售后信息" + } \ No newline at end of file diff --git a/src/main.js b/src/main.js index 24f2d7e..71f2195 100644 --- a/src/main.js +++ b/src/main.js @@ -115,7 +115,7 @@ router.afterEach((to, from, next) => { window.scrollTo(0, 0) }) /* eslint-disable no-new */ -new Vue({ +window.vm = new Vue({ el: '#app', router, store, diff --git a/src/views/afterSale/index.vue b/src/views/afterSale/index.vue index 816b602..2f833ff 100644 --- a/src/views/afterSale/index.vue +++ b/src/views/afterSale/index.vue @@ -26,7 +26,7 @@

拒绝理由：{{orderData.reason}}

评审中

退货完成，拒绝退款

-

已关闭

+

{{$t('page.closed')}}

审核通过

@@ -59,12 +59,12 @@
-

订单信息

+

{{$t('order.orderinfo')}}

订单号：{{orderData.orderFormid}}

支付渠道：{{orderData.paymentMode}}

交易号：{{orderData.transactionId}}

-

创建时间：{{orderData.createTime}}

+

{{$t('common.createTime')}}：{{orderData.createTime}}

付款时间：{{orderData.paymentTime}}

成交时间：{{orderData.receiveTime}}

@@ -85,11 +85,11 @@

{{text}}

-
待付款
-
待发货
-
待收货
-
已完成
-
已关闭
+
{{$t('page.due')}}
+
{{$t('page.goodswaitingtobesent')}}
+
{{$t('page.waittobereceived')}}
+
{{$t('common.completed')}}
+
{{$t('page.closed')}}
{{pro.number}}
¥{{pro.price}}
diff --git a/src/views/login/login.vue b/src/views/login/login.vue index b03c8e2..39d6801 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -9,7 +9,7 @@
-
+
@@ -17,13 +17,13 @@
- +
- + @@ -31,21 +31,21 @@
- 获取验证码 - 重新获取({{ codeCountNum }}s) + {{vm.$t('common.verificationcodetip')}} + {{ vm.$t('common.verificationcodetip3') }}({{ codeCountNum }}s)
七天免登录
- 立即登录 + {{isRegistered === '1' ? vm.$t('page.register') : vm.$t('page.login')}}
阅读并同意 - 《cereshop 服务协议》 + 《Thee 服务协议》
@@ -68,7 +68,9 @@ import { export default { name: 'login', data() { + const vm =window.vm; return { + vm:vm, userName: '', verificationCode: '', isNoLogin: false, @@ -134,6 +136,7 @@ export default { this.dialogAgreement = true }, login() { + let that = this let reg = /^1[13456789]\d{9}$/ if (!reg.test(this.userName)) { this.$message({ @@ -145,7 +148,7 @@ export default { } if (this.verificationCode === '') { this.$message({ - message: '请输入验证码', + message: that.$t('common.enterverificationcode'), type: 'warning', customClass: 'messageZindex' }) diff --git a/src/views/orderDetail/components/expressInfo.vue b/src/views/orderDetail/components/expressInfo.vue index 11316bf..48be1ef 100644 --- a/src/views/orderDetail/components/expressInfo.vue +++ b/src/views/orderDetail/components/expressInfo.vue @@ -1,7 +1,7 @@