diff --git a/components-diy/diy-kefu.vue b/components-diy/diy-kefu.vue
index b3498fb..bbb432e 100644
--- a/components-diy/diy-kefu.vue
+++ b/components-diy/diy-kefu.vue
@@ -14,7 +14,7 @@
diff --git a/components-diy/diy-member-info.vue b/components-diy/diy-member-info.vue
index 3092db6..5d0095f 100644
--- a/components-diy/diy-member-info.vue
+++ b/components-diy/diy-member-info.vue
@@ -12,7 +12,7 @@
- 点击授权头像昵称
+ {{ $lang('member.authAvatarNickname') }}
{{ memberInfo.nickname }}
@@ -36,7 +36,7 @@
- 点击获取微信头像
+ {{ $lang('member.getWechatAvatar') }}
{{ memberInfo.nickname
diff --git a/components-diy/diy-notice.vue b/components-diy/diy-notice.vue
index 34d0db0..04057a6 100644
--- a/components-diy/diy-notice.vue
+++ b/components-diy/diy-notice.vue
@@ -42,11 +42,11 @@
diff --git a/components-diy/diy-search.vue b/components-diy/diy-search.vue
index 81f521a..67ae926 100644
--- a/components-diy/diy-search.vue
+++ b/components-diy/diy-search.vue
@@ -28,7 +28,7 @@
@tap.stop="handlerSearchClick"
:placeholderStyle="placeholderStyle" />
搜索
+ :style="{ 'backgroundColor': value.pageBgColor ? value.pageBgColor : 'rgba(0,0,0,0)' }">{{ $lang('form.search') }}
diff --git a/components/ns-empty/ns-empty.vue b/components/ns-empty/ns-empty.vue
index 3249614..626ecff 100644
--- a/components/ns-empty/ns-empty.vue
+++ b/components/ns-empty/ns-empty.vue
@@ -15,7 +15,7 @@ export default {
props: {
text: {
type: String,
- default: '暂无相关数据'
+ default: ''
},
subText: {
type: String,
@@ -28,7 +28,7 @@ export default {
emptyBtn: {
type: Object,
default: () => {
- return { text: '去逛逛' };
+ return { text: '' };
}
},
fixed: {
diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue
index 0715071..968b15c 100644
--- a/components/ns-login/ns-login.vue
+++ b/components/ns-login/ns-login.vue
@@ -7,34 +7,34 @@
- 检测到您还未绑定手机号
- 为了方便您接收订单等信息，需要绑定手机号
+ {{ $lang('loginPage.detectPhoneNotBound') }}
+ {{ $lang('loginPage.bindPhoneForOrder') }}
- 手机号
-
+ {{ $lang('loginPage.phone') }}
+
- 验证码
-
+ {{ $lang('loginPage.verificationCode') }}
+
- 动态码
-
+ {{ $lang('loginPage.dynamicCode') }}
+
{{ dynacodeData.codeText }}
-
+
- 欢迎来到 {{ site_name }}
+ {{ $lang('loginPage.welcomeTo') }} {{ site_name }}
- {{ forceBindingMobileControl ? '使用手机号登录，' : '注册登录，' }}
+ {{ forceBindingMobileControl ? $lang('loginPage.usePhoneLogin') : $lang('loginPage.registerLogin') }}
获得订单、售后等服务。
@@ -48,9 +48,9 @@
我同意
《隐私条款》
+ @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ $lang('loginPage.privacyClause') }}
《用户服务协议》
+ @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ $lang('loginPage.userAgreement') }}
@@ -58,25 +58,25 @@
- 暂不登录
+ {{ $lang('loginPage.notNow') }}
- 头像
+ {{ $lang('loginPage.avatar') }}
- 昵称
- {{ $lang('loginPage.nickname') }}
+
- 头像
+ {{ $lang('loginPage.avatar') }}
- 昵称
- {{ $lang('loginPage.nickname') }}
+
- 手机号
+ {{ $lang('loginPage.phone') }}
-
+
@@ -166,7 +166,7 @@ export default {
dynacodeData: {
seconds: 120,
timer: null,
- codeText: '获取动态码',
+ codeText: this.$lang('loginPage.dynamicCode'),
isSend: false
},
// 小程序获取手机号所需数据
@@ -228,7 +228,7 @@ export default {
// 同意协议
authno() {
if (!this.isAgree) {
- this.$util.showToast({ title: '请确认相关协议' });
+ this.$util.showToast({ title: this.$lang('loginPage.confirmAgreement') });
}
},
@@ -324,7 +324,7 @@ export default {
},
fail: () => {
this.$util.showToast({
- title: '上传失败'
+ title: this.$lang('loginPage.uploadFailed')
});
}
})
@@ -386,17 +386,17 @@ export default {
var rule = [{
name: 'mobile',
checkType: 'required',
- errorMsg: '请输入手机号'
+ errorMsg: this.$lang('loginPage.phoneRequired')
}, {
name: 'mobile',
checkType: 'phoneno',
- errorMsg: '请输入正确的手机号'
+ errorMsg: this.$lang('loginPage.phoneInvalid')
}];
if (this.isOpenCaptcha == 1) {
rule.push({
name: 'captcha_code',
checkType: 'required',
- errorMsg: '请输入验证码'
+ errorMsg: this.$lang('loginPage.verificationCodeRequired')
});
}
var checkRes = validate.check(data, rule);
@@ -444,7 +444,7 @@ export default {
this.dynacodeData = {
seconds: 120,
timer: null,
- codeText: '获取动态码',
+ codeText: this.$lang('loginPage.dynamicCode'),
isSend: false
};
},
@@ -455,23 +455,23 @@ export default {
let rule = [{
name: 'mobile',
checkType: 'required',
- errorMsg: '请输入手机号'
+ errorMsg: this.$lang('loginPage.phoneRequired')
}, {
name: 'mobile',
checkType: 'phoneno',
- errorMsg: '请输入正确的手机号'
+ errorMsg: this.$lang('loginPage.phoneInvalid')
}];
if (this.isOpenCaptcha == 1) {
if (this.captcha.id != '') rule.push({
name: 'captcha_code',
checkType: 'required',
- errorMsg: '请输入验证码'
+ errorMsg: this.$lang('loginPage.verificationCodeRequired')
});
}
rule.push({
name: 'code',
checkType: 'required',
- errorMsg: '请输入动态码'
+ errorMsg: this.$lang('loginPage.dynamicCodeRequired')
});
var checkRes = validate.check(data, rule);
@@ -603,7 +603,7 @@ export default {
// 授权登录
authLogin(data, type = 'authLogin') {
uni.showLoading({
- title: '登录中'
+ title: this.$lang('loginPage.loggingIn')
});
uni.setStorageSync('authInfo', data);
if (uni.getStorageSync('source_member')) data.source_member = uni.getStorageSync('source_member');
@@ -643,7 +643,7 @@ export default {
fail: () => {
uni.hideLoading();
this.$util.showToast({
- title: '登录失败'
+ title: this.$lang('loginPage.loginFailed')
});
}
});
@@ -669,12 +669,12 @@ export default {
// 微信小程序保存数据
saveMp() {
if (this.formData.mobile === '') {
- this.$util.showToast({ title: '请授权您的手机号码' });
+ this.$util.showToast({ title: this.$lang('loginPage.phoneAuthRequired') });
return;
}
if (this.nickName.length == 0 && this.enableNickAndAvatar) {
- this.$util.showToast({ title: '请输入昵称' });
+ this.$util.showToast({ title: this.$lang('loginPage.nicknameRequired') });
return;
}
@@ -715,7 +715,7 @@ export default {
},
fail: () => {
this.$util.showToast({
- title: '头像拉取失败'
+ title: this.$lang('loginPage.avatarFetchFailed')
});
}
})
diff --git a/components/ns-newform/ns-newform.vue b/components/ns-newform/ns-newform.vue
index 394f703..f7166d3 100644
--- a/components/ns-newform/ns-newform.vue
+++ b/components/ns-newform/ns-newform.vue
@@ -11,7 +11,7 @@
@@ -28,7 +28,7 @@
@@ -50,7 +50,7 @@
{{ item.val }}
- {{ item.value.placeholder || '请选择' }}
+ {{ item.value.placeholder || $lang('form.selectPlaceholder') }}
@@ -146,7 +146,7 @@
@change="bindDateChange($event, index)"
>
- {{ item.val ? item.val : (item.value.placeholder || '请选择日期') }}
+ {{ item.val ? item.val : (item.value.placeholder || $lang('form.selectDate')) }}
@@ -170,7 +170,7 @@
>
- {{ item.start_date ? item.start_date : (item.value.placeholder_start || '开始日期') }}
+ {{ item.start_date ? item.start_date : (item.value.placeholder_start || $lang('form.startDate')) }}
@@ -184,7 +184,7 @@
>
- {{ item.end_date ? item.end_date : (item.value.placeholder_end || '结束日期') }}
+ {{ item.end_date ? item.end_date : (item.value.placeholder_end || $lang('form.endDate')) }}
@@ -207,7 +207,7 @@
@change="bindTimeChange($event, index)"
>
- {{ item.val ? item.val : (item.value.placeholder || '请选择时间') }}
+ {{ item.val ? item.val : (item.value.placeholder || $lang('form.selectTime')) }}
@@ -231,7 +231,7 @@
>
- {{ item.start_time ? item.start_time : (item.value.placeholder_start || '开始时间') }}
+ {{ item.start_time ? item.start_time : (item.value.placeholder_start || $lang('form.startTime')) }}
@@ -245,7 +245,7 @@
>
- {{ item.end_time ? item.end_time : (item.value.placeholder_end || '结束时间') }}
+ {{ item.end_time ? item.end_time : (item.value.placeholder_end || $lang('form.endTime')) }}
@@ -268,7 +268,7 @@
@getRegions="handleGetRegions($event, index)"
>
- {{ item.val ? item.val : (item.value.placeholder || (item.value.default_type == 1 ? '请选择省市' : '请选择省市区')) }}
+ {{ item.val ? item.val : (item.value.placeholder || (item.value.default_type == 1 ? $lang('form.selectProvinceCity') : $lang('form.selectProvinceCityDistrict'))) }}
@@ -788,89 +788,89 @@ export default {
if (item.controller == 'Text') {
if (item.value.required && !item.val) {
- this.$util.showToast({ title: '请输入' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.inputRequired') + item.value.title });
return false;
}
if (item.name == 'ID_CARD' && !/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(item.val)) {
if (!item.value.required) {
- this.$util.showToast({ title: '身份证输入不合法' });
+ this.$util.showToast({ title: this.$lang('form.idCardInvalid') });
return false;
}
if (item.val != '') {
- this.$util.showToast({ title: '身份证输入不合法' });
+ this.$util.showToast({ title: this.$lang('form.idCardInvalid') });
return false;
}
}
if (item.name == 'MOBILE' && !this.$util.verifyMobile(item.val)) {
if (!item.value.required) {
- this.$util.showToast({ title: '手机号输入不合法' });
+ this.$util.showToast({ title: this.$lang('form.phoneInvalid') });
return false;
}
if (item.val != '') {
- this.$util.showToast({ title: '手机号输入不合法' });
+ this.$util.showToast({ title: this.$lang('form.phoneInvalid') });
return false;
}
}
}
if (item.controller == 'Textarea' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请输入' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.inputRequired') + item.value.title });
return false;
}
if (item.controller == 'Select' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
if (item.controller == 'Checkbox' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请至少选择一个' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectAtLeastOne') + item.value.title });
return false;
}
if (item.controller == 'Img' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请至少上传一张' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.uploadAtLeastOne') + item.value.title });
return false;
}
if (item.controller == 'Date' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
if (item.controller == 'Datelimit') {
if (item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
if (this.$util.timeTurnTimeStamp(item.start_date) > this.$util.timeTurnTimeStamp(item.end_date)) {
- this.$util.showToast({ title: '结束日期不能小于开始日期' });
+ this.$util.showToast({ title: this.$lang('form.endDateBeforeStart') });
return false;
}
}
if (item.controller == 'Time' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
if (item.controller == 'Timelimit') {
if (item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
if (item.start_time >= item.end_time) {
- this.$util.showToast({ title: '结束时间必须大于开始时间' });
+ this.$util.showToast({ title: this.$lang('form.endTimeBeforeStart') });
return false;
}
}
if (item.controller == 'City' && item.value.required && !item.val) {
- this.$util.showToast({ title: '请选择' + item.value.title });
+ this.$util.showToast({ title: this.$lang('form.selectRequired') + item.value.title });
return false;
}
}
@@ -902,7 +902,7 @@ export default {
if (res.length > 0) {
res.forEach(function(img) {
if (self.formData[index].img_lists.length >= Number(self.formData[index].value.max_count)) {
- self.$util.showToast({ title: '最多上传' + self.formData[index].value.max_count + '张图片' });
+ self.$util.showToast({ title: this.$lang('form.maxUploadImages') + self.formData[index].value.max_count + this.$lang('form.images') });
return false;
}
self.formData[index].img_lists.push(img);
@@ -916,7 +916,7 @@ export default {
addImg(index) {
let self = this;
if (this.formData[index].img_lists.length >= Number(this.formData[index].value.max_count)) {
- this.$util.showToast({ title: '最多上传' + this.formData[index].value.max_count + '张图片' });
+ this.$util.showToast({ title: this.$lang('form.maxUploadImages') + this.formData[index].value.max_count + this.$lang('form.images') });
return false;
}
diff --git a/components/ns-payment/ns-payment.vue b/components/ns-payment/ns-payment.vue
index 6550598..103c8b8 100644
--- a/components/ns-payment/ns-payment.vue
+++ b/components/ns-payment/ns-payment.vue
@@ -4,19 +4,19 @@
- 平台尚未配置支付方式！
+ {{ $lang('payment.noPaymentMethod') }}
@@ -158,12 +158,12 @@ export default {
confirm() {
if (this.payTypeList.length == 0 && this.payMoney > 0) {
this.$util.showToast({
- title: '请选择支付方式！'
+ title: this.$lang('payment.selectPaymentMethod')
});
return;
}
uni.showLoading({
- title: '支付中...',
+ title: this.$lang('payment.paying'),
mask: true
});
this.$refs.choosePaymentPopup.close();
@@ -182,7 +182,7 @@ export default {
this.pay();
} else {
this.$util.showToast({
- title: '未获取到支付信息！'
+ title: this.$lang('payment.noPaymentInfo')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
@@ -295,7 +295,7 @@ export default {
},
res => {
this.$util.showToast({
- title: '您已取消支付'
+ title: this.$lang('payment.cancelledPayment')
});
setTimeout(() => {
this.$util.redirectTo('/pages_tool/pay/result', {
diff --git a/components/ns-select-time/ns-select-time.vue b/components/ns-select-time/ns-select-time.vue
index 8d39484..c57ef84 100644
--- a/components/ns-select-time/ns-select-time.vue
+++ b/components/ns-select-time/ns-select-time.vue
@@ -3,8 +3,8 @@
- 选择送达时间
- 选择自提时间
+ {{ $lang('appointment.selectDeliveryTime') }}
+ {{ $lang('appointment.selectPickupTime') }}
diff --git a/components/ns-video-player-popup/ns-video-player-popup.vue b/components/ns-video-player-popup/ns-video-player-popup.vue
index 774b25f..b01c50b 100644
--- a/components/ns-video-player-popup/ns-video-player-popup.vue
+++ b/components/ns-video-player-popup/ns-video-player-popup.vue
@@ -14,7 +14,7 @@
autoplay
class="video-player"
>
- 视频地址不存在
+ {{ $lang('video.videoNotFound') }}
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 501039a..918cc6c 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -4,19 +4,19 @@
- 平台尚未配置支付方式！
+ {{ $lang('payment.noPaymentMethod') }}
@@ -135,12 +135,12 @@
confirm() {
if (this.payTypeList.length == 0 && this.payMoney > 0) {
this.$util.showToast({
- title: '请选择支付方式！'
+ title: this.$lang('payment.selectPaymentMethod')
});
return;
}
uni.showLoading({
- title: '支付中...',
+ title: this.$lang('payment.paying'),
mask: true
});
this.pay();
@@ -161,7 +161,7 @@
})
} else {
this.$util.showToast({
- title: '未获取到支付信息！'
+ title: this.$lang('payment.noPaymentInfo')
});
}
}
@@ -294,7 +294,7 @@
},
res => {
this.$util.showToast({
- title: '您已取消支付'
+ title: this.$lang('payment.cancelledPayment')
});
this.resetpay();
}
diff --git a/components/privacy-popup/privacy-popup.vue b/components/privacy-popup/privacy-popup.vue
index d4c30fe..91178ab 100644
--- a/components/privacy-popup/privacy-popup.vue
+++ b/components/privacy-popup/privacy-popup.vue
@@ -2,23 +2,23 @@
- 用户隐私保护提示
+ {{ $lang('privacy.title') }}
- 感谢您使用{{ appName }}，在使用前您应当阅读并同意
+ {{ $lang('privacy.thanks') }}{{ appName }}，{{ $lang('privacy.beforeUse') }}
{{ privacyContractName }}
{{ privacyServiceName }}
- ,当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用{{ appName }}相关功能。
+ {{ $lang('privacy.agreeTip') }}{{ appName }}{{ $lang('privacy.functionTip') }}
-
+
+ @agreeprivacyauthorization="handleAgree">{{ $lang('privacy.agreeAndContinue') }}
-
+
diff --git a/components/register-reward/register-reward.vue b/components/register-reward/register-reward.vue
index a23f850..2281b84 100644
--- a/components/register-reward/register-reward.vue
+++ b/components/register-reward/register-reward.vue
@@ -11,59 +11,59 @@
- 积分奖励
+ {{ $lang('reward.pointReward') }}
{{ reward.point }}
- 积分
+ {{ $lang('reward.point') }}
- 用于下单时抵现或兑换商品等
+ {{ $lang('reward.pointDesc') }}
- 立即查看
+ {{ $lang('reward.viewNow') }}
- 成长值
+ {{ $lang('reward.growthReward') }}
{{ reward.growth }}
- 成长值
+ {{ $lang('reward.growth') }}
- 用于提升会员等级
+ {{ $lang('reward.growthDesc') }}
- 立即查看
+ {{ $lang('reward.viewNow') }}
- 红包奖励
+ {{ $lang('reward.hongbaoReward') }}
{{ reward.balance }}
- 元
+ {{ $lang('reward.yuan') }}
- 不可提现下单时可用
+ {{ $lang('reward.hongbaoDesc') }}
- 立即查看
+ {{ $lang('reward.viewNow') }}
- 优惠券奖励
+ {{ $lang('reward.couponReward') }}
{{ item.coupon_name }}
- 满{{ item.at_least }}{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
+ {{ $lang('reward.full') }}{{ item.at_least }}{{ item.type == 'discount' ? $lang('reward.discount') + item.discount + $lang('reward.zhe') : $lang('reward.minus') + item.money }}
- 无门槛，{{ item.type == 'discount' ? '打' + item.discount + '折' : '减' + item.money }}
+ {{ $lang('reward.noThreshold') }}，{{ item.type == 'discount' ? $lang('reward.discount') + item.discount + $lang('reward.zhe') : $lang('reward.minus') + item.money }}
- 立即查看
+ {{ $lang('reward.viewNow') }}
diff --git a/components/wxwork-contact/wxwork-contact.vue b/components/wxwork-contact/wxwork-contact.vue
index ccd3073..5da5eca 100644
--- a/components/wxwork-contact/wxwork-contact.vue
+++ b/components/wxwork-contact/wxwork-contact.vue
@@ -13,14 +13,14 @@