diff --git a/components-diy/diy-article.vue b/components-diy/diy-article.vue
index 078bfa2..6ff8339 100644
--- a/components-diy/diy-article.vue
+++ b/components-diy/diy-article.vue
@@ -327,7 +327,7 @@ export default {
},
viewMore() {
// control 默认 true 与后端 design.js + diy_view.php 对齐(老数据没 viewMore 时也走显示)
- return Object.assign({ support: true, control: true, text: '查看更多', color: '#999999', iconSize: 24 },
+ return Object.assign({ support: true, control: true, text: this.$lang('article.viewMore'), color: '#999999', iconSize: 24 },
this.value.viewMore || {});
},
// 阅读区样式(文字色 + 图标大小 + 文字大小)
diff --git a/components-diy/diy-bargain.vue b/components-diy/diy-bargain.vue
index 3135710..e356b0a 100644
--- a/components-diy/diy-bargain.vue
+++ b/components-diy/diy-bargain.vue
@@ -75,7 +75,7 @@
color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
- {{ item.is_bargaining ? '继续砍价' : value.btnStyle.text }}
+ {{ item.is_bargaining ? $lang('bargain.continueBargain') : value.btnStyle.text }}
diff --git a/components-diy/diy-category-item.vue b/components-diy/diy-category-item.vue
index 5be555e..33b6a01 100644
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
@@ -517,13 +517,13 @@ export default {
if (_num > parseInt(data.stock)) {
this.$util.showToast({
- title: '商品库存不足'
+ title: this.$lang('goods.insufficientStock')
});
return;
}
if (data.is_limit && data.max_buy && _num > parseInt(data.max_buy)) {
this.$util.showToast({
- title: `该商品每人限购${data.max_buy}${data.unit || '件'}`
+ title: this.$lang('goods.maxBuyLimit', { max: data.max_buy, unit: data.unit || this.$lang('goods.piece') })
});
return;
}
diff --git a/components-diy/diy-category.vue b/components-diy/diy-category.vue
index 77e5d38..6a4ce00 100644
--- a/components-diy/diy-category.vue
+++ b/components-diy/diy-category.vue
@@ -409,7 +409,7 @@ export default {
success: res => {
if (res.code >= 0) {
let item = res.data;
- item.unit = item.unit || '件';
+ item.unit = item.unit || this.$lang('goods.piece');
if (item.sku_images) item.sku_images = item.sku_images.split(',');
else item.sku_images = [];
diff --git a/components-diy/diy-channel-list.vue b/components-diy/diy-channel-list.vue
index 348f177..8790371 100644
--- a/components-diy/diy-channel-list.vue
+++ b/components-diy/diy-channel-list.vue
@@ -265,7 +265,7 @@ export default {
// #ifndef MP-WEIXIN
if (item?.channelType === 'wechat') {
uni.showToast({
- title: '视频号仅支持在微信小程序环境中播放',
+ title: this.$lang('channel.wechatOnly'),
icon: 'none',
duration: 2000
});
diff --git a/components-diy/diy-coupon.vue b/components-diy/diy-coupon.vue
index 95d9a40..03df6df 100644
--- a/components-diy/diy-coupon.vue
+++ b/components-diy/diy-coupon.vue
@@ -68,9 +68,9 @@
- {{ value.btnStyle.text || '领取' }}
+ {{ value.btnStyle.text || $lang('coupon.receive') }}
- 去使用
+ {{ $lang('coupon.useNow') }}
@@ -105,7 +105,7 @@
- {{ value.btnStyle.text || '领取' }}
+ {{ value.btnStyle.text || $lang('coupon.receive') }}
{{ $lang('coupon.goUse') }}
@@ -139,7 +139,7 @@
- {{ value.btnStyle.text || '立即使用' }}
+ {{ value.btnStyle.text || $lang('coupon.useNow') }}
{{ $lang('coupon.goUse') }}
@@ -403,7 +403,7 @@ export default {
couponTap(item, index) {
if (item.count == item.lead_count) {
this.$util.showToast({
- title: '该优惠券已抢光'
+ title: this.$lang('coupon.couponTaken')
});
return;
}
@@ -426,7 +426,7 @@ export default {
var data = res.data;
let msg = res.message;
if (res.code == 0) {
- msg = '领取成功';
+ msg = this.$lang('coupon.receiveSuccess');
if (res.data.is_exist == 1) {
for (let i = 0; i < that.couponList.length; i++) {
if (that.couponList[i].coupon_type_id == item.coupon_type_id) {
diff --git a/components-diy/diy-fenxiao-goods-list.vue b/components-diy/diy-fenxiao-goods-list.vue
index 08ecc1b..dab3201 100644
--- a/components-diy/diy-fenxiao-goods-list.vue
+++ b/components-diy/diy-fenxiao-goods-list.vue
@@ -138,7 +138,7 @@ export default {
},
success: res => {
if (res.code >= 0) {
- this.$util.showToast({ title: '关注成功' });
+ this.$util.showToast({ title: this.$lang('fenxiao.followSuccess') });
this.list[index].is_collect = 1;
this.list[index].collect_id = res.data;
}
@@ -149,8 +149,8 @@ export default {
//取消关注
delFollowTip(e, index) {
uni.showModal({
- title: '提示',
- content: '确认取消关注该商品吗',
+ title: this.$lang('common.tip'),
+ content: this.$lang('fenxiao.confirmUnfollow'),
success: res => {
if (res.confirm) {
this.delFollow(e.collect_id, index);
@@ -167,7 +167,7 @@ export default {
success: res => {
let msg = '';
if (res.code == 0) {
- msg = '取消成功';
+ msg = this.$lang('fenxiao.unfollowSuccess');
} else {
msg = res.message;
}
diff --git a/components-diy/diy-form.vue b/components-diy/diy-form.vue
index 8a30b8a..75cb472 100644
--- a/components-diy/diy-form.vue
+++ b/components-diy/diy-form.vue
@@ -139,7 +139,7 @@ export default {
// 提交按钮文字：与后端 design.html 默认对齐，开放给 formConfig 覆盖
// 走 mergedFormConfig（兼容 camelCase / snake_case），让 formConfig.submitText 能正确覆盖
submitText() {
- return this.mergedFormConfig.submitText || '提交';
+ return this.mergedFormConfig.submitText || this.$lang('form.submit');
},
// 后端把表单样式配置统一存放在 data.formConfig 子对象中（与后端 design.js getDefaultFormData().formConfig 字段名一致）。
// 这里做一次归一化：优先取 formConfig；如果历史数据是扁平结构（直接挂在 value 上），也做兼容。
@@ -298,12 +298,12 @@ export default {
form_id: this.value.form_id || 0,
form_data: JSON.stringify(submitData),
component_id: this.value.id || '',
- form_name: this.value.form_name || '默认表单'
+ form_name: this.value.form_name || this.$lang('form.defaultForm')
},
success: function(res) {
if (res.code === 0) {
uni.showToast({
- title: '提交成功',
+ title: self.$lang('form.submitSuccess'),
icon: 'success'
});
// 重置表单
@@ -312,7 +312,7 @@ export default {
}
} else {
uni.showToast({
- title: res.message || '提交失败',
+ title: res.message || self.$lang('form.submitFailed'),
icon: 'none'
});
}
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index 61ea2d1..0e24de6 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -60,7 +60,7 @@
- 已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}
+ 已售{{ item.sale_num }}{{ item.unit ? item.unit : $lang('goods.piece') }}
@@ -168,7 +168,7 @@
- 已售{{ item.sale_num }}{{ item.unit ? item.unit : '件' }}
+ 已售{{ item.sale_num }}{{ item.unit ? item.unit : $lang('goods.piece') }}
@@ -238,7 +238,7 @@
- 已售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : '件' }}
+ 已售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : $lang('goods.piece') }}
diff --git a/components-diy/diy-goods-recommend.vue b/components-diy/diy-goods-recommend.vue
index 54929c4..57c863e 100644
--- a/components-diy/diy-goods-recommend.vue
+++ b/components-diy/diy-goods-recommend.vue
@@ -53,7 +53,7 @@
￥{{ showMarketPrice(dataItem) }}
- 售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : '件' }}
+ 售{{ dataItem.sale_num }}{{ dataItem.unit ? dataItem.unit : $lang('goods.piece') }}
diff --git a/components-diy/diy-index-page.vue b/components-diy/diy-index-page.vue
index 46f032d..6390e74 100644
--- a/components-diy/diy-index-page.vue
+++ b/components-diy/diy-index-page.vue
@@ -147,13 +147,13 @@
{{ showMarketPrice(item) }}
已售{{
- item.sale_num }}{{ item.unit ? item.unit : '件' }}
+ item.sale_num }}{{ item.unit ? item.unit : $lang('goods.piece') }}
-
+
@@ -193,7 +193,7 @@ export default {
pageIndex: 0, //当前选中分类id
cateList: [{
//header分类
- category_name: '首页'
+ category_name: this.$lang('common.home')
}],
twoCategorylist: [], //二级分类
twoCategorylistId: 0, //二级分类所在的swiper
@@ -323,7 +323,7 @@ export default {
let obj = {
list: []
};
- obj.category_name = this.value.title ? this.value.title : '首页';
+ obj.category_name = this.value.title ? this.value.title : this.$lang('common.home');
arr.push(obj);
this.cateList = arr.concat(res.data);
Object.keys(this.cateList).forEach((key, index) => {
diff --git a/components-diy/diy-map.vue b/components-diy/diy-map.vue
index b84128b..5f961e6 100644
--- a/components-diy/diy-map.vue
+++ b/components-diy/diy-map.vue
@@ -71,7 +71,7 @@ export default {
uni.openLocation({
latitude: parseFloat(item.lat),
longitude: parseFloat(item.lng),
- name: "一键导航",
+ name: this.$lang('map.oneClickNav'),
})
},
async handlerClick(item) {
diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue
index 9c94255..a5d6d7d 100644
--- a/components-diy/diy-member-info.vue
+++ b/components-diy/diy-member-info.vue
@@ -493,8 +493,8 @@ export default {
showMemberQrcode() {
if (!this.memberInfo.mobile && !this.memberInfo.member_code) {
uni.showModal({
- title: '提示',
- content: '使用会员码需先绑定手机号，是否绑定手机号？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('member.bindMobileFirst'),
success: res => {
if (res.confirm) {
// #ifdef MP-WEIXIN
@@ -643,7 +643,7 @@ export default {
saveCompleteInfo() {
if (this.nickName.length == 0) {
this.$util.showToast({
- title: '请输入昵称'
+ title: this.$lang('member.inputNickname')
});
return;
}
@@ -682,7 +682,7 @@ export default {
},
fail: () => {
this.$util.showToast({
- title: '上传失败'
+ title: this.$lang('member.uploadFailed')
});
}
})
@@ -713,7 +713,7 @@ export default {
},
fail: () => {
this.$util.showToast({
- title: '头像拉取失败'
+ title: this.$lang('member.avatarFetchFailed')
});
}
})
diff --git a/components-diy/diy-notes.vue b/components-diy/diy-notes.vue
index d686b60..474c2b9 100644
--- a/components-diy/diy-notes.vue
+++ b/components-diy/diy-notes.vue
@@ -17,8 +17,8 @@
:key="labelIndex">{{ labelItem }}
- #{{ item.note_type == 'goods_item' ? '单品介绍' :
- '掌柜说' }}#
+ #{{ item.note_type == 'goods_item' ? $lang('note.goodsIntro') :
+ $lang('note.shopkeeperNote') }}#
{{ item.note_abstract }}
diff --git a/components-diy/diy-seckill.vue b/components-diy/diy-seckill.vue
index b6632bc..85fc371 100644
--- a/components-diy/diy-seckill.vue
+++ b/components-diy/diy-seckill.vue
@@ -97,7 +97,7 @@
color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
- {{ isFuture ? '即将开始' : value.btnStyle.text }}
+ {{ isFuture ? $lang('seckill.startingSoon') : value.btnStyle.text }}
@@ -140,7 +140,7 @@
color: value.btnStyle.theme == 'diy' ? value.btnStyle.textColor : '',
borderRadius: value.btnStyle.aroundRadius * 2 + 'rpx'
}">
- {{ isFuture ? '即将开始' : value.btnStyle.text }}
+ {{ isFuture ? $lang('seckill.startingSoon') : value.btnStyle.text }}
@@ -502,7 +502,7 @@ export default {
toDetail(id) {
if (this.isFuture) {
this.$util.showToast({
- title: '秒杀活动即将开启，敬请期待!'
+ title: this.$lang('seckill.activityComingSoon')
});
return false;
}
diff --git a/pages_order/_components/common-payment/common-payment.vue b/pages_order/_components/common-payment/common-payment.vue
index a129f27..72c6c7f 100644
--- a/pages_order/_components/common-payment/common-payment.vue
+++ b/pages_order/_components/common-payment/common-payment.vue
@@ -300,8 +300,8 @@
发票
- {{ orderCreateData.invoice_type == 1 ? '纸质' : '电子' }}发票({{ orderCreateData.invoice_content }})
- 无需发票
+ {{ orderCreateData.invoice_type == 1 ? $lang('payment.paperInvoice') : $lang('payment.eInvoice') }}发票({{ orderCreateData.invoice_content }})
+ {{ $lang('payment.noInvoice') }}
diff --git a/pages_order/_components/common-payment/payment.js b/pages_order/_components/common-payment/payment.js
index a6501ab..b7b02dd 100644
--- a/pages_order/_components/common-payment/payment.js
+++ b/pages_order/_components/common-payment/payment.js
@@ -131,32 +131,32 @@ export default {
charge_rule_arr.push({
'key': key,
'value': charge_rule[key],
- 'title': '周卡',
- unit: '周'
+ 'title': this.$lang('payment.weekCard'),
+ unit: this.$lang('payment.week')
});
break;
case 'month':
charge_rule_arr.push({
'key': key,
'value': charge_rule[key],
- 'title': '月卡',
- unit: '月'
+ 'title': this.$lang('payment.monthCard'),
+ unit: this.$lang('payment.month')
});
break;
case 'quarter':
charge_rule_arr.push({
'key': key,
'value': charge_rule[key],
- 'title': '季卡',
- unit: '季'
+ 'title': this.$lang('payment.quarterCard'),
+ unit: this.$lang('payment.quarter')
});
break;
case 'year':
charge_rule_arr.push({
'key': key,
'value': charge_rule[key],
- 'title': '年卡',
- unit: '年'
+ 'title': this.$lang('payment.yearCard'),
+ unit: this.$lang('payment.year')
});
break;
}
@@ -484,20 +484,20 @@ export default {
if (this.paymentData.is_virtual == 1) {
if (!this.orderCreateData.member_address.mobile) {
this.$util.showToast({
- title: '请输入预留手机'
+ title: this.$lang('payment.inputMobile')
});
return false;
}
if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
this.$util.showToast({
- title: '请输入正确的手机号'
+ title: this.$lang('payment.inputCorrectMobile')
});
return false;
}
} else {
if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
this.$util.showToast({
- title: '商家未设置配送方式'
+ title: this.$lang('payment.noDeliveryMethod')
});
return false;
}
@@ -506,7 +506,7 @@ export default {
(this.orderCreateData.delivery.delivery_type == 'local' && !this.localMemberAddress)
) {
this.$util.showToast({
- title: '请先选择您的收货地址'
+ title: this.$lang('payment.selectAddressFirst')
});
return false;
}
@@ -514,25 +514,25 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'store') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
- title: '没有可提货的门店,请选择其他配送方式'
+ title: this.$lang('payment.noPickupStore')
});
return false;
}
if (!this.orderCreateData.member_address.mobile) {
this.$util.showToast({
- title: '请输入预留手机'
+ title: this.$lang('payment.inputMobile')
});
return false;
}
if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
this.$util.showToast({
- title: '请输入正确的手机号'
+ title: this.$lang('payment.inputCorrectMobile')
});
return false;
}
if (!this.deliveryTime) {
this.$util.showToast({
- title: '请选择提货时间'
+ title: this.$lang('payment.selectPickupTime')
});
return false;
}
@@ -541,13 +541,13 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'local') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
- title: '没有可配送的门店,请选择其他配送方式'
+ title: this.$lang('payment.noDeliveryStore')
});
return false;
}
if (this.calculateGoodsData.config.local.is_use && this.calculateGoodsData.delivery.local.info.time_is_open == 1 && !this.deliveryTime) {
this.$util.showToast({
- title: '请选择送达时间'
+ title: this.$lang('payment.selectDeliveryTime')
});
return false;
}
@@ -837,25 +837,25 @@ export default {
invoiceVerify() {
if (!this.orderCreateData.invoice_title) {
this.$util.showToast({
- title: '请填写发票抬头'
+ title: this.$lang('payment.inputInvoiceTitle')
});
return false;
}
if (!this.orderCreateData.taxpayer_number && this.orderCreateData.invoice_title_type == 2) {
this.$util.showToast({
- title: '请填写纳税人识别号'
+ title: this.$lang('payment.inputTaxpayerNumber')
});
return false;
}
if (this.orderCreateData.invoice_type == 1 && !this.orderCreateData.invoice_full_address && this.paymentData.is_virtual == 1) {
this.$util.showToast({
- title: '请填写发票邮寄地址'
+ title: this.$lang('payment.inputInvoiceAddress')
});
return false;
}
if (this.orderCreateData.invoice_type == 2 && !this.orderCreateData.invoice_email) {
this.$util.showToast({
- title: '请填写邮箱'
+ title: this.$lang('payment.inputEmail')
});
return false;
}
@@ -863,14 +863,14 @@ export default {
var reg = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
if (!reg.test(this.orderCreateData.invoice_email)) {
this.$util.showToast({
- title: '请填写正确的邮箱'
+ title: this.$lang('payment.inputCorrectEmail')
});
return false;
}
}
if (!this.orderCreateData.invoice_content) {
this.$util.showToast({
- title: '请选择发票内容'
+ title: this.$lang('payment.selectInvoiceContent')
});
return false;
}
diff --git a/pages_order/detail.vue b/pages_order/detail.vue
index 34766b0..483938b 100644
--- a/pages_order/detail.vue
+++ b/pages_order/detail.vue
@@ -730,7 +730,7 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
- title: '未获取到订单信息！'
+ title: this.$lang('order.noOrderInfo')
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
diff --git a/pages_order/detail_point.vue b/pages_order/detail_point.vue
index 886314c..6004c17 100644
--- a/pages_order/detail_point.vue
+++ b/pages_order/detail_point.vue
@@ -11,8 +11,8 @@
:src="$util.img('public/uniapp/order/order-icon-close.png')" />
- {{ orderData.order_status == 0 ? '待支付' : orderData.order_status == 1 ? '已完成' :
- orderData.order_status == -1 ? '已关闭' : '' }}
+ {{ orderData.order_status == 0 ? $lang('order.waitPay') : orderData.order_status == 1 ? $lang('order.completed') :
+ orderData.order_status == -1 ? $lang('order.closed') : '' }}
@@ -200,7 +200,7 @@ export default {
JSON.parse(this.orderData.delivery_store_info);
} else {
this.$util.showToast({
- title: '未获取到订单信息！'
+ title: this.$lang('order.noOrderInfo')
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list');
@@ -221,8 +221,8 @@ export default {
},
orderClose() {
uni.showModal({
- title: '提示',
- content: '确定关闭此次兑换？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('point.confirmClose'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -233,7 +233,7 @@ export default {
success: res => {
if (res.code >= 0) {
this.$util.showToast({
- title: '关闭成功'
+ title: this.$lang('point.closeSuccess')
});
this.getOrderData();
}
diff --git a/pages_order/public/js/orderMethod.js b/pages_order/public/js/orderMethod.js
index 8700e8c..6241992 100644
--- a/pages_order/public/js/orderMethod.js
+++ b/pages_order/public/js/orderMethod.js
@@ -9,8 +9,8 @@ export default {
this.pay();
} else {
uni.showModal({
- title: '提示',
- content: '商家已将支付金额调整为' + orderData.pay_money + '元，是否继续支付？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('order.payAmountAdjusted', { amount: orderData.pay_money }),
success: res => {
if (res.confirm) {
this.pay();
@@ -43,8 +43,8 @@ export default {
*/
orderClose(order_id, callback) {
uni.showModal({
- title: '提示',
- content: '您确定要关闭该订单吗？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('order.confirmCloseOrder'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -57,8 +57,7 @@ export default {
typeof callback == 'function' && callback();
} else {
this.$util.showToast({
- title: '当前订单可能存在拼团，维权等操作，' + res.message +
- '不可以关闭哦!',
+ title: this.$lang('order.cannotCloseOrder', { message: res.message }),
duration: 2000
})
}
@@ -77,8 +76,8 @@ export default {
// 如果不在微信小程序中
// #ifndef MP-WEIXIN
uni.showModal({
- title: '提示',
- content: '您确定已经收到货物了吗？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('order.confirmReceived'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -172,8 +171,8 @@ export default {
// 如果不在微信小程序中
// #ifndef MP-WEIXIN
uni.showModal({
- title: '提示',
- content: '您确定要进行收货吗？',
+ title: this.$lang('common.tip'),
+ content: this.$lang('order.confirmTakeDelivery'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
diff --git a/pages_order/public/js/refundMethod.js b/pages_order/public/js/refundMethod.js
index 2feb464..62b0e2b 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: '撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。',
- cancelText: '暂不撤销',
+ content: this.$lang('order.cancelRefundConfirm'),
+ cancelText: this.$lang('order.notCancelYet'),
cancelColor: '#898989',
success: res => {
if (res.confirm) {
diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue
index 8fa5d21..9c1065c 100644
--- a/pages_promotion/fenxiao/ranking_list.vue
+++ b/pages_promotion/fenxiao/ranking_list.vue
@@ -93,7 +93,7 @@
-
+
diff --git a/pages_promotion/fenxiao/relation.vue b/pages_promotion/fenxiao/relation.vue
index b2d2272..fc3121f 100644
--- a/pages_promotion/fenxiao/relation.vue
+++ b/pages_promotion/fenxiao/relation.vue
@@ -61,7 +61,7 @@
-
diff --git a/pages_promotion/fenxiao/team.vue b/pages_promotion/fenxiao/team.vue
index e7999c9..18d6bb4 100644
--- a/pages_promotion/fenxiao/team.vue
+++ b/pages_promotion/fenxiao/team.vue
@@ -72,7 +72,7 @@
-
+
@@ -89,11 +89,11 @@ export default {
return {
levelList: [
{
- name: '一级',
+ name: this.$lang('fenxiao.firstLevel'),
level: 1
},
{
- name: '二级',
+ name: this.$lang('fenxiao.secondLevel'),
level: 2
}
],
@@ -108,7 +108,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
- title: '商家未开启分销',
+ title: this.$lang('fenxiao.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue
index 9301d95..aab347a 100644
--- a/pages_promotion/fenxiao/withdraw_apply.vue
+++ b/pages_promotion/fenxiao/withdraw_apply.vue
@@ -175,7 +175,7 @@
verify() {
if (this.withdrawMoney == '' || this.withdrawMoney < 0 || isNaN(parseFloat(this.withdrawMoney))) {
this.$util.showToast({
- title: '请输入提现金额'
+ title: this.$lang('fenxiao.inputWithdrawAmount')
});
return false;
}
@@ -186,14 +186,14 @@
}
if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) > parseFloat(money))) {
this.$util.showToast({
- title: '提现金额超出可提现金额'
+ title: this.$lang('fenxiao.withdrawAmountExceed')
});
return false;
}
if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) < parseFloat(this
.withdrawConfigInfo.withdraw))) {
this.$util.showToast({
- title: '提现金额小于最低提现金额'
+ title: this.$lang('fenxiao.withdrawAmountBelowMin')
});
return false;
}
@@ -202,7 +202,7 @@
withdraw() {
if (!this.bankAccountInfo.withdraw_type && !this.isBalance) {
this.$util.showToast({
- title: '请先添加提现方式'
+ title: this.$lang('fenxiao.pleaseAddWithdrawMethod')
});
return;
}
@@ -235,7 +235,7 @@
success: res => {
if (res.code >= 0) {
this.$util.showToast({
- title: '提现申请成功'
+ title: this.$lang('fenxiao.withdrawApplySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},
@@ -270,7 +270,7 @@
success: res => {
if (res.code >= 0) {
this.$util.showToast({
- title: '提现申请成功'
+ title: this.$lang('fenxiao.withdrawApplySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_list', {},
diff --git a/pages_promotion/fenxiao/withdraw_list.vue b/pages_promotion/fenxiao/withdraw_list.vue
index 0e37783..f11b4f0 100644
--- a/pages_promotion/fenxiao/withdraw_list.vue
+++ b/pages_promotion/fenxiao/withdraw_list.vue
@@ -8,9 +8,9 @@
- {{ item.transfer_type == 'balance' && '余额' ||
- item.transfer_type == 'alipay' && '支付宝' || item.transfer_type == 'bank' && '银行卡' ||
- item.transfer_type =='wechatpay'&&'微信' }}
+ {{ item.transfer_type == 'balance' ? $lang('fenxiao.balance') :
+ item.transfer_type == 'alipay' ? $lang('fenxiao.alipay') : item.transfer_type == 'bank' ? $lang('fenxiao.bankCard') :
+ item.transfer_type =='wechatpay' ? $lang('fenxiao.wechat') : '' }}
{{ $util.timeStampTurnTime(item.create_time) }}
@@ -25,7 +25,7 @@
-
+
@@ -42,19 +42,19 @@ export default {
withdrawState: {
'3': {
color: 'color: rgb(255, 69, 68)',
- text: '已转账'
+ text: this.$lang('fenxiao.transferred')
},
'1': {
color: 'color: rgb(255, 160, 68)',
- text: '待审核'
+ text: this.$lang('fenxiao.pendingAudit')
},
'2': {
color: 'color: rgb(17, 189, 100)',
- text: '已审核'
+ text: this.$lang('fenxiao.audited')
},
'-1': {
color: 'color: rgb(255, 69, 68)',
- text: '已拒绝'
+ text: this.$lang('fenxiao.rejected')
}
},
withdrawList: [],
@@ -65,7 +65,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.fenxiao) {
this.$util.showToast({
- title: '商家未开启分销',
+ title: this.$lang('fenxiao.merchantNotOpenFenxiao'),
mask: true,
duration: 2000
});
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index 444c30b..f3f7831 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -258,7 +258,7 @@
-
+
diff --git a/pages_promotion/merch/public/edit.js b/pages_promotion/merch/public/edit.js
index 68198e0..e2fd66b 100644
--- a/pages_promotion/merch/public/edit.js
+++ b/pages_promotion/merch/public/edit.js
@@ -123,14 +123,14 @@ export default {
if (this.goodsData.id) {
this.isAWait = true;
uni.setNavigationBarTitle({
- title: '编辑商品'
+ title: this.$lang('merch.editGoods')
});
await this.editGetGoodsInfo();
} else {
this.isAWait = false;
uni.setNavigationBarTitle({
- title: '添加商品'
+ title: this.$lang('merch.addGoods')
});
}
@@ -167,7 +167,7 @@ export default {
if(res.result.detail){
this.goodsData = res.result.detail
this.$util.showToast({
- title: '商品不存在',
+ title: this.$lang('merch.goodsNotExist'),
});
setTimeout(() => {
this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
@@ -265,7 +265,7 @@ export default {
this.$forceUpdate();
} else {
this.$util.showToast({
- title: '商品不存在',
+ title: this.$lang('merch.goodsNotExist'),
});
setTimeout(() => {
this.$util.redirectTo('/pages_goods/list', {}, 'redirectTo');
@@ -493,7 +493,7 @@ export default {
addShopCategory() {
if (this.shopCategoryNumber == 10) {
this.$util.showToast({
- title: '商品可以属于多个分类，最多10个'
+ title: this.$lang('merch.maxCategoryLimit')
});
return;
}
@@ -568,21 +568,21 @@ export default {
if (this.goodsData.goodsname.length == 0) {
this.$util.showToast({
- title: '请输入商品名称'
+ title: this.$lang('merch.inputGoodsName')
});
return false;
}
if (this.goodsData.subtitle.length > 100) {
this.$util.showToast({
- title: '商品简介不能超过100个字符'
+ title: this.$lang('merch.subtitleMaxLength')
});
return false;
}
if (this.goodsData.goods_image.length == 0) {
this.$util.showToast({
- title: '请上传商品图片'
+ title: this.$lang('merch.uploadGoodsImage')
});
return false;
}
@@ -632,7 +632,7 @@ export default {
if (this.goodsData.price == 0) {
this.$util.showToast({
- title: '请输入销售价'
+ title: this.$lang('merch.inputPrice')
});
return false;
}
@@ -655,26 +655,26 @@ export default {
// 总库存
if (this.goodsData.total == 0) {
this.$util.showToast({
- title: '请输入库存'
+ title: this.$lang('merch.inputStock')
});
return false;
}
if (isNaN(this.goodsData.total) || !this.$util.data().regExp.number.test(this.goodsData.total)) {
this.$util.showToast({
- title: '[库存]格式输入错误'
+ title: this.$lang('merch.stockFormatError')
});
return false;
}
if (isNaN(this.goodsData.goods_start_count) || !this.$util.data().regExp.number.test(this.goodsData.goods_start_count)) {
this.$util.showToast({
- title: '[起售]格式输入错误'
+ title: this.$lang('merch.startCountFormatError')
});
return false;
}
if (this.goodsData.goods_start_count < 0) {
this.$util.showToast({
- title: '起售数量不能小于0'
+ title: this.$lang('merch.startCountNotNegative')
});
return false;
}
diff --git a/pages_promotion/merch/public/js/list.js b/pages_promotion/merch/public/js/list.js
index 0d2c625..7367153 100644
--- a/pages_promotion/merch/public/js/list.js
+++ b/pages_promotion/merch/public/js/list.js
@@ -76,8 +76,8 @@ export default {
this.getMerch()
}else{
uni.showModal({
- title:'提示',
- content:'商家不存在',
+ title: this.$lang('common.tip'),
+ content: this.$lang('merch.merchantNotExist'),
showCancel:false,
success(e){
uni.navigateBack({})
@@ -120,7 +120,7 @@ export default {
* 转发分享
*/
onShareAppMessage(res) {
- var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+ var title = this.$lang('merch.searchResultCount', { 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 {
@@ -134,7 +134,7 @@ export default {
},
// 分享到微信朋友圈
onShareTimeline() {
- var title = '搜索到' + this.count + '件“' + this.keyword + this.category_title + this.coupon_name + '”相关的优质商品';
+ var title = this.$lang('merch.searchResultCount', { 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 {
@@ -144,18 +144,18 @@ export default {
};
},
methods: {
- getMerch(){
- this.$api.sendRequest({
- url: '/merch/api/merch/merchinfo',
- data: {
- merch_id: this.merch_id
- },
- success: res => {
- if (res.code >= 0 && res.data) {
- this.merch = res.data;
- }
- }
- });
+ getMerch(){
+ this.$api.sendRequest({
+ url: '/merch/api/merch/merchinfo',
+ data: {
+ merch_id: this.merch_id
+ },
+ success: res => {
+ if (res.code >= 0 && res.data) {
+ this.merch = res.data;
+ }
+ }
+ });
},
/**
* 获取优惠券数据
@@ -336,26 +336,26 @@ export default {
// }
if (!Number(this.maxPrice) && this.maxPrice) {
this.$util.showToast({
- title: '请输入最高价'
+ title: this.$lang('merch.inputMaxPrice')
});
return;
}
if (Number(this.minPrice) < 0 || Number(this.maxPrice) < 0) {
this.$util.showToast({
- title: '筛选价格不能小于0'
+ title: this.$lang('merch.priceNotNegative')
});
return;
}
if (this.minPrice != '' && Number(this.minPrice) > Number(this.maxPrice) && this.maxPrice) {
this.$util.showToast({
- title: '最低价不能大于最高价'
+ title: this.$lang('merch.minNotGreaterMax')
});
return;
}
if (this.maxPrice != '' && Number(this.maxPrice) < Number(this.minPrice)) {
this.$util.showToast({
- title: '最高价不能小于最低价'
+ title: this.$lang('merch.maxNotLessMin')
});
return;
}
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index f3f0f86..4865ea4 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -293,7 +293,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
- title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
+ title = this.$lang('point.exchangeWithPoints', { points: this.pointInfo.point }) + title;
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var path = route.path;
@@ -322,7 +322,7 @@ export default {
imageUrl = this.pointInfo.image;
break;
}
- title = '仅需' + this.pointInfo.point + '积分即可兑换' + title;
+ title = this.$lang('point.exchangeWithPoints', { points: this.pointInfo.point }) + title;
imageUrl = this.$util.img(imageUrl);
var route = this.$util.getCurrentShareRoute(this.memberInfo ? this.memberInfo.member_id : 0);
var query = route.query;
diff --git a/pages_promotion/point/goods_list.vue b/pages_promotion/point/goods_list.vue
index 02429c6..a9092d2 100644
--- a/pages_promotion/point/goods_list.vue
+++ b/pages_promotion/point/goods_list.vue
@@ -285,26 +285,26 @@ export default {
// }
if (!Number(this.maxPoint) && this.maxPoint) {
this.$util.showToast({
- title: this.isEnEnv ? 'Please enter the maximum price' : '请输入最高价'
+ title: this.isEnEnv ? 'Please enter the maximum price' : this.$lang('point.inputMaxPrice')
});
return;
}
if (Number(this.minPoint) < 0 || Number(this.maxPoint) < 0) {
this.$util.showToast({
- title: this.isEnEnv ? 'Filter price cannot be less than 0' : '筛选价格不能小于0'
+ title: this.isEnEnv ? 'Filter price cannot be less than 0' : this.$lang('point.priceNotNegative')
});
return;
}
if (this.minPoint != '' && Number(this.minPoint) > Number(this.maxPoint) && this.maxPoint) {
this.$util.showToast({
- title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : '最低价不能大于最高价'
+ title: this.isEnEnv ? 'Minimum price cannot be greater than maximum price' : this.$lang('point.minNotGreaterMax')
});
return;
}
if (this.maxPoint != '' && Number(this.maxPoint) < Number(this.minPoint)) {
this.$util.showToast({
- title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : '最高价不能小于最低价'
+ title: this.isEnEnv ? 'Maximum price cannot be less than minimum price' : this.$lang('point.maxNotLessMin')
});
return;
}
diff --git a/pages_tool/article/list.vue b/pages_tool/article/list.vue
index 253d619..f12d19d 100644
--- a/pages_tool/article/list.vue
+++ b/pages_tool/article/list.vue
@@ -21,7 +21,7 @@
-
+
@@ -88,7 +88,7 @@ export default {
setPublicShare() {
let shareUrl = this.$config.h5Domain + '/pages_tool/article/list';
this.$util.setPublicShare({
- title: '文章列表',
+ title: this.$lang('article.articleList'),
desc: '',
link: shareUrl,
imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
@@ -96,7 +96,7 @@ export default {
}
},
onShareAppMessage(res) {
- var title = '文章列表';
+ var title = this.$lang('article.articleList');
var path = '/pages_tool/article/list';
return {
title: title,
@@ -107,7 +107,7 @@ export default {
},
//分享到朋友圈
onShareTimeline() {
- var title = '文章列表';
+ var title = this.$lang('article.articleList');
var query = '/pages_tool/article/list';
return {
title: title,
diff --git a/pages_tool/cases/index.vue b/pages_tool/cases/index.vue
index a1e5601..e7405db 100644
--- a/pages_tool/cases/index.vue
+++ b/pages_tool/cases/index.vue
@@ -286,7 +286,7 @@ export default {
uni.setClipboardData({
data: text,
success: () => {
- uni.showToast({ title: "复制成功", icon: "success", duration: 2000 });
+ uni.showToast({ title: this.$lang("common.copySuccess"), icon: "success", duration: 2000 });
},
fail: () => {
}
diff --git a/pages_tool/contact/contact.vue b/pages_tool/contact/contact.vue
index f291fee..6a48166 100644
--- a/pages_tool/contact/contact.vue
+++ b/pages_tool/contact/contact.vue
@@ -351,7 +351,7 @@ export default {
this.currentVideo = video;
this.$refs.videoPlayerPopup.open();
} else {
- uni.showToast({ title: '视频地址不存在', icon: 'none' });
+ uni.showToast({ title: this.$lang('contact.videoNotFound'), icon: 'none' });
}
},
diff --git a/pages_tool/files/list.vue b/pages_tool/files/list.vue
index dbcb7c0..caaafe8 100644
--- a/pages_tool/files/list.vue
+++ b/pages_tool/files/list.vue
@@ -2,7 +2,7 @@
-
@@ -20,7 +20,7 @@
{{ item.$orig.files_title }}
- 查看PDF文件
+ {{ $lang('files.viewPdf') }}
@@ -29,7 +29,7 @@
-
+
@@ -116,7 +116,7 @@ export default {
},
toDetail(item) {
uni.showLoading({
- title: '正在加载'
+ title: this.$lang('files.loading')
})
try {
uni.downloadFile({
@@ -141,7 +141,7 @@ export default {
complete: res => {
if (res.statusCode === 404) {
uni.showToast({
- title: '文件不存在',
+ title: this.$lang('files.fileNotExist'),
icon: 'none'
})
}
diff --git a/pages_tool/form/form.vue b/pages_tool/form/form.vue
index c352bd4..9816ddc 100644
--- a/pages_tool/form/form.vue
+++ b/pages_tool/form/form.vue
@@ -5,12 +5,12 @@
- 请填写表单所需信息
+ {{ $lang('form.fillFormInfo') }}
-
+
@@ -88,7 +88,7 @@
},
success: res => {
if (res.code == 0) {
- this.$util.showToast({ title: '提交成功' })
+ this.$util.showToast({ title: this.$lang('form.submitSuccess') })
setTimeout(() => {
this.complete = true;
this.detail = null;
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 0949e94..80552d1 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -15,7 +15,7 @@
-
+
@@ -61,15 +61,15 @@ export default {
show_banner: this.detail.show_banner,
form_banner: this.detail.form_banner || 'public/uniapp/form/banner.png',
show_tip: this.detail.show_tip,
- form_tip: this.detail.form_tip || '请填写表单所需信息'
+ form_tip: this.detail.form_tip || this.$lang('form.fillFormInfo')
}
}
},
onLoad(options) {
if (!options.uniacid) {
uni.showModal({
- title: '提示',
- content: '参数错误',
+ title: this.$lang('common.tip'),
+ content: this.$lang('form.paramError'),
showCancel: false,
success: () => { }
})
@@ -162,8 +162,8 @@ export default {
success: res => {
if (res.code == 0) {
uni.showModal({
- title: '提示',
- content: '提交成功',
+ title: this.$lang('common.tip'),
+ content: this.$lang('form.submitSuccess'),
showCancel: false,
success: () => { }
})
diff --git a/pages_tool/help/list.vue b/pages_tool/help/list.vue
index 479227c..43dda93 100644
--- a/pages_tool/help/list.vue
+++ b/pages_tool/help/list.vue
@@ -6,7 +6,7 @@
{{ s_item.title }}
-
+
@@ -70,7 +70,7 @@ export default {
setPublicShare() {
let shareUrl = this.$config.h5Domain + '/pages_tool/help/list';
this.$util.setPublicShare({
- title: '帮助中心',
+ title: this.$lang('help.helpCenter'),
desc: '',
link: shareUrl,
imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
@@ -78,7 +78,7 @@ export default {
}
},
onShareAppMessage(res) {
- var title = '帮助中心使你更加方便';
+ var title = this.$lang('help.helpCenterDesc');
var path = '/pages_tool/help/list';
return {
title: title,
diff --git a/pages_tool/member/apply_withdrawal.vue b/pages_tool/member/apply_withdrawal.vue
index 1d72f0f..9260cf5 100644
--- a/pages_tool/member/apply_withdrawal.vue
+++ b/pages_tool/member/apply_withdrawal.vue
@@ -224,7 +224,7 @@
success: res => {
if (res.code >= 0) {
this.$util.showToast({
- title: '提现申请成功'
+ title: this.$lang('member.withdrawApplySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_tool/member/withdrawal', {},
diff --git a/pages_tool/member/balance_detail.vue b/pages_tool/member/balance_detail.vue
index 2da751a..83c37b2 100644
--- a/pages_tool/member/balance_detail.vue
+++ b/pages_tool/member/balance_detail.vue
@@ -104,7 +104,7 @@ export default {
bindDateChange: function (e) {
var temp = e.target.value;
var tempArr = temp.split('-');
- this.date = tempArr[0] + '年' + tempArr[1] + '月';
+ this.date = tempArr[0] + this.$lang('common.year') + tempArr[1] + this.$lang('common.month');
this.searchType.date = e.target.value;
this.$refs.mescroll.refresh();
},
@@ -135,7 +135,7 @@ export default {
success: res => {
let balanceType = Object.assign(res.balance, res.balance_money),
typeArr = [{
- label: '全部',
+ label: this.$lang('common.all'),
value: '0'
}];
for (var index in balanceType) {
diff --git a/pages_tool/member/card.vue b/pages_tool/member/card.vue
index 467a3b5..43e6b40 100644
--- a/pages_tool/member/card.vue
+++ b/pages_tool/member/card.vue
@@ -208,19 +208,19 @@ export default {
},
onShareAppMessage() {
return this.mpShareData?.appMessage || {
- title: '专属会员权益，快来体验',
+ title: this.$lang('member.memberRightsTip'),
path: '/pages_tool/member/card'
};
},
onShareTimeline() {
return this.mpShareData?.timeLine || {
- title: '专属会员权益，快来体验',
+ title: this.$lang('member.memberRightsTip'),
query: '/pages_tool/member/card'
};
},
onAddToFavorites() {
return {
- title: '专属会员权益，快来体验',
+ title: this.$lang('member.memberRightsTip'),
path: '/pages_tool/member/card'
};
}
diff --git a/pages_tool/member/level_growth_rules.vue b/pages_tool/member/level_growth_rules.vue
index 154890d..6d03c30 100644
--- a/pages_tool/member/level_growth_rules.vue
+++ b/pages_tool/member/level_growth_rules.vue
@@ -118,7 +118,7 @@
},
getBannerDetail(index) {
uni.showLoading({
- title: '将前往详情页面',
+ title: this.$lang('member.goingToDetail'),
duration: 2000,
mask: true
});
diff --git a/pages_tool/member/modify_face.vue b/pages_tool/member/modify_face.vue
index fece095..b75453e 100644
--- a/pages_tool/member/modify_face.vue
+++ b/pages_tool/member/modify_face.vue
@@ -92,7 +92,7 @@ export default {
},
fail: () => {
this.$util.showToast({
- title: '头像上传失败'
+ title: this.$lang('member.uploadAvatarFailed')
});
}
});
@@ -114,7 +114,7 @@ export default {
this.memberInfo.headimg = this.imgurl;
this.$store.commit('setMemberInfo', this.memberInfo);
this.$util.showToast({
- title: '头像修改成功'
+ title: this.$lang('member.avatarModifySuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_tool/member/info', {}, 'redirectTo');
diff --git a/pages_tool/member/point_detail.vue b/pages_tool/member/point_detail.vue
index 66ab874..7066dfc 100644
--- a/pages_tool/member/point_detail.vue
+++ b/pages_tool/member/point_detail.vue
@@ -91,7 +91,7 @@ export default {
bindDateChange: function(e) {
var temp = e.target.value;
var tempArr = temp.split('-');
- this.date = tempArr[0] + '年' + tempArr[1] + '月';
+ this.date = tempArr[0] + this.$lang('common.year') + tempArr[1] + this.$lang('common.month');
this.searchType.date = e.target.value;
this.$refs.mescroll.refresh();
},
diff --git a/pages_tool/member/public/js/collection.js b/pages_tool/member/public/js/collection.js
index c941bc6..67f252a 100644
--- a/pages_tool/member/public/js/collection.js
+++ b/pages_tool/member/public/js/collection.js
@@ -53,7 +53,7 @@ export default {
success: res => {
if (res.code == 0) {
this.$util.showToast({
- title: "删除成功"
+ title: this.$lang('collection.deleteSuccess')
})
let array = this.collectionList;
let newArray = array.filter((v) => {
diff --git a/pages_tool/member/public/js/invite_friends.js b/pages_tool/member/public/js/invite_friends.js
index 12e5a86..80c3d06 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: "保存成功"
+ title: this.$lang('member.saveSuccess')
});
},
fail: () => {
this.$util.showToast({
- title: "保存失败，请稍后重试"
+ title: this.$lang('member.saveFailed')
});
}
});
diff --git a/pages_tool/member/public/js/signin.js b/pages_tool/member/public/js/signin.js
index 94d2f11..86ee2e3 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: '商家未开启会员签到',
+ title: this.$lang('member.merchantNotOpenSignin'),
mask: true,
duration: 2000
});
@@ -198,7 +198,7 @@ export default {
sign() {
if (this.signState == 0) {
this.$util.showToast({
- title: '签到未开启'
+ title: this.$lang('member.signinNotEnabled')
})
}
@@ -233,8 +233,8 @@ export default {
let shareUrl = this.$config.h5Domain + '/pages_tool/member/signin';
this.$util.setPublicShare({
- title: '签到有礼',
- desc: '天天签到，积分好礼送不停',
+ title: this.$lang('member.signinGift'),
+ desc: this.$lang('member.signinGiftDesc'),
link: shareUrl,
imgUrl: ''
},
@@ -265,7 +265,7 @@ export default {
onShareAppMessage() {
var path = '/pages_tool/member/signin';
return {
- title: '签到有礼，天天签到，积分好礼送不停',
+ title: this.$lang('member.signinGift') + '，' + this.$lang('member.signinGiftDesc'),
imageUrl: '',
path: path,
success: res => {},
diff --git a/pages_tool/notice/list.vue b/pages_tool/notice/list.vue
index 91b484b..2c80ef2 100644
--- a/pages_tool/notice/list.vue
+++ b/pages_tool/notice/list.vue
@@ -15,7 +15,7 @@
-
+
@@ -77,7 +77,7 @@ export default {
setPublicShare() {
let shareUrl = this.$config.h5Domain + '/pages_tool/notice/list';
this.$util.setPublicShare({
- title: '公告',
+ title: this.$lang('notice.title'),
desc: '',
link: shareUrl,
imgUrl: this.siteInfo ? this.$util.img(this.siteInfo.logo_square) : ''
@@ -85,7 +85,7 @@ export default {
}
},
onShareAppMessage(res) {
- var title = '公告';
+ var title = this.$lang('notice.title');
var path = '/pages_tool/notice/list';
return {
title: title,
diff --git a/pages_tool/order/activist.vue b/pages_tool/order/activist.vue
index 3eb7fba..7231689 100644
--- a/pages_tool/order/activist.vue
+++ b/pages_tool/order/activist.vue
@@ -112,7 +112,7 @@ export default {
this.cancleRefund(data.order_goods_id, res => {
if (res.code >= 0) {
this.$util.showToast({
- title: '撤销成功'
+ title: this.$lang('refund.cancelSuccess')
});
this.$refs.mescroll.refresh();
}
diff --git a/pages_tool/order/public/js/evaluate.js b/pages_tool/order/public/js/evaluate.js
index c15a1f8..53c4024 100644
--- a/pages_tool/order/public/js/evaluate.js
+++ b/pages_tool/order/public/js/evaluate.js
@@ -87,7 +87,7 @@ export default {
}
} else {
this.$util.showToast({
- title: "未获取到订单数据"
+ title: this.$lang('evaluate.noOrderData')
})
setTimeout(() => {
this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
@@ -157,7 +157,7 @@ export default {
save() {
if (this.evaluateConfig.evaluate_status == 0) {
this.$util.showToast({
- title: "商家未开启商品评价功能"
+ title: this.$lang('evaluate.notEnabled')
});
return;
}
@@ -165,14 +165,14 @@ export default {
if (this.isEvaluate) {
if (!this.goodsEvalList[i].again_content.trim().length) {
this.$util.showToast({
- title: "商品的评价不能为空哦"
+ title: this.$lang('evaluate.contentRequired')
});
return;
}
} else {
if (!this.goodsEvalList[i].content.trim().length) {
this.$util.showToast({
- title: "商品的评价不能为空哦"
+ title: this.$lang('evaluate.contentRequired')
});
return;
}
@@ -197,7 +197,7 @@ export default {
success: res => {
if (res.code == 0) {
this.$util.showToast({
- title: "评价成功"
+ title: this.$lang('evaluate.evaluateSuccess')
});
setTimeout(() => {
this.$util.redirectTo('/pages_order/list', {}, "redirectTo");
diff --git a/pages_tool/order/public/js/refundMethod.js b/pages_tool/order/public/js/refundMethod.js
index 2feb464..69bac3b 100644
--- a/pages_tool/order/public/js/refundMethod.js
+++ b/pages_tool/order/public/js/refundMethod.js
@@ -7,8 +7,8 @@ export default {
*/
cancleRefund(order_goods_id, callback) {
uni.showModal({
- content: '撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。',
- cancelText: '暂不撤销',
+ content: this.$lang('refund.cancelConfirm'),
+ cancelText: this.$lang('refund.notCancelNow'),
cancelColor: '#898989',
success: res => {
if (res.confirm) {
diff --git a/pages_tool/order/refund_batch.vue b/pages_tool/order/refund_batch.vue
index e745b94..99859e4 100644
--- a/pages_tool/order/refund_batch.vue
+++ b/pages_tool/order/refund_batch.vue
@@ -40,7 +40,7 @@