diff --git a/pages_goods/_components/goods-detail-view/detail.js b/pages_goods/_components/goods-detail-view/detail.js index bf79fe1..f8a2566 100644 --- a/pages_goods/_components/goods-detail-view/detail.js +++ b/pages_goods/_components/goods-detail-view/detail.js @@ -299,7 +299,7 @@ export default { //生成海报 getGoodsPoster() { uni.showLoading({ - 'title': this.$lang('detailView.posterGenerating') + 'title': this.$lang('goods.detail.detailView.posterGenerating') }) //活动海报信息 if (this.memberInfo && this.memberInfo.member_id) this.posterParams.source_member = this.memberInfo.member_id; @@ -365,12 +365,12 @@ export default { filePath: res.tempFilePath, success: () => { this.$util.showToast({ - title: this.$lang('detailView.saveSuccess') + title: this.$lang('goods.detail.detailView.saveSuccess') }); }, fail: (err) => { this.$util.showToast({ - title: this.$lang('detailView.saveFailed') + title: this.$lang('goods.detail.detailView.saveFailed') }); } }); @@ -378,7 +378,7 @@ export default { }, fail: (err) => { this.$util.showToast({ - title: this.$lang('detailView.saveFailed') + title: this.$lang('goods.detail.detailView.saveFailed') }); } }); @@ -484,7 +484,7 @@ export default { onTapDoc(pdf_url) { if (!pdf_url) return; uni.showLoading({ - title: this.$lang('detailView.loading') + title: this.$lang('goods.detail.detailView.loading') }); let url = this.$util.img(pdf_url); uni.downloadFile({ @@ -510,7 +510,7 @@ export default { complete: (res) => { if (res.statusCode === 404) { uni.showToast({ - title: this.$lang('detailView.fileNotExist'), + title: this.$lang('goods.detail.detailView.fileNotExist'), icon: 'none' }); } diff --git a/pages_goods/_components/goods-detail-view/goods-detail-view.vue b/pages_goods/_components/goods-detail-view/goods-detail-view.vue index 3a20e6d..6112de3 100644 --- a/pages_goods/_components/goods-detail-view/goods-detail-view.vue +++ b/pages_goods/_components/goods-detail-view/goods-detail-view.vue @@ -60,7 +60,7 @@ - {{ $lang('send') }} + {{ $lang('goods.detail.send') }} @@ -72,7 +72,7 @@ - {{ $lang('detailView.notConfigured') }} + {{ $lang('goods.detail.detailView.notConfigured') }} @@ -96,7 +96,7 @@ - {{ $lang('detailView.serviceLabel') }} + {{ $lang('goods.detail.detailView.serviceLabel') }} @@ -140,7 +140,7 @@ {{ goodsSkuDetail.merchinfo.merch_name }} - {{ $lang('detailView.officialCertifiedMerchant') }} + {{ $lang('goods.detail.detailView.officialCertifiedMerchant') }} @@ -153,7 +153,7 @@ - {{ $lang('detailView.deliveryTitle') }} + {{ $lang('goods.detail.detailView.deliveryTitle') }} @@ -177,7 +177,7 @@ - {{ $lang('detailView.merchantsServiceTitle') }} + {{ $lang('goods.detail.detailView.merchantsServiceTitle') }} @@ -210,7 +210,7 @@ - {{ $lang('detailView.storeListTitle') }} + {{ $lang('goods.detail.detailView.storeListTitle') }} @@ -226,10 +226,10 @@ {{ item.store_name }} - {{ $lang('detailView.distance', { distance: item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }) }} + {{ $lang('goods.detail.detailView.distance', { distance: item.distance > 1 ? item.distance + 'km' : item.distance * 1000 + 'm' }) }} - {{ $lang('detailView.businessHours', { time: item.open_date }) }} + {{ $lang('goods.detail.detailView.businessHours', { time: item.open_date }) }} {{ item.full_address + item.address }} @@ -254,7 +254,7 @@ {{ goodsSkuDetail.qr_data.community_describe }} - {{ $lang('detailView.addCommunity') }} + {{ $lang('goods.detail.detailView.addCommunity') }} @@ -284,12 +284,12 @@ - {{ $lang('detailView.evaluate') }} + {{ $lang('goods.detail.detailView.evaluate') }} ({{ evaluateCount }}) - {{ $lang('detailView.noEvaluate') }} + {{ $lang('goods.detail.detailView.noEvaluate') }} - {{ $lang('detailView.viewAll') }} + {{ $lang('goods.detail.detailView.viewAll') }} @@ -336,7 +336,7 @@ - {{ $lang('detailView.specAttrTitle') }} + {{ $lang('goods.detail.detailView.specAttrTitle') }} @@ -347,10 +347,10 @@ - {{ $lang('detailView.expand') }} + {{ $lang('goods.detail.detailView.expand') }} - {{ $lang('detailView.collapse') }} + {{ $lang('goods.detail.detailView.collapse') }} @@ -379,11 +379,11 @@ - {{ goodsSkuDetail.pdf_name || $lang('detailView.defaultDocName') }} - {{ $lang('detailView.viewDocDetail') }} + {{ goodsSkuDetail.pdf_name || $lang('goods.detail.detailView.defaultDocName') }} + {{ $lang('goods.detail.detailView.viewDocDetail') }} - {{ $lang('detailView.view') }} + {{ $lang('goods.detail.detailView.view') }} @@ -419,10 +419,10 @@ - {{ $lang('detailView.saveImage') }} + {{ $lang('goods.detail.detailView.saveImage') }} - {{ $lang('detailView.longPressToSave') }} + {{ $lang('goods.detail.detailView.longPressToSave') }} @@ -433,13 +433,13 @@ - + - + diff --git a/pages_order/public/js/refundMethod.js b/pages_order/public/js/refundMethod.js index 21d5c8b..38f856e 100644 --- a/pages_order/public/js/refundMethod.js +++ b/pages_order/public/js/refundMethod.js @@ -7,8 +7,8 @@ export default { */ cancleRefund(order_goods_id, callback) { uni.showModal({ - content: this.$lang('order.refund.cancelRefundContent'), - cancelText: this.$lang('order.refund.cancelRefundCancelText'), + content: this.$lang('order.refund.refund.cancelRefundContent'), + cancelText: this.$lang('order.refund.refund.cancelRefundCancelText'), cancelColor: '#898989', success: res => { if (res.confirm) { diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue index 4e79ea7..e6003fd 100644 --- a/pages_promotion/point/detail.vue +++ b/pages_promotion/point/detail.vue @@ -35,7 +35,7 @@ - {{ pointInfo.point }}{{ $lang('detail.pointsSuffix') }} + {{ pointInfo.point }}{{ $lang('point.detail.pointsSuffix') }} diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue index c6f5408..80cec5f 100644 --- a/pages_tool/member/apply_withdrawal.vue +++ b/pages_tool/member/apply_withdrawal.vue @@ -2,8 +2,8 @@ - {{ $lang('member.applyWithdrawal.withdrawAmount') }} + {{ $lang('member.apply_withdrawal.withdrawAmount') }} {{ $lang('common.currencySymbol') }} @@ -31,21 +31,21 @@ - {{ $lang('member.applyWithdrawal.withdrawableBalance') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }} - {{ $lang('member.applyWithdrawal.withdrawAll') }} + {{ $lang('member.apply_withdrawal.withdrawableBalance') }}{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }} + {{ $lang('member.apply_withdrawal.withdrawAll') }} - {{ $lang('member.applyWithdrawal.minWithdrawAndFeeTip', { min: $lang('common.currencySymbol') + (withdrawInfo.config.min | moneyFormat), rate: withdrawInfo.config.rate + '%' }) }} + {{ $lang('member.apply_withdrawal.minWithdrawAndFeeTip', { min: $lang('common.currencySymbol') + (withdrawInfo.config.min | moneyFormat), rate: withdrawInfo.config.rate + '%' }) }} - {{ $lang('member.applyWithdrawal.withdraw') }} + {{ $lang('member.apply_withdrawal.withdraw') }} - {{ $lang('member.applyWithdrawal.withdrawalRecords') }} + {{ $lang('member.apply_withdrawal.withdrawalRecords') }} @@ -105,7 +105,7 @@ this.withdrawInfo = res.data; if (this.withdrawInfo.config.is_use == 0) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.withdrawalNotEnabled') + title: this.$lang('member.apply_withdrawal.withdrawalNotEnabled') }); setTimeout(() => { this.$util.redirectTo(this.$util.MEMBER_PAGE_URL); @@ -135,19 +135,19 @@ verify() { if (this.withdrawMoney == '' || this.withdrawMoney == 0 || isNaN(parseFloat(this.withdrawMoney))) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.pleaseEnterWithdrawAmount') + title: this.$lang('member.apply_withdrawal.pleaseEnterWithdrawAmount') }); return false; } if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.withdrawAmountExceedsBalance') + title: this.$lang('member.apply_withdrawal.withdrawAmountExceedsBalance') }); return false; } if (parseFloat(this.withdrawMoney) < parseFloat(this.withdrawInfo.config.min)) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.withdrawAmountBelowMinimum') + title: this.$lang('member.apply_withdrawal.withdrawAmountBelowMinimum') }); return false; } @@ -156,7 +156,7 @@ withdraw() { if (!this.bankAccountInfo.withdraw_type) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.pleaseAddWithdrawMethodFirst') + title: this.$lang('member.apply_withdrawal.pleaseAddWithdrawMethodFirst') }); return; } @@ -187,7 +187,7 @@ success: res => { if (res.code >= 0) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.withdrawApplySuccess') + title: this.$lang('member.apply_withdrawal.withdrawApplySuccess') }); setTimeout(() => { this.$util.redirectTo( @@ -223,7 +223,7 @@ success: res => { if (res.code >= 0) { this.$util.showToast({ - title: this.$lang('member.applyWithdrawal.withdrawApplySuccess') + title: this.$lang('member.apply_withdrawal.withdrawApplySuccess') }); setTimeout(() => { this.$util.redirectTo('/pages_tool/member/withdrawal', {}, diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue index 90d95c0..edcc31d 100644 --- a/pages_tool/member/modify_face.vue +++ b/pages_tool/member/modify_face.vue @@ -11,16 +11,16 @@ - + - + - - + + @@ -92,7 +92,7 @@ export default { }, fail: () => { this.$util.showToast({ - title: this.$lang('member.modifyFace.uploadFailed') + title: this.$lang('member.modify_face.uploadFailed') }); } }); @@ -114,7 +114,7 @@ export default { this.memberInfo.headimg = this.imgurl; this.$store.commit('setMemberInfo', this.memberInfo); this.$util.showToast({ - title: this.$lang('member.modifyFace.modifySuccess') + title: this.$lang('member.modify_face.modifySuccess') }); setTimeout(() => { this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo'); diff --git a/pages_tool/member/withdrawal_detail.vue b/pages_tool/member/withdrawal_detail.vue index 2ca09b7..79120da 100644 --- a/pages_tool/member/withdrawal_detail.vue +++ b/pages_tool/member/withdrawal_detail.vue @@ -7,43 +7,43 @@ - {{ $lang('member.withdrawalDetail.currentStatus') }} + {{ $lang('member.withdrawal_detail.currentStatus') }} {{ detail.status_name }} - {{ $lang('member.withdrawalDetail.transactionNo') }} + {{ $lang('member.withdrawal_detail.transactionNo') }} {{ detail.withdraw_no }} - {{ $lang('member.withdrawalDetail.serviceFee') }} + {{ $lang('member.withdrawal_detail.serviceFee') }} ¥{{ detail.service_money }} - {{ $lang('member.withdrawalDetail.applyTime') }} + {{ $lang('member.withdrawal_detail.applyTime') }} {{ $util.timeStampTurnTime(detail.apply_time) }} - {{ $lang('member.withdrawalDetail.auditTime') }} + {{ $lang('member.withdrawal_detail.auditTime') }} {{ $util.timeStampTurnTime(detail.audit_time) }} - {{ $lang('member.withdrawalDetail.bankName') }} + {{ $lang('member.withdrawal_detail.bankName') }} {{ detail.bank_name }} - {{ $lang('member.withdrawalDetail.receivingAccount') }} + {{ $lang('member.withdrawal_detail.receivingAccount') }} {{ detail.account_number }} - {{ $lang('member.withdrawalDetail.refuseReason') }} + {{ $lang('member.withdrawal_detail.refuseReason') }} {{ detail.refuse_reason }} - {{ $lang('member.withdrawalDetail.transferTypeName') }} + {{ $lang('member.withdrawal_detail.transferTypeName') }} {{ detail.transfer_type_name }} - {{ $lang('member.withdrawalDetail.transferTime') }} + {{ $lang('member.withdrawal_detail.transferTime') }} {{ $util.timeStampTurnTime(detail.payment_time) }} diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue index 07e2f05..9b1b244 100644 --- a/pages_tool/order/refund_batch.vue +++ b/pages_tool/order/refund_batch.vue @@ -15,32 +15,32 @@ - {{ $lang('order.refundBatch.form.refundReason') }} + {{ $lang('order.refund_batch.form.refundReason') }} - {{ $lang('order.refundBatch.form.pleaseSelect') }} + {{ $lang('order.refund_batch.form.pleaseSelect') }} {{ refund_reason }} - {{ $lang('order.refundBatch.form.refundType') }} - {{ $lang('order.refundBatch.form.refundOnly') }} - {{ $lang('order.refundBatch.form.returnRefund') }} + {{ $lang('order.refund_batch.form.refundType') }} + {{ $lang('order.refund_batch.form.refundOnly') }} + {{ $lang('order.refund_batch.form.returnRefund') }} - {{ $lang('order.refundBatch.form.refundAmount') }} + {{ $lang('order.refund_batch.form.refundAmount') }} {{ $lang('common.currencySymbol') }}{{ refund_data.refund_money }} - {{ $lang('order.refundBatch.form.refundRemark') }} + {{ $lang('order.refund_batch.form.refundRemark') }}