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 @@
@@ -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') }}
+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price
}}
@@ -48,10 +48,10 @@
- {{ $lang('detail.stockLabel') }}{{ pointInfo.stock }}{{
+ {{ $lang('point.detail.stockLabel') }}{{ pointInfo.stock }}{{
pointInfo.stock >= 0 ?
pointInfo.unit : '' }}
- {{ $lang('detail.stockLabel') }}{{ $lang('detail.unlimitedStock') }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}
+ {{ $lang('point.detail.stockLabel') }}{{ $lang('point.detail.unlimitedStock') }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}
@@ -61,17 +61,17 @@
{{ pointInfo.name }}
- {{ $lang('detail.containsBalance', { balance: pointInfo.balance }) }}
- {{ $lang('detail.noThresholdCoupon') }}
- {{ $lang('detail.fullReduction', { atLeast: pointInfo.at_least, money: pointInfo.money }) }}
+ {{ $lang('point.detail.containsBalance', { balance: pointInfo.balance }) }}
+ {{ $lang('point.detail.noThresholdCoupon') }}
+ {{ $lang('point.detail.fullReduction', { atLeast: pointInfo.at_least, money: pointInfo.money }) }}
- {{ $lang('detail.fullAmount', { atLeast: pointInfo.at_least }) }}
- {{ pointInfo.discount }}{{ $lang('detail.discountSuffix') }}
+ {{ $lang('point.detail.fullAmount', { atLeast: pointInfo.at_least }) }}
+ {{ pointInfo.discount }}{{ $lang('point.detail.discountSuffix') }}
- {{ $lang('detail.maxDiscount', { limit: pointInfo.discount_limit }) }}
+ {{ $lang('point.detail.maxDiscount', { limit: pointInfo.discount_limit }) }}
- {{ pointInfo.validity_type == 1 ? $lang('detail.validFromReceive', { days: pointInfo.fixed_term }) :
- $lang('detail.validUntil', { time: $util.timeStampTurnTime(pointInfo.end_time) }) }}
+ {{ pointInfo.validity_type == 1 ? $lang('point.detail.validFromReceive', { days: pointInfo.fixed_term }) :
+ $lang('point.detail.validUntil', { time: $util.timeStampTurnTime(pointInfo.end_time) }) }}
@@ -84,7 +84,7 @@
-
+
@@ -92,7 +92,7 @@
v-show="isCommunity">
@@ -180,7 +180,7 @@
- {{ $lang('detail.exchangeDetail') }}
+ {{ $lang('point.detail.exchangeDetail') }}
@@ -188,7 +188,7 @@
- {{ $lang('detail.noExchangeDetail') }}
+ {{ $lang('point.detail.noExchangeDetail') }}
@@ -201,14 +201,14 @@
+ type="primary">{{ $lang('point.detail.loginToExchange') }}
+ disabled>{{ $lang('point.detail.insufficientStock') }}
+ disabled>{{ $lang('point.detail.insufficientPoints') }}
+ type="primary" hover-class="none">{{ $lang('point.detail.exchange') }}
@@ -289,7 +289,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
- title = this.$lang('detail.shareTitle', { point: this.pointInfo.point, title: title });
+ title = this.$lang('point.detail.shareTitle', { point: this.pointInfo.point, title: title });
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var path = route.path;
@@ -318,7 +318,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
- title = this.$lang('detail.shareTitle', { point: this.pointInfo.point, title: title });
+ title = this.$lang('point.detail.shareTitle', { point: this.pointInfo.point, title: title });
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var query = route.query;
@@ -420,7 +420,7 @@ export default {
if (this.pointInfo.goods_spec_format) this.pointInfo.goods_spec_format = JSON.parse(this.pointInfo.goods_spec_format);
}
- this.pointInfo.unit = this.pointInfo.unit || this.$lang('detail.unitPiece');
+ this.pointInfo.unit = this.pointInfo.unit || this.$lang('point.detail.unitPiece');
// 商品详情
if (this.pointInfo.content) this.pointInfo.content = htmlParser(this.pointInfo.content);
@@ -454,7 +454,7 @@ export default {
*/
refreshGoodsSkuDetail(pointInfo) {
Object.assign(this.pointInfo, pointInfo);
- this.pointInfo.unit = this.pointInfo.unit || this.$lang('detail.unitPiece');
+ this.pointInfo.unit = this.pointInfo.unit || this.$lang('point.detail.unitPiece');
},
//服务
openMerchantsServicePopup() {
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index 1163642..0ccd1df 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -5,7 +5,7 @@
:id="statusItem.id" :data-current="statusIndex" @click="ontabtap">
- {{ $lang('point.orderList.' + statusItem.nameKey) }}
+ {{ $lang('point.order_list.' + statusItem.nameKey) }}
@@ -16,10 +16,10 @@
@@ -46,7 +46,7 @@
{{ orderItem.point }}
- {{ $lang('point.orderList.points') }}
+ {{ $lang('point.order_list.points') }}
+
{{
@@ -69,20 +69,20 @@
- {{ $lang('point.orderList.viewDetails') }}
+ {{ $lang('point.order_list.viewDetails') }}
-
+
@@ -115,7 +115,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.pointexchange) {
this.$util.showToast({
- title: this.$lang('point.orderList.merchantNotEnabled'),
+ title: this.$lang('point.order_list.merchantNotEnabled'),
mask: true,
duration: 2000
});
@@ -181,8 +181,8 @@ export default {
},
orderClose(order_id, index) {
uni.showModal({
- title: this.$lang('point.orderList.tip'),
- content: this.$lang('point.orderList.confirmCloseExchange'),
+ title: this.$lang('point.order_list.tip'),
+ content: this.$lang('point.order_list.confirmCloseExchange'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -194,7 +194,7 @@ export default {
if (res.code >= 0) {
this.orderList[index].order_status = -1;
this.$util.showToast({
- title: this.$lang('point.orderList.closeSuccess')
+ title: this.$lang('point.order_list.closeSuccess')
});
this.$forceUpdate();
}
diff --git a/pages_tool/file-preview/file-preview.vue b/pages_tool/file-preview/file-preview.vue
index 4ceaa87..dfc07fa 100644
--- a/pages_tool/file-preview/file-preview.vue
+++ b/pages_tool/file-preview/file-preview.vue
@@ -12,24 +12,24 @@
- {{ $lang('filePreview.fileUrlNotExist') }}
+ {{ $lang('file-preview.file-preview.fileUrlNotExist') }}
- {{ $lang('filePreview.fileUrlNotExist') }}
+ {{ $lang('file-preview.file-preview.fileUrlNotExist') }}
- {{ $lang('filePreview.videoUrlNotExist') }}
+ {{ $lang('file-preview.file-preview.videoUrlNotExist') }}
- {{ $lang('filePreview.unsupportedFileType') }}
+ {{ $lang('file-preview.file-preview.unsupportedFileType') }}
diff --git a/pages_tool/goods/not_exist.vue b/pages_tool/goods/not_exist.vue
index a17ea8c..6d025b0 100644
--- a/pages_tool/goods/not_exist.vue
+++ b/pages_tool/goods/not_exist.vue
@@ -2,7 +2,7 @@
- {{ $lang('goods.notExist.message') }}
+ {{ $lang('goods.not_exist.notExist.message') }}
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.withdrawTo') }}
- {{ $lang('member.applyWithdrawal.wechatDefaultWallet') }}
+ {{ $lang('member.apply_withdrawal.withdrawTo') }}
+ {{ $lang('member.apply_withdrawal.wechatDefaultWallet') }}
{{ bankAccountInfo.bank_account }}
@@ -16,12 +16,12 @@
- {{ $lang('member.applyWithdrawal.pleaseAddWithdrawMethod') }}
+ {{ $lang('member.apply_withdrawal.pleaseAddWithdrawMethod') }}
- {{ $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') }}