From 783c10fc624498825cdf4e848f7f222ee68f0f82 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Sat, 4 Jul 2026 09:24:35 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=86=85=E5=9B=BD=E9=99=85=E5=8C=96key=E7=9A=84?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交对全项目的国际化调用进行了规范化重构： 1. 为中文/英文语言包新增了avatar和gender的别名映射，兼容旧有headImg/sex写法 2. 修正了lang.js中的注释路径错误 3. 将所有页面和组件内的$lang调用从短路径改为带业务模块前缀的完整命名空间路径，例如将$lang('title')改为$lang('article.list.title') 4. 优化了i18n-lazy.js的注释说明，补充了正确的key命名格式示例 5. 统一了分销、订单、会员等模块的国际化key层级，确保所有语言调用路径一致 --- common/js/lang.js | 2 +- common/mixin/i18n-lazy.js | 8 +- components-diy/diy-category.vue | 6 +- components-diy/diy-member-info.vue | 16 +- components/payment/payment.vue | 14 +- lang/en-us/member/info.js | 2 + lang/zh-cn/member/info.js | 2 + .../goods-detail-view/goods-detail-view.vue | 12 +- pages_goods/cart.vue | 14 +- pages_goods/category.vue | 10 +- pages_goods/detail.vue | 98 +++++----- pages_goods/list.vue | 26 +-- pages_goods/public/js/detail.js | 28 +-- pages_goods/public/js/list.js | 14 +- .../common-payment/common-payment.vue | 126 ++++++------- .../_components/common-payment/payment.js | 48 ++--- pages_order/detail.vue | 172 +++++++++--------- pages_order/detail_point.vue | 34 ++-- pages_order/list.vue | 34 ++-- pages_order/payment.vue | 28 +-- pages_promotion/fenxiao/apply.vue | 92 +++++----- pages_promotion/fenxiao/child_fenxiao.vue | 12 +- pages_promotion/fenxiao/goods_list.vue | 28 +-- pages_promotion/fenxiao/index.vue | 94 +++++----- pages_promotion/fenxiao/level.vue | 60 +++--- pages_promotion/fenxiao/order.vue | 22 +-- pages_promotion/fenxiao/order_detail.vue | 24 +-- pages_promotion/fenxiao/promote.vue | 16 +- pages_promotion/fenxiao/promote_code.vue | 24 +-- .../fenxiao/public/js/goods_list.js | 10 +- pages_promotion/fenxiao/ranking_list.vue | 28 +-- pages_promotion/fenxiao/relation.vue | 14 +- pages_promotion/fenxiao/team.vue | 20 +- pages_promotion/fenxiao/withdraw_apply.vue | 36 ++-- pages_promotion/fenxiao/withdraw_list.vue | 12 +- pages_promotion/fenxiao/withdrawal_detail.vue | 20 +- pages_promotion/merch/detail.vue | 34 ++-- pages_promotion/merch/list.vue | 30 +-- pages_promotion/merch/public/edit.js | 118 ++++++------ pages_promotion/merch/public/js/list.js | 46 ++--- pages_promotion/point/goods_list.vue | 40 ++-- pages_promotion/point/list.vue | 72 ++++---- pages_promotion/point/order_list.vue | 8 +- pages_promotion/point/payment.vue | 86 ++++----- pages_promotion/point/public/js/payment.js | 30 +-- pages_promotion/point/result.vue | 6 +- pages_tool/ai-chat/ai-chat-message.vue | 12 +- .../components/ai-chat-avatar-selector.vue | 12 +- .../components/ai-chat-emoji-panel.vue | 2 +- .../components/ai-chat-nickname-editor.vue | 12 +- .../ai-chat/components/ai-chat-search.vue | 12 +- .../components/ai-chat-tools-panel.vue | 10 +- .../components/ai-chat-voice-panel.vue | 6 +- pages_tool/ai-chat/index.vue | 70 +++---- pages_tool/article/list.vue | 6 +- pages_tool/cases/index.vue | 30 +-- pages_tool/contact/contact.vue | 32 ++-- pages_tool/files/list.vue | 10 +- pages_tool/index/diy.vue | 2 +- pages_tool/login/find.vue | 54 +++--- pages_tool/login/login.vue | 42 ++--- pages_tool/member/account.vue | 30 +-- pages_tool/member/account_edit.vue | 40 ++-- pages_tool/member/address.vue | 36 ++-- pages_tool/member/address_edit.vue | 46 ++--- pages_tool/member/balance.vue | 4 +- pages_tool/member/balance_detail.vue | 18 +- pages_tool/member/bind_mobile.vue | 52 +++--- pages_tool/member/cancellation.vue | 6 +- pages_tool/member/cancelrefuse.vue | 6 +- pages_tool/member/cancelsuccess.vue | 4 +- pages_tool/member/card.vue | 50 ++--- pages_tool/member/card_buy.vue | 68 +++---- pages_tool/member/card_log.vue | 22 +-- pages_tool/member/coupon.vue | 30 +-- pages_tool/member/info.vue | 10 +- pages_tool/member/info_edit.vue | 86 ++++----- pages_tool/member/invite_friends.vue | 70 +++---- pages_tool/member/level.vue | 52 +++--- pages_tool/member/level_growth_rules.vue | 22 +-- pages_tool/member/pay_password.vue | 24 +-- pages_tool/member/public/js/info.js | 120 ++++++------ pages_tool/member/public/js/invite_friends.js | 4 +- pages_tool/member/public/js/signin.js | 10 +- pages_tool/member/withdrawal.vue | 2 +- pages_tool/order/activist.vue | 16 +- pages_tool/order/invoice.vue | 92 +++++----- pages_tool/order/logistics.vue | 6 +- pages_tool/order/public/js/refundMethod.js | 4 +- pages_tool/order/refund.vue | 28 +-- pages_tool/order/refund_detail.vue | 66 +++---- pages_tool/order/refund_goods_select.vue | 8 +- pages_tool/order/refund_type_select.vue | 10 +- pages_tool/pay/cashier.vue | 11 +- pages_tool/pay/index.vue | 2 +- pages_tool/pay/wx_pay.vue | 2 +- pages_tool/recharge/list.vue | 24 +-- pages_tool/recharge/order_list.vue | 4 +- 98 files changed, 1543 insertions(+), 1530 deletions(-) diff --git a/common/js/lang.js b/common/js/lang.js index d302b1f..3c9b30d 100644 --- a/common/js/lang.js +++ b/common/js/lang.js @@ -165,7 +165,7 @@ function normalizePageLangPack(path, langData) { } if (!result[lastSegment]) { // 兼容页面内按文件名命名空间调用的写法，如 point/goods_list 页面调用 - // $lang('goods_list.searchPlaceholder')。 + // $lang('point.goods_list.searchPlaceholder')。 result[lastSegment] = deepCloneLang(currentPageLeaf); } diff --git a/common/mixin/i18n-lazy.js b/common/mixin/i18n-lazy.js index fef258a..c694865 100644 --- a/common/mixin/i18n-lazy.js +++ b/common/mixin/i18n-lazy.js @@ -27,12 +27,14 @@ * } * * // 2) 在 methods 中实现 i18nPrepareFn, 返回一个新对象用于填充 this.i18n + * // 其中 key 用反引号 `` `your.module.title` `` 这类命名代表"业务模块的真实 key", + * // 请用业务组件实际使用的 key 替换(例如 'components.privacyPopup.title') * methods: { * i18nPrepareFn() { * return { - * title: this.$lang('components.foo.title'), - * descPrefix: this.$lang('components.foo.descPrefix', { appName: '本应用' }), - * privacyContractName: this.platformContractName || this.$lang('components.foo.default'), + * title: this.$lang(`your.module.title`), + * descPrefix: this.$lang('components.privacyPopup.descPrefix', { appName: '本应用' }), + * privacyContractName: this.platformContractName || this.$lang(`your.module.defaultContract`), * }; * }, * } diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue index 5d4739f..29c3555 100644 --- a/components-diy/diy-category.vue +++ b/components-diy/diy-category.vue @@ -5,7 +5,7 @@ - diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue index 0b571f8..be6313a 100644 --- a/components-diy/diy-member-info.vue +++ b/components-diy/diy-member-info.vue @@ -69,8 +69,8 @@ - {{ $lang('login') }} - {{ $lang('loginTips') }} + {{ $lang('member.index.login') }} + {{ $lang('member.index.loginTips') }} - {{ $lang('balance') }} + {{ $lang('member.index.balance') }} {{ memberInfo ? parseFloat(memberInfo.point) : '--' }} - {{ $lang('point') }} + {{ $lang('member.index.point') }} {{ memberInfo && memberInfo.coupon_num != undefined ? memberInfo.coupon_num : '--' }} - {{ $lang('coupon') }} + {{ $lang('member.index.coupon') }} {{ - $lang('video') }} + $lang('goods.detail.video') }} {{ $lang('image') }} + @click="(switchMedia = 'img'), videoContext.pause()">{{ $lang('goods.detail.image') }} @@ -65,7 +65,7 @@ {{ $lang('express') }} + v-if="goodsSkuDetail.support_trade_type.indexOf(index) != -1">{{ $lang('goods.detail.express') }} @@ -199,7 +199,7 @@ - + @@ -363,11 +363,11 @@ - {{ $lang('document') }} + {{ $lang('goods.detail.document') }} - {{ $lang('details') }} + {{ $lang('goods.detail.details') }} diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue index 8f649b6..d5627bc 100644 --- a/pages_goods/cart.vue +++ b/pages_goods/cart.vue @@ -7,7 +7,7 @@ {{ $lang('goods.cart.totalKinds', { count: cartData[0].cartList.length }) }} - {{ isAction ? $lang('complete') : $lang('edit') }} + {{ isAction ? $lang('goods.cart.complete') : $lang('goods.cart.edit') }} @@ -131,7 +131,7 @@ {{ $lang('del') }} + @click="deleteCart('single', siteIndex, cartIndex)">{{ $lang('goods.cart.del') }} @@ -235,7 +235,7 @@ - {{ $lang('total') }} + {{ $lang('goods.cart.total') }} {{ $lang('common.currencySymbol') }}{{ discount.order_money | moneyFormat }} @@ -310,11 +310,11 @@ - {{ $lang('allElection') }} + {{ $lang('goods.cart.allElection') }} - {{ $lang('total') }}： + {{ $lang('goods.cart.total') }}： {{ $lang('common.currencySymbol') }} {{ parseFloat(discount.order_money).toFixed(2).split('.')[0] @@ -333,14 +333,14 @@ - + diff --git a/pages_goods/category.vue b/pages_goods/category.vue index e62d58d..399b1a1 100644 --- a/pages_goods/category.vue +++ b/pages_goods/category.vue @@ -48,11 +48,11 @@ export default { // 如果后台没配置，用默认值 this.mpShareData = { appMessage: { - title: this.$lang('shareTitle'), + title: this.$lang('goods.category.shareTitle'), path: '/pages_goods/category' }, timeLine: { - title: this.$lang('shareTitle'), + title: this.$lang('goods.category.shareTitle'), query: '/pages_goods/category' } }; @@ -92,19 +92,19 @@ export default { }, onShareAppMessage() { return this.mpShareData?.appMessage || { - title: this.$lang('shareTitle'), + title: this.$lang('goods.category.shareTitle'), path: '/pages_goods/category' }; }, onShareTimeline() { return this.mpShareData?.timeLine || { - title: this.$lang('shareTitle'), + title: this.$lang('goods.category.shareTitle'), query: '/pages_goods/category' }; }, onAddToFavorites() { return { - title: this.$lang('shareTitle'), + title: this.$lang('goods.category.shareTitle'), path: '/pages_goods/category' }; } diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue index 70d8ab4..e05431c 100644 --- a/pages_goods/detail.vue +++ b/pages_goods/detail.vue @@ -14,13 +14,13 @@ - {{ $lang('limitedTimeDiscount') }} - {{ $lang('sold') }}{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }} + {{ $lang('goods.detail.limitedTimeDiscount') }} + {{ $lang('goods.detail.sold') }}{{ goodsSkuDetail.sale_num }}{{ goodsSkuDetail.unit }} - {{ $lang('countdownEndsIn') }} + {{ $lang('goods.detail.countdownEndsIn') }} - {{ $lang('originalPrice') }} + {{ $lang('goods.detail.originalPrice') }} {{ $lang('common.currencySymbol') }} {{ goodsSkuDetail.price }} @@ -90,8 +90,8 @@ {{ goodsSkuDetail.label_name }} - {{$lang('stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}} - {{$lang('sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }} + {{$lang('goods.detail.stock')}}: {{ goodsSkuDetail.stock +goodsSkuDetail.unit}} + {{$lang('goods.detail.sales')}}: {{ goodsSkuDetail.sale_num+goodsSkuDetail.unit }} {{ item.coupon_name }} - {{ $lang('maxDiscount', { symbol: $lang('common.currencySymbol'), amount: item.discount_limit }) }} - {{ $lang('validUntilDate', { date: $util.timeStampTurnTime(item.end_time) }) }} - {{ $lang('validForDays', { days: item.fixed_term }) }} - {{ $lang('validPermanent') }} + {{ $lang('goods.detail.maxDiscount', { symbol: $lang('common.currencySymbol'), amount: item.discount_limit }) }} + {{ $lang('goods.detail.validUntilDate', { date: $util.timeStampTurnTime(item.end_time) }) }} + {{ $lang('goods.detail.validForDays', { days: item.fixed_term }) }} + {{ $lang('goods.detail.validPermanent') }} - - - + + + - + @@ -367,24 +367,24 @@ - {{ $lang('promotion') }} + {{ $lang('goods.detail.promotion') }} - {{ $lang('fullReduction') }} + {{ $lang('goods.detail.fullReduction') }} {{ manjian.manjian }} - {{ $lang('fullGift') }} + {{ $lang('goods.detail.fullGift') }} {{ manjian.mansong }} - {{ $lang('freeShipping') }} + {{ $lang('goods.detail.freeShipping') }} {{ manjian.free_shipping }} - + @@ -393,7 +393,7 @@ - {{ $lang('productMessage') }} + {{ $lang('goods.detail.productMessage') }} @@ -414,7 +414,7 @@ - + - + - + - - - + + + - + - + @@ -501,7 +501,7 @@ @@ -520,11 +520,11 @@ - {{ $lang('dialOnMobile', { phone: '021-51815181' }) }} + {{ $lang('goods.detail.dialOnMobile', { phone: '021-51815181' }) }} - - + + @@ -588,7 +588,7 @@ export default { data: '021-51815181', success: () => { uni.showToast({ - title: this.$lang('copySuccess'), + title: this.$lang('goods.detail.copySuccess'), icon: 'success' }); this.closeContactPopup(); diff --git a/pages_goods/list.vue b/pages_goods/list.vue index 0530f72..a6e3bb6 100644 --- a/pages_goods/list.vue +++ b/pages_goods/list.vue @@ -5,7 +5,7 @@ + :placeholder="$lang('goods.list.Search')" /> - {{ $lang('Random') }} + {{ $lang('goods.list.Random') }} - {{ $lang('Sales') }} + {{ $lang('goods.list.Sales') }} {{ $lang('Price') }} + :class="{ 'color-base-text': orderType === 'discount_price' }">{{ $lang('goods.list.Price') }} @@ -37,7 +37,7 @@ - {{ $lang('Filter') }} + {{ $lang('goods.list.Filter') }} @@ -78,7 +78,7 @@ - {{ $lang('soldCount', { count: item.sale_num, unit: item.unit || $lang('soldUnitDefault') }) }} + {{ $lang('goods.list.soldCount', { count: item.sale_num, unit: item.unit || $lang('goods.list.soldUnitDefault') }) }} - {{ $lang('soldCount', { count: item.sale_num, unit: item.unit || $lang('soldUnitDefault') }) }} + {{ $lang('goods.list.soldCount', { count: item.sale_num, unit: item.unit || $lang('goods.list.soldUnitDefault') }) }} - + @@ -151,7 +151,7 @@ - {{ $lang('Filter') }} + {{ $lang('goods.list.Filter') }} - {{ $lang('allCategories') }} + {{ $lang('goods.list.allCategories') }} - {{ $lang('all') }} + {{ $lang('goods.list.all') }} @@ -198,8 +198,8 @@ - - + + diff --git a/pages_goods/public/js/detail.js b/pages_goods/public/js/detail.js index 155ac69..a04d65f 100644 --- a/pages_goods/public/js/detail.js +++ b/pages_goods/public/js/detail.js @@ -318,9 +318,9 @@ export default { let list = this.couponList; if (res.data.is_exist == 1 && res.code < 0) { - msg = this.$lang('couponAlreadyClaimed'); + msg = this.$lang('goods.detail.couponAlreadyClaimed'); } else if (res.code == 0) { - msg = this.$lang('couponClaimSuccess'); + msg = this.$lang('goods.detail.couponClaimSuccess'); } else { msg = res.message; } @@ -362,7 +362,7 @@ export default { //获取满减信息 getManjian(data) { this.manjian = data; - let limit = data.type == 0 ? this.$lang('manjianUnitYuan') : this.$lang('manjianUnitPiece'); + let limit = data.type == 0 ? this.$lang('goods.detail.manjianUnitYuan') : this.$lang('goods.detail.manjianUnitPiece'); Object.keys(data.rule_json).forEach((key) => { var item = data.rule_json[key]; if (item.coupon_data) { @@ -373,46 +373,46 @@ export default { item.limit = data.type == 0 ? parseFloat(item.limit).toFixed(2) : parseInt(item.limit); // 满减 if (item.discount_money != undefined) { - let itemText = this.$lang('fullReductionItem', { limit: item.limit, unit: limit, money: item.discount_money }); + let itemText = this.$lang('goods.detail.fullReductionItem', { limit: item.limit, unit: limit, money: item.discount_money }); if (this.manjian.manjian == undefined) { this.manjian.manjian = itemText; } else { - this.manjian.manjian += this.$lang('manjianItemSeparator') + itemText; + this.manjian.manjian += this.$lang('goods.detail.manjianItemSeparator') + itemText; } } // 满送 if (item.point != undefined || item.coupon != undefined) { let text = ''; if (item.point != undefined) { - text = this.$lang('fullGiftPoints', { point: item.point }); + text = this.$lang('goods.detail.fullGiftPoints', { point: item.point }); } if (item.coupon != undefined && item.coupon_data != undefined) { item.coupon_data.forEach((couponItem, couponIndex) => { if (couponItem.type == 'discount') { - let couponText = this.$lang('fullGiftDiscountCoupon', { count: item.coupon_num[couponIndex], discount: parseFloat(couponItem.discount) }); + let couponText = this.$lang('goods.detail.fullGiftDiscountCoupon', { count: item.coupon_num[couponIndex], discount: parseFloat(couponItem.discount) }); if (text == '') text = couponText; - else text += this.$lang('fullGiftConnector') + couponText; + else text += this.$lang('goods.detail.fullGiftConnector') + couponText; } else { - let couponText = this.$lang('fullGiftMoneyCoupon', { count: item.coupon_num[couponIndex], money: parseFloat(couponItem.money) }); + let couponText = this.$lang('goods.detail.fullGiftMoneyCoupon', { count: item.coupon_num[couponIndex], money: parseFloat(couponItem.money) }); if (text == '') text = couponText; - else text += this.$lang('fullGiftConnector') + couponText; + else text += this.$lang('goods.detail.fullGiftConnector') + couponText; } }) } - let giftItemText = this.$lang('fullGiftItem', { limit: item.limit, unit: limit, gift: text }); + let giftItemText = this.$lang('goods.detail.fullGiftItem', { limit: item.limit, unit: limit, gift: text }); if (this.manjian.mansong == undefined) { this.manjian.mansong = giftItemText; } else { - this.manjian.mansong += this.$lang('manjianItemSeparator') + giftItemText; + this.manjian.mansong += this.$lang('goods.detail.manjianItemSeparator') + giftItemText; } } // 包邮 if (item.free_shipping != undefined) { - let itemText = this.$lang('freeShippingItem', { limit: item.limit, unit: limit }); + let itemText = this.$lang('goods.detail.freeShippingItem', { limit: item.limit, unit: limit }); if (this.manjian.free_shipping == undefined) { this.manjian.free_shipping = itemText; } else { - this.manjian.free_shipping += this.$lang('manjianItemSeparator') + itemText; + this.manjian.free_shipping += this.$lang('goods.detail.manjianItemSeparator') + itemText; } } }); diff --git a/pages_goods/public/js/list.js b/pages_goods/public/js/list.js index ebfe795..de492f4 100644 --- a/pages_goods/public/js/list.js +++ b/pages_goods/public/js/list.js @@ -76,7 +76,7 @@ export default { this.langstatus = res.status if(this.langstatus == 1){ // this.$langConfig.refresh(); - this.$langConfig.title(this.$lang('title')); + this.$langConfig.title(this.$lang('goods.list.title')); } } }); @@ -123,7 +123,7 @@ export default { * 转发分享 */ onShareAppMessage(res) { - var title = this.$lang('shareTitle', { count: this.count, keyword: this.keyword + this.category_title + this.coupon_name }); + var title = this.$lang('goods.list.shareTitle', { count: this.count, keyword: this.keyword + this.category_title + this.coupon_name }); let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0); var path = route.path; return { @@ -137,7 +137,7 @@ export default { }, // 分享到微信朋友圈 onShareTimeline() { - var title = this.$lang('shareTitle', { count: this.count, keyword: this.keyword + this.category_title + this.coupon_name }); + var title = this.$lang('goods.list.shareTitle', { count: this.count, keyword: this.keyword + this.category_title + this.coupon_name }); let route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0); var query = route.query; return { @@ -362,26 +362,26 @@ export default { // } if (!Number(this.maxPrice) && this.maxPrice) { this.$util.showToast({ - title: this.$lang('enterMaxPrice') + title: this.$lang('goods.list.enterMaxPrice') }); return; } if (Number(this.minPrice) < 0 || Number(this.maxPrice) < 0) { this.$util.showToast({ - title: this.$lang('priceCannotBeNegative') + title: this.$lang('goods.list.priceCannotBeNegative') }); return; } if (this.minPrice != '' && Number(this.minPrice) > Number(this.maxPrice) && this.maxPrice) { this.$util.showToast({ - title: this.$lang('minPriceGreaterThanMax') + title: this.$lang('goods.list.minPriceGreaterThanMax') }); return; } if (this.maxPrice != '' && Number(this.maxPrice) < Number(this.minPrice)) { this.$util.showToast({ - title: this.$lang('maxPriceLessThanMin') + title: this.$lang('goods.list.maxPriceLessThanMin') }); return; } diff --git a/pages_order/_components/common-payment/common-payment.vue b/pages_order/_components/common-payment/common-payment.vue index 7a71b05..62fba90 100644 --- a/pages_order/_components/common-payment/common-payment.vue +++ b/pages_order/_components/common-payment/common-payment.vue @@ -4,7 +4,7 @@ - {{ $lang('payment.title') }} + {{ $lang('order.payment.title') }} @@ -18,14 +18,14 @@ - {{ $lang('payment.virtual.tips') }} + {{ $lang('order.payment.virtual.tips') }} - {{ $lang('payment.virtual.mobile') }} - + {{ $lang('order.payment.virtual.mobile') }} + @@ -54,7 +54,7 @@ - {{ $lang('payment.address.setAddress') }} + {{ $lang('order.payment.address.setAddress') }} @@ -67,18 +67,18 @@ - {{ $lang('payment.localDelivery.providedBy') }} + {{ $lang('order.payment.localDelivery.providedBy') }} {{ storeInfo.store_name }} - {{ $lang('payment.localDelivery.deliveredBy') }} + {{ $lang('order.payment.localDelivery.deliveredBy') }} - {{ $lang('payment.localDelivery.switchStore') }} + {{ $lang('order.payment.localDelivery.switchStore') }} - {{ $lang('payment.localDelivery.noStoreNearby') }} + {{ $lang('order.payment.localDelivery.noStoreNearby') }} @@ -97,16 +97,16 @@ - {{ $lang('payment.address.deliveryTime') }} + {{ $lang('order.payment.address.deliveryTime') }} - {{ deliveryTime ? deliveryTime : $lang('payment.address.selectDeliveryTime') }} + {{ deliveryTime ? deliveryTime : $lang('order.payment.address.selectDeliveryTime') }} - {{ $lang('payment.address.setAddress') }} + {{ $lang('order.payment.address.setAddress') }} @@ -125,7 +125,7 @@ {{ storeInfo.store_name }} - {{ $lang('payment.store.businessHours') }}{{ storeInfo.open_date }} + {{ $lang('order.payment.store.businessHours') }}{{ storeInfo.open_date }} {{ storeInfo.full_address }} {{ storeInfo.address }} @@ -135,25 +135,25 @@ - {{ $lang('payment.store.name') }} + {{ $lang('order.payment.store.name') }} - {{ $lang('payment.store.reservedMobile') }} - + {{ $lang('order.payment.store.reservedMobile') }} + - {{ $lang('payment.store.pickupTime') }} + {{ $lang('order.payment.store.pickupTime') }} {{ deliveryTime }} - {{ $lang('payment.store.noPickupStore') }} + {{ $lang('order.payment.store.noPickupStore') }} @@ -189,7 +189,7 @@ goodsItem.support_trade_type.indexOf(orderCreateData.delivery.delivery_type) == -1 "> - {{ $lang('payment.goods.notSupportDeliveryType', { deliveryType: orderCreateData.delivery.delivery_type_name }) }} + {{ $lang('order.payment.goods.notSupportDeliveryType', { deliveryType: orderCreateData.delivery.delivery_type_name }) }} @@ -224,22 +224,22 @@ - {{ $lang('payment.orderMoney.buyerMessage') }} + {{ $lang('order.payment.orderMoney.buyerMessage') }} {{ orderCreateData.buyer_message[calculateGoodsData.merch_id] }} - {{ $lang('payment.orderMoney.noMessage') }} + {{ $lang('order.payment.orderMoney.noMessage') }} - {{ $lang('payment.orderMoney.coupon') }} + {{ $lang('order.payment.orderMoney.coupon') }} - {{ $lang('payment.orderMoney.noCoupon') }} + {{ $lang('order.payment.orderMoney.noCoupon') }} @@ -247,8 +247,8 @@ - {{ $lang('payment.orderMoney.totalItems', { count: calculateGoodsData.goods_num }) }} - {{ $lang('payment.orderMoney.subtotal') }} + {{ $lang('order.payment.orderMoney.totalItems', { count: calculateGoodsData.goods_num }) }} + {{ $lang('order.payment.orderMoney.subtotal') }} {{ $lang('common.currencySymbol') }} {{ calculateGoodsData.goods_money | moneyFormat }} @@ -312,10 +312,10 @@ - {{ $lang('payment.memberCard.activate') }}{{ paymentData.recommend_member_card.level_name }} - {{ $lang('payment.memberCard.expectedSave') }} + {{ $lang('order.payment.memberCard.activate') }}{{ paymentData.recommend_member_card.level_name }} + {{ $lang('order.payment.memberCard.expectedSave') }} {{ paymentData.recommend_member_card.discount_money | moneyFormat }} - {{ $lang('payment.memberCard.yuan') }} + {{ $lang('order.payment.memberCard.yuan') }} @@ -332,14 +332,14 @@ diff --git a/pages_tool/member/invite_friends.vue b/pages_tool/member/invite_friends.vue index a705cc4..48faaaf 100644 --- a/pages_tool/member/invite_friends.vue +++ b/pages_tool/member/invite_friends.vue @@ -7,17 +7,17 @@ - {{ $lang('activityDescription') }} + {{ $lang('member.invite_friends.activityDescription') }} - {{ $lang('activityTime', { startTime: $util.timeStampTurnTime(info.start_time, 1), endTime: $util.timeStampTurnTime(info.end_time, 1) }) }} + {{ $lang('member.invite_friends.activityTime', { startTime: $util.timeStampTurnTime(info.start_time, 1), endTime: $util.timeStampTurnTime(info.end_time, 1) }) }} - {{ $lang('inviteNow') }} + {{ $lang('member.invite_friends.inviteNow') }} - {{ $lang('myFriends') }} + {{ $lang('member.invite_friends.myFriends') }} @@ -33,32 +33,32 @@ - {{ $lang('cashRedPacketAmount', { amount: item.balance }) }} + {{ $lang('member.invite_friends.cashRedPacketAmount', { amount: item.balance }) }} + - {{ $lang('pointsAmount', { amount: parseInt(item.point) }) }} + {{ $lang('member.invite_friends.pointsAmount', { amount: parseInt(item.point) }) }} + - {{ $lang('couponsAmount', { count: item.coupon_num }) }} + {{ $lang('member.invite_friends.couponsAmount', { count: item.coupon_num }) }} - {{ $lang('viewMore') }} + {{ $lang('member.invite_friends.viewMore') }} - {{ $lang('noMoreData') }} + {{ $lang('member.invite_friends.noMoreData') }} - {{ $lang('noInvitedFriendsTip') }} - {{ $lang('inviteTip') }} + {{ $lang('member.invite_friends.noInvitedFriendsTip') }} + {{ $lang('member.invite_friends.inviteTip') }} - {{ $lang('inviteRewards') }} + {{ $lang('member.invite_friends.inviteRewards') }} @@ -68,7 +68,7 @@ {{ $lang('common.currencySymbol') }} {{ info.balance }} - {{ $lang('cashRedPacket') }} + {{ $lang('member.invite_friends.cashRedPacket') }} @@ -78,7 +78,7 @@ {{ parseInt(info.point) }} - {{ $lang('points') }} + {{ $lang('member.invite_friends.points') }} @@ -88,49 +88,49 @@ {{ info.coupon.split(',').length }} - {{ $lang('couponUnit') }} + {{ $lang('member.invite_friends.couponUnit') }} - {{ $lang('coupon') }} + {{ $lang('member.invite_friends.coupon') }} - {{ $lang('shareDesc') }} + {{ $lang('member.invite_friends.shareDesc') }} ● - {{ $lang('balanceReward', { amount: info.balance }) }} + {{ $lang('member.invite_friends.balanceReward', { amount: info.balance }) }} ● - {{ $lang('pointReward', { amount: info.point }) }} + {{ $lang('member.invite_friends.pointReward', { amount: info.point }) }} ● - {{ $lang('couponReward', { count: info.coupon.split(',').length }) }} + {{ $lang('member.invite_friends.couponReward', { count: info.coupon.split(',').length }) }} ● - {{ $lang('unlimitedReward') }} + {{ $lang('member.invite_friends.unlimitedReward') }} ● - {{ $lang('rewardLimit', { max: info.max_fetch }) }} + {{ $lang('member.invite_friends.rewardLimit', { max: info.max_fetch }) }} - {{ $lang('howToInvite') }} + {{ $lang('member.invite_friends.howToInvite') }} - {{ $lang('stepShareLink') }} + {{ $lang('member.invite_friends.stepShareLink') }} @@ -139,7 +139,7 @@ - {{ $lang('stepFriendEnter') }} + {{ $lang('member.invite_friends.stepFriendEnter') }} @@ -148,7 +148,7 @@ - {{ $lang('stepFriendRegister') }} + {{ $lang('member.invite_friends.stepFriendRegister') }} @@ -163,10 +163,10 @@ - {{ $lang('saveImage') }} + {{ $lang('member.invite_friends.saveImage') }} - {{ $lang('longPressSaveImage') }} + {{ $lang('member.invite_friends.longPressSaveImage') }} @@ -179,32 +179,32 @@ @@ -214,7 +214,7 @@ - {{ $lang('activityDescription') }} + {{ $lang('member.invite_friends.activityDescription') }} @@ -224,7 +224,7 @@ - + diff --git a/pages_tool/member/level.vue b/pages_tool/member/level.vue index 4f21b9b..66fd89e 100644 --- a/pages_tool/member/level.vue +++ b/pages_tool/member/level.vue @@ -9,11 +9,11 @@ {{ memberInfo.nickname }} - {{ $lang('currentLevelLabel') }}{{ memberInfo.member_level_name }} + {{ $lang('member.level.currentLevelLabel') }}{{ memberInfo.member_level_name }} - {{ $lang('growthRules') }} + {{ $lang('member.level.growthRules') }} {{ levelList[curIndex].level_name }} - {{ $lang('currentLevelTag') }} + {{ $lang('member.level.currentLevelTag') }} - {{ $lang('currentGrowthValue') }} + {{ $lang('member.level.currentGrowthValue') }} {{ growth }} - {{ $lang('growthToNextLevel', { needGrowth: levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0, levelName: levelList[curIndex + 1].level_name }) }} + {{ $lang('member.level.growthToNextLevel', { needGrowth: levelList[curIndex + 1].needGrowth > 0 ? levelList[curIndex + 1].needGrowth : 0, levelName: levelList[curIndex + 1].level_name }) }} - {{ $lang('maxLevelReached') }} + {{ $lang('member.level.maxLevelReached') }} - {{ $lang('growthToNextLevel', { needGrowth: levelList[curIndex].needGrowth, levelName: levelList[curIndex].level_name }) }} + {{ $lang('member.level.growthToNextLevel', { needGrowth: levelList[curIndex].needGrowth, levelName: levelList[curIndex].level_name }) }} @@ -82,52 +82,52 @@ - {{ $lang('memberBenefits') }} + {{ $lang('member.level.memberBenefits') }} - {{ $lang('freeShipping') }} - {{ $lang('freeShippingDesc') }} + {{ $lang('member.level.freeShipping') }} + {{ $lang('member.level.freeShippingDesc') }} - {{ $lang('consumptionDiscount') }} - {{ $lang('noDiscountDesc') }} - {{ $lang('discountDescWithValue', { discount: levelList[curIndex].consume_discount }) }} + {{ $lang('member.level.consumptionDiscount') }} + {{ $lang('member.level.noDiscountDesc') }} + {{ $lang('member.level.discountDescWithValue', { discount: levelList[curIndex].consume_discount }) }} - {{ $lang('pointsReward') }} - {{ $lang('pointsRewardDesc', { multiplier: levelList[curIndex].point_feedback }) }} + {{ $lang('member.level.pointsReward') }} + {{ $lang('member.level.pointsRewardDesc', { multiplier: levelList[curIndex].point_feedback }) }} - {{ $lang('memberGift') }} + {{ $lang('member.level.memberGift') }} - {{ $lang('pointsGift') }} - {{ $lang('giftPoints', { points: levelList[curIndex].send_point }) }} + {{ $lang('member.level.pointsGift') }} + {{ $lang('member.level.giftPoints', { points: levelList[curIndex].send_point }) }} - {{ $lang('redPacketGift') }} - {{ $lang('giftRedPacket', { amount: levelList[curIndex].send_balance }) }} + {{ $lang('member.level.redPacketGift') }} + {{ $lang('member.level.giftRedPacket', { amount: levelList[curIndex].send_balance }) }} - {{ $lang('couponGift') }} - {{ $lang('giftCoupons', { count: levelList[curIndex].coupon_length }) }} + {{ $lang('member.level.couponGift') }} + {{ $lang('member.level.giftCoupons', { count: levelList[curIndex].coupon_length }) }} @@ -137,7 +137,7 @@ - {{ $lang('coupons') }} + {{ $lang('member.level.coupons') }} @@ -148,11 +148,11 @@ {{ item.money }} - {{ $lang('yuan') }} + {{ $lang('member.level.yuan') }} {{ $util.numberFixed(item.discount, 1) }} - {{ $lang('zhe') }} + {{ $lang('member.level.zhe') }} @@ -261,7 +261,7 @@ }, getBannerDetail(index) { uni.showLoading({ - title: this.$lang('navigatingToDetail'), + title: this.$lang('member.level.navigatingToDetail'), duration: 2000, mask: true }); diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue index fe3ab23..275f459 100644 --- a/pages_tool/member/level_growth_rules.vue +++ b/pages_tool/member/level_growth_rules.vue @@ -3,13 +3,13 @@ - {{ $lang('title') }} + {{ $lang('member.level_growth_rules.title') }} - {{ $lang('level') }} - {{ $lang('growthValue') }} + {{ $lang('member.level_growth_rules.level') }} + {{ $lang('member.level_growth_rules.growthValue') }} {{ item.level_name }} @@ -20,20 +20,20 @@ - {{ $lang('whatIsGrowthValue') }} + {{ $lang('member.level_growth_rules.whatIsGrowthValue') }} - {{ $lang('growthValueDescription') }} + {{ $lang('member.level_growth_rules.growthValueDescription') }} - {{ $lang('howToGetGrowthValue') }} + {{ $lang('member.level_growth_rules.howToGetGrowthValue') }} - {{ $lang('ruleRegister') }} - {{ $lang('ruleRecharge') }} - {{ $lang('ruleCheckin') }} - {{ $lang('ruleConsume') }} + {{ $lang('member.level_growth_rules.ruleRegister') }} + {{ $lang('member.level_growth_rules.ruleRecharge') }} + {{ $lang('member.level_growth_rules.ruleCheckin') }} + {{ $lang('member.level_growth_rules.ruleConsume') }} @@ -118,7 +118,7 @@ }, getBannerDetail(index) { uni.showLoading({ - title: this.$lang('navigatingToDetail'), + title: this.$lang('member.level_growth_rules.navigatingToDetail'), duration: 2000, mask: true }); diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue index 8c90b14..5193d05 100644 --- a/pages_tool/member/pay_password.vue +++ b/pages_tool/member/pay_password.vue @@ -1,16 +1,16 @@ @@ -42,7 +42,7 @@ onLoad(option) { if (option.back) this.back = option.back; - this.dynacodeData.codeText = this.$lang('getCode'); + this.dynacodeData.codeText = this.$lang('member.pay_password.getCode'); // 判断登录 if (!this.storeToken) { @@ -50,8 +50,8 @@ } else { if (this.memberInfo.mobile == '') { uni.showModal({ - title: this.$lang('tipsTitle'), - content: this.$lang('bindMobileFirst'), + title: this.$lang('member.pay_password.tipsTitle'), + content: this.$lang('member.pay_password.bindMobileFirst'), success: res => { if (res.confirm) { this.$util.redirectTo('/pages_tool/member/info', { @@ -134,7 +134,7 @@ success: res => { if (res.code >= 0) { this.$util.showToast({ - title: this.$lang('modifySuccess') + title: this.$lang('member.pay_password.modifySuccess') }); setTimeout(() => { if (this.back) this.$util.redirectTo(this.back, {}, @@ -151,7 +151,7 @@ }); } else { this.$util.showToast({ - title: this.$lang('passwordMismatch'), + title: this.$lang('member.pay_password.passwordMismatch'), success: res => { this.initInfo(); } @@ -187,7 +187,7 @@ if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) { this.dynacodeData.timer = setInterval(() => { this.dynacodeData.seconds--; - this.dynacodeData.codeText = this.$lang('resendAfter', { seconds: this.dynacodeData.seconds }); + this.dynacodeData.codeText = this.$lang('member.pay_password.resendAfter', { seconds: this.dynacodeData.seconds }); }, 1000); } } else { diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js index 7a0d67c..8836d5a 100644 --- a/pages_tool/member/public/js/info.js +++ b/pages_tool/member/public/js/info.js @@ -64,7 +64,7 @@ export default { }, onLoad(option) { this.isIphoneX = this.$util.uniappIsIPhoneX() - this.formData.mobileCodeText = this.$lang('findanimateCode'); + this.formData.mobileCodeText = this.$lang('member.info.findanimateCode'); if (option.back) { this.back = option.back; @@ -96,7 +96,7 @@ export default { }, onHide() { this.seconds = 120; - this.formData.mobileCodeText = this.$lang('findanimateCode'); + this.formData.mobileCodeText = this.$lang('member.info.findanimateCode'); this.isSend = false; clearInterval(this.timer); }, @@ -104,7 +104,7 @@ export default { seconds(value) { if (value == 0) { this.seconds = 120; - this.formData.mobileCodeText = this.$lang('findanimateCode'); + this.formData.mobileCodeText = this.$lang('member.info.findanimateCode'); this.isSend = false; clearInterval(this.timer); } @@ -129,16 +129,16 @@ export default { initSexItems() { this.items = [{ value: '0', - name: this.$lang('sexUnknown') + name: this.$lang('member.info.sexUnknown') }, { value: '1', - name: this.$lang('sexMale'), + name: this.$lang('member.info.sexMale'), checked: 'true' }, { value: '2', - name: this.$lang('sexFemale') + name: this.$lang('member.info.sexFemale') } ]; }, @@ -158,25 +158,25 @@ export default { } }, setNavbarTitle() { - let title = this.$lang('title'); + let title = this.$lang('member.info.title'); switch (this.indent) { case 'name': - title = this.$lang('modifyNickname'); + title = this.$lang('member.info.modifyNickname'); break; case 'realName': - title = this.$lang('realName'); + title = this.$lang('member.info.realName'); break; case 'sex': - title = this.$lang('sex'); + title = this.$lang('member.info.sex'); break; case 'birthday': - title = this.$lang('birthday'); + title = this.$lang('member.info.birthday'); break; case 'password': - title = this.$lang('password'); + title = this.$lang('member.info.password'); break; case 'mobile': - title = this.$lang('mobile'); + title = this.$lang('member.info.mobilePhone'); break; } this.$langConfig.title(title); @@ -186,9 +186,9 @@ export default { this.memberInfoformData.userHeadImg = this.memberInfo.headimg; this.memberInfoformData.number = this.memberInfo.username; //账号 this.memberInfoformData.nickName = this.memberInfo.nickname; //昵称 - this.memberInfoformData.realName = this.memberInfo.realname ? this.memberInfo.realname : this.$lang('pleaseRealName'); //真实姓名 - this.memberInfoformData.sex = this.memberInfo.sex == 0 ? this.$lang('sexUnknown') : this.memberInfo.sex == 1 ? this.$lang('sexMale') : this.$lang('sexFemale'); //性别 - this.memberInfoformData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'YYYY-MM-DD') : this.$lang('pleaseSelectBirthday'); //生日 + this.memberInfoformData.realName = this.memberInfo.realname ? this.memberInfo.realname : this.$lang('member.info.pleaseRealName'); //真实姓名 + this.memberInfoformData.sex = this.memberInfo.sex == 0 ? this.$lang('member.info.sexUnknown') : this.memberInfo.sex == 1 ? this.$lang('member.info.sexMale') : this.$lang('member.info.sexFemale'); //性别 + this.memberInfoformData.birthday = this.memberInfo.birthday ? this.$util.timeStampTurnTime(this.memberInfo.birthday, 'YYYY-MM-DD') : this.$lang('member.info.pleaseSelectBirthday'); //生日 this.memberInfoformData.mobile = this.memberInfo.mobile; //手机号 this.formData.username = this.memberInfo.username; //用户名 @@ -317,14 +317,14 @@ export default { modifyUserName() { if (this.formData.username == this.memberInfo.username) { this.$util.showToast({ - title: this.$lang('alikeusername') + title: this.$lang('member.info_edit.alikeusername') }); return; } var rule = [{ name: 'username', checkType: 'required', - errorMsg: this.$lang('noEmityUsername') + errorMsg: this.$lang('member.info_edit.noEmityUsername') }]; if (!rule.length) return; var checkRes = validate.check(this.formData, rule); @@ -339,7 +339,7 @@ export default { this.memberInfo.username = this.formData.username; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -360,14 +360,14 @@ export default { modifyNickName() { if (this.formData.nickName == this.memberInfo.nickname) { this.$util.showToast({ - title: this.$lang('alikeNickname') + title: this.$lang('member.info.alikeNickname') }); return; } var rule = [{ name: 'nickName', checkType: 'required', - errorMsg: this.$lang('noEmityNickname') + errorMsg: this.$lang('member.info.noEmityNickname') }]; if (!rule.length) return; var checkRes = validate.check(this.formData, rule); @@ -382,7 +382,7 @@ export default { this.memberInfo.nickname = this.formData.nickName; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -403,14 +403,14 @@ export default { modifyRealName() { if (this.formData.realName == this.memberInfo.realname && this.memberInfo.realname) { this.$util.showToast({ - title: this.$lang('alikeRealName') + title: this.$lang('member.info.alikeRealName') }); return; } var rule = [{ name: 'realName', checkType: 'required', - errorMsg: this.$lang('noEmptyRealName') + errorMsg: this.$lang('member.info.noEmptyRealName') }]; if (!rule.length) return; var checkRes = validate.check(this.formData, rule); @@ -425,7 +425,7 @@ export default { this.memberInfo.realname = this.formData.realName; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -463,7 +463,7 @@ export default { this.memberInfo.sex = this.formData.sex; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -500,7 +500,7 @@ export default { modifyBirthday() { if (this.formData.birthday.length == 0) { this.$util.showToast({ - title: this.$lang('pleaseSelectBirthday') + title: this.$lang('member.info.pleaseSelectBirthday') }); return; } @@ -514,7 +514,7 @@ export default { this.memberInfo.birthday = this.$util.timeTurnTimeStamp(this.formData.birthday); this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -545,29 +545,29 @@ export default { var rule = [{ name: 'currentPassword', checkType: 'required', - errorMsg: this.$lang("pleaseInputOldPassword") + errorMsg: this.$lang("member.info.pleaseInputOldPassword") }, { name: 'newPassword', checkType: 'required', - errorMsg: this.$lang("pleaseInputNewPassword") + errorMsg: this.$lang("member.info.pleaseInputNewPassword") } ]; } else { var rule = [{ name: 'mobileVercode', checkType: 'required', - errorMsg: this.$lang("confirmCodeInput") + errorMsg: this.$lang("member.info.confirmCodeInput") }, { name: 'mobileDynacode', checkType: 'required', - errorMsg: this.$lang("animateCodeInput") + errorMsg: this.$lang("member.info.animateCodeInput") }, { name: 'newPassword', checkType: 'required', - errorMsg: this.$lang("pleaseInputNewPassword") + errorMsg: this.$lang("member.info.pleaseInputNewPassword") } ]; } @@ -578,31 +578,31 @@ export default { name: 'newPassword', checkType: 'lengthMin', checkRule: regConfig.pwd_len, - errorMsg: this.$lang('passwordMinLength', { num: regConfig.pwd_len }) + errorMsg: this.$lang('member.info.passwordMinLength', { num: regConfig.pwd_len }) }); } if (regConfig.pwd_complexity) { - let passwordErrorMsg = this.$lang('passwordComplexityPrefix'), + let passwordErrorMsg = this.$lang('member.info.passwordComplexityPrefix'), reg = ''; let firstItem = true; if (regConfig.pwd_complexity.indexOf('number') != -1) { reg += '(?=.*?[0-9])'; - passwordErrorMsg += (firstItem ? '' : this.$lang('passwordSeparator')) + this.$lang('passwordNumber'); + passwordErrorMsg += (firstItem ? '' : this.$lang('member.info.passwordSeparator')) + this.$lang('member.info.passwordNumber'); firstItem = false; } if (regConfig.pwd_complexity.indexOf('letter') != -1) { reg += '(?=.*?[a-z])'; - passwordErrorMsg += (firstItem ? '' : this.$lang('passwordSeparator')) + this.$lang('passwordLowercase'); + passwordErrorMsg += (firstItem ? '' : this.$lang('member.info.passwordSeparator')) + this.$lang('member.info.passwordLowercase'); firstItem = false; } if (regConfig.pwd_complexity.indexOf('upper_case') != -1) { reg += '(?=.*?[A-Z])'; - passwordErrorMsg += (firstItem ? '' : this.$lang('passwordSeparator')) + this.$lang('passwordUppercase'); + passwordErrorMsg += (firstItem ? '' : this.$lang('member.info.passwordSeparator')) + this.$lang('member.info.passwordUppercase'); firstItem = false; } if (regConfig.pwd_complexity.indexOf('symbol') != -1) { reg += '(?=.*?[#?!@$%^&*-])'; - passwordErrorMsg += (firstItem ? '' : this.$lang('passwordSeparator')) + this.$lang('passwordSymbol'); + passwordErrorMsg += (firstItem ? '' : this.$lang('member.info.passwordSeparator')) + this.$lang('member.info.passwordSymbol'); firstItem = false; } rule.push({ @@ -616,13 +616,13 @@ export default { if (checkRes) { if (this.formData.currentPassword == this.formData.newPassword) { this.$util.showToast({ - title: this.$lang('samePassword') + title: this.$lang('member.info.samePassword') }); return; } if (this.formData.newPassword != this.formData.confirmPassword) { this.$util.showToast({ - title: this.$lang('alikePassword') + title: this.$lang('member.info.alikePassword') }); return; } @@ -639,7 +639,7 @@ export default { this.memberInfo.password = 1; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang('updateSuccess') + title: this.$lang('member.info.updateSuccess') }); this.NavReturn(); uni.removeStorageSync('password_mobile_key'); @@ -664,11 +664,11 @@ export default { var rule = [{ name: 'mobile', checkType: 'required', - errorMsg: this.$lang('pleaseInputMobile') + errorMsg: this.$lang('member.info.pleaseInputMobile') }, { name: 'mobile', checkType: 'phoneno', - errorMsg: this.$lang('surePhoneNumber') + errorMsg: this.$lang('member.info.surePhoneNumber') }]; var checkRes = validate.check(this.formData, rule); if (!checkRes) { @@ -704,12 +704,12 @@ export default { var rule = [{ name: 'mobile', checkType: 'phoneno', - errorMsg: this.$lang("surePhoneNumber") + errorMsg: this.$lang("member.info.surePhoneNumber") }, { name: 'mobileVercode', checkType: 'required', - errorMsg: this.$lang("confirmCodeInput") + errorMsg: this.$lang("member.info.confirmCodeInput") }, ]; @@ -730,7 +730,7 @@ export default { if (this.seconds == 120 && this.timer == null) { this.timer = setInterval(() => { this.seconds--; - this.formData.mobileCodeText = this.$lang('codeSent', { seconds: this.seconds }); + this.formData.mobileCodeText = this.$lang('member.info.codeSent', { seconds: this.seconds }); }, 1000); } uni.setStorageSync('mobile_key', data.key); @@ -748,7 +748,7 @@ export default { }); } else { this.$util.showToast({ - title: validate.error ? validate.error : this.$lang('doNotRepeatedlyClick') + title: validate.error ? validate.error : this.$lang('member.info.doNotRepeatedlyClick') }); } }, @@ -757,17 +757,17 @@ export default { var mobileRule = [{ name: 'mobile', checkType: 'phoneno', - errorMsg: this.$lang("surePhoneNumber") + errorMsg: this.$lang("member.info.surePhoneNumber") }, { name: 'mobileVercode', checkType: 'required', - errorMsg: this.$lang("confirmCodeInput") + errorMsg: this.$lang("member.info.confirmCodeInput") }, { name: 'mobileDynacode', checkType: 'required', - errorMsg: this.$lang("animateCodeInput") + errorMsg: this.$lang("member.info.animateCodeInput") }, ]; var checkRes = validate.check(this.formData, mobileRule); @@ -775,7 +775,7 @@ export default { if (checkRes) { if (this.formData.mobile == this.memberInfo.mobile) { this.$util.showToast({ - title: this.$lang("alikePhone") + title: this.$lang("member.info.alikePhone") }); return; } @@ -793,7 +793,7 @@ export default { this.memberInfo.mobile = this.formData.mobile; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); if (this.back) { this.$util.redirectTo('/pages_tool/member/pay_password', { @@ -828,7 +828,7 @@ export default { if (this.formData.mobileVercode == '') { this.$util.showToast({ - title: this.$lang("confirmCodeInput") + title: this.$lang("member.info.confirmCodeInput") }); return; } @@ -847,7 +847,7 @@ export default { if (this.seconds == 120 && this.timer == null) { this.timer = setInterval(() => { this.seconds--; - this.formData.mobileCodeText = this.$lang('codeSent', { seconds: this.seconds }); + this.formData.mobileCodeText = this.$lang('member.info.codeSent', { seconds: this.seconds }); }, 1000); } uni.setStorageSync('password_mobile_key', data.key); @@ -865,7 +865,7 @@ export default { }); } else { this.$util.showToast({ - title: this.$lang('doNotRepeatedlyClick') + title: this.$lang('member.info.doNotRepeatedlyClick') }); } }, @@ -873,12 +873,12 @@ export default { var rule = [{ name: 'fullAddress', checkType: 'required', - errorMsg: this.$lang('pleaseSelectRegion') + errorMsg: this.$lang('member.info.pleaseSelectRegion') }, { name: 'address', checkType: 'required', - errorMsg: this.$lang('pleaseInputDetailAddress') + errorMsg: this.$lang('member.info.pleaseInputDetailAddress') } ]; if (!rule.length) return; @@ -902,7 +902,7 @@ export default { this.memberInfo.full_address = this.formData.fullAddress; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { @@ -953,7 +953,7 @@ export default { success: res => { if (res.code == 0) { this.$util.showToast({ - title: this.$lang("updateSuccess") + title: this.$lang("member.info.updateSuccess") }); this.NavReturn(); } else { diff --git a/pages_tool/member/public/js/invite_friends.js b/pages_tool/member/public/js/invite_friends.js index c1668d9..0e51d2d 100644 --- a/pages_tool/member/public/js/invite_friends.js +++ b/pages_tool/member/public/js/invite_friends.js @@ -98,12 +98,12 @@ export default { filePath: res.tempFilePath, success: () => { this.$util.showToast({ - title: this.$lang('saveSuccess') + title: this.$lang('member.invite_friends.saveSuccess') }); }, fail: () => { this.$util.showToast({ - title: this.$lang('saveFailed') + title: this.$lang('member.invite_friends.saveFailed') }); } }); diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js index 65aec36..9c69603 100644 --- a/pages_tool/member/public/js/signin.js +++ b/pages_tool/member/public/js/signin.js @@ -28,7 +28,7 @@ export default { setTimeout( () => { if (!this.addonIsExist.membersignin) { this.$util.showToast({ - title: this.$lang('signinNotEnabled'), + title: this.$lang('member.signin.signinNotEnabled', mask: true, duration: 2000 }); @@ -196,7 +196,7 @@ export default { sign() { if (this.signState == 0) { this.$util.showToast({ - title: this.$lang('signinClosed') + title: this.$lang('member.signin.signinClosed') }) } @@ -231,8 +231,8 @@ export default { let shareUrl = this.$config.h5Domain + '/pages_tool/member/signin'; this.$util.setPublicShare({ - title: this.$lang('title'), - desc: this.$lang('shareDesc'), + title: this.$lang('member.signin.title'), + desc: this.$lang('member.signin.shareDesc'), link: shareUrl, imgUrl: '' }, @@ -263,7 +263,7 @@ export default { onShareAppMessage() { var path = '/pages_tool/member/signin'; return { - title: this.$lang('shareTitle'), + title: this.$lang('member.signin.shareTitle'), imageUrl: '', path: path, success: res => {}, diff --git a/pages_tool/member/withdrawal.vue b/pages_tool/member/withdrawal.vue index bc448fc..6b9744a 100644 --- a/pages_tool/member/withdrawal.vue +++ b/pages_tool/member/withdrawal.vue @@ -21,7 +21,7 @@ - + diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue index e7ea9df..783cb7f 100644 --- a/pages_tool/order/activist.vue +++ b/pages_tool/order/activist.vue @@ -7,9 +7,9 @@ {{ item.order_no }} - {{ $lang('status.success') }} - {{ $lang('status.processing') }} - {{ $lang('status.failed') }} + {{ $lang('order.activist.status.success') }} + {{ $lang('order.activist.status.processing') }} + {{ $lang('order.activist.status.failed') }} @@ -26,11 +26,11 @@ - {{ $lang('totalItems', { num: item.num }) }} - {{ $lang('refundAmount', { currency: $lang('common.currencySymbol'), amount: item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money }) }} + {{ $lang('order.activist.totalItems', { num: item.num }) }} + {{ $lang('order.activist.refundAmount', { currency: $lang('common.currencySymbol'), amount: item.refund_status == 3 ? item.refund_real_money : item.refund_apply_money }) }} - {{ $lang('checkDetail') }} + {{ $lang('order.activist.checkDetail') }} - + @@ -112,7 +112,7 @@ export default { this.cancleRefund(data.order_goods_id, res => { if (res.code >= 0) { this.$util.showToast({ - title: this.$lang('toast.cancelSuccess') + title: this.$lang('order.activist.toast.cancelSuccess') }); this.$refs.mescroll.refresh(); } diff --git a/pages_tool/order/invoice.vue b/pages_tool/order/invoice.vue index d3fd910..80bbdcd 100644 --- a/pages_tool/order/invoice.vue +++ b/pages_tool/order/invoice.vue @@ -1,12 +1,12 @@