diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index 5b5333d..1c3daf9 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -211,8 +211,8 @@
- 您还不是{{ fenxiaoWords.fenxiao_name }},请先提交申请
- 立即加入
+ {{ $lang('fenxiao.notFenxiao', { fenxiao_name: fenxiaoWords.fenxiao_name }) }},{{ $lang('fenxiao.applyNow') }}
+ {{ $lang('fenxiao.joinNow') }}
@@ -220,7 +220,7 @@
- {{ pointInfo.point }}积分
+ {{ pointInfo.point }}{{ $lang('point.point') }}
+{{ $lang('common.currencySymbol') }}{{ pointInfo.exchange_price
}}
@@ -48,10 +48,10 @@
- 库存:{{ pointInfo.stock }}{{
+ {{ $lang('point.stockLabel') }}:{{ pointInfo.stock }}{{
pointInfo.stock >= 0 ?
pointInfo.unit : '' }}
- 库存:无限{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}
+ {{ $lang('point.stockLabel') }}:{{ $lang('point.unlimitedStock') }}{{ pointInfo.stock >= 0 ? pointInfo.unit : '' }}
@@ -61,21 +61,21 @@
{{ pointInfo.name }}
- 内含{{ pointInfo.balance
- }}元
- 无门槛优惠券
- {{ '满' + pointInfo.at_least +
- '减' + pointInfo.money
+ {{ $lang('point.contains') }}{{ pointInfo.balance
+ }}{{ $lang('common.yuan') }}
+ {{ $lang('point.noThresholdCoupon') }}
+ {{ $lang('form.full') + pointInfo.at_least +
+ $lang('common.yuan') + $lang('order.fullReduceDesc', { limit: pointInfo.at_least, type: '', money: pointInfo.money })
}}
- 满{{ pointInfo.at_least }}元
- {{ pointInfo.discount }}折
+ {{ $lang('form.full') }}{{ pointInfo.at_least }}{{ $lang('common.yuan') }}
+ {{ pointInfo.discount }}{{ $lang('common.discount') }}
- 最多优惠{{
- pointInfo.discount_limit }}元
+ {{ $lang('point.maxDiscount') }}{{
+ pointInfo.discount_limit }}{{ $lang('common.yuan') }}
- {{ pointInfo.validity_type == 1 ? '领取之日起' + pointInfo.fixed_term + '天内有效' :
- $util.timeStampTurnTime(pointInfo.end_time) + '到期' }}
+ {{ pointInfo.validity_type == 1 ? $lang('point.fromReceive') + pointInfo.fixed_term + $lang('point.daysValid') :
+ $util.timeStampTurnTime(pointInfo.end_time) + $lang('point.expireAt') }}
@@ -88,7 +88,7 @@
-
+
@@ -96,7 +96,7 @@
v-show="isCommunity">
@@ -161,7 +161,7 @@
+ @click="closeMerchantsServicePopup()">{{ $lang('point.confirm') }}
@@ -184,7 +184,7 @@
- 兑换详情
+ {{ $lang('point.exchangeDetail') }}
@@ -192,7 +192,7 @@
- 暂无兑换详情!
+ {{ $lang('point.noExchangeDetail') }}
@@ -205,14 +205,14 @@
+ type="primary">{{ $lang('point.loginToExchange') }}
+ disabled>{{ $lang('point.insufficientStock') }}
+ disabled>{{ $lang('point.insufficientPoint') }}
+ type="primary" hover-class="none">{{ $lang('point.exchange') }}
diff --git a/pages_promotion/point/list.vue b/pages_promotion/point/list.vue
index e27e159..ec48f92 100644
--- a/pages_promotion/point/list.vue
+++ b/pages_promotion/point/list.vue
@@ -10,7 +10,7 @@
- 搜索商品
+ {{ $lang('goods.searchGoods') }}
- 我的积分
+ {{ $lang('point.myPoint') }}
{{ point }}
- 积分
+ {{ $lang('point.point') }}
@@ -81,9 +81,9 @@
- 储值{{ parseFloat(item.buy_price) }}元
- 可得{{ item.point }}积分
- 去储值
+ {{ $lang('point.recharge') }}{{ parseFloat(item.buy_price) }}{{ $lang('common.yuan') }}
+ {{ $lang('point.getPoint') }}{{ item.point }}{{ $lang('point.point') }}
+ {{ $lang('point.goRecharge') }}
@@ -91,7 +91,7 @@
- 积分换券
+ {{ $lang('point.exchangeCoupon') }}
@@ -115,25 +115,24 @@
- {{ parseFloat(couponItem.discount) }}折
+ {{ parseFloat(couponItem.discount) }}{{ $lang('common.discount') }}
- {{ couponItem.at_least == 0 ? '无门槛优惠券' : '满' +
- parseFloat(couponItem.at_least).toFixed(0) + '可用' }}
+ {{ couponItem.at_least == 0 ? $lang('point.noThresholdCoupon') : $lang('point.fullAvailable', { amount: parseFloat(couponItem.at_least).toFixed(0) }) }}
全场券
+ v-if="couponItem.goods_type == 1">{{ $lang('point.siteWideCoupon') }}
- 指定券
+ {{ $lang('point.designatedCoupon') }}
- {{ couponItem.point }}积分
- 兑换
+ {{ couponItem.point }}{{ $lang('point.point') }}
+ {{ $lang('point.exchange') }}
@@ -145,7 +144,7 @@
- 积分换红包
+ {{ $lang('point.exchangeHongbao') }}
@@ -166,8 +165,8 @@
- {{ hongbaoItem.point }}积分
- 兑换
+ {{ hongbaoItem.point }}{{ $lang('point.point') }}
+ {{ $lang('point.exchange') }}
@@ -178,7 +177,7 @@
- 积分换礼品
+ {{ $lang('point.exchangeGift') }}
@@ -196,7 +195,7 @@
{{ item.point }}
- 积分
+ {{ $lang('point.point') }}
+
@@ -204,17 +203,17 @@
{{
parseFloat(item.price).toFixed(2).split(".")[0] }}
.{{
- parseFloat(item.price).toFixed(2).split(".")[1] }}元
+ parseFloat(item.price).toFixed(2).split(".")[1] }}{{ $lang('common.yuan') }}
- 兑换
+ {{ $lang('point.exchange') }}
- 库存:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}
+ {{ $lang('point.stock') }}:{{ isNaN(parseInt(item.stock)) ? 0 : parseInt(item.stock) }}
- 已兑:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
+ {{ $lang('point.exchanged') }}:{{ isNaN(parseInt(item.sale_num)) ? 0 : parseInt(item.sale_num) }}
@@ -231,20 +230,20 @@
- {{ isEnEnv ? 'Integral Description' : '积分说明' }}
+ {{ $lang('point.integralDescription') }}
- {{ isEnEnv ? 'Integral Acquisition' : '积分的获取' }}
- 1、积分可在注册、签到、分享、消费、充值时获得。
- 2、在购买部分商品时可获得积分。
- {{ isEnEnv ? 'Integral Use' : '积分的使用' }}
- 1、积分可用于兑换积分中心的商品。
- 2、积分可在参与某些活动时使用。
- 3、积分不得转让,出售,不设有效期。
- {{ isEnEnv ? 'Integral Query' : '积分的查询' }}
- 1、积分可在会员中心中查询具体数额以及明细。
+ {{ $lang('point.integralAcquisition') }}
+ 1、{{ $lang('point.integralAcquisitionDesc1') }}
+ 2、{{ $lang('point.integralAcquisitionDesc2') }}
+ {{ $lang('point.integralUse') }}
+ 1、{{ $lang('point.integralUseDesc1') }}
+ 2、{{ $lang('point.integralUseDesc2') }}
+ 3、{{ $lang('point.integralUseDesc3') }}
+ {{ $lang('point.integralQuery') }}
+ 1、{{ $lang('point.integralQueryDesc1') }}
@@ -273,15 +272,15 @@ export default {
},
categoryList: [{
id: 1,
- name: '积分换好物'
+ name: this.$lang('point.exchangeGoods')
},
{
id: 2,
- name: '积分换券'
+ name: this.$lang('point.exchangeCoupon')
},
{
id: 3,
- name: '积分换红包'
+ name: this.$lang('point.exchangeHongbao')
}
],
isLogin: false,
@@ -302,7 +301,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.pointexchange) {
this.$util.showToast({
- title: '商家未开启积分商城',
+ title: this.$lang('point.notOpenPointMall'),
mask: true,
duration: 2000
});
@@ -580,7 +579,7 @@ export default {
}
} else {
this.$util.showToast({
- title: '暂无相关活动'
+ title: this.$lang('point.noActivity')
});
}
}
diff --git a/pages_promotion/point/order_list.vue b/pages_promotion/point/order_list.vue
index 13938c5..f909f5d 100644
--- a/pages_promotion/point/order_list.vue
+++ b/pages_promotion/point/order_list.vue
@@ -16,10 +16,10 @@
@@ -46,7 +46,7 @@
{{ orderItem.point }}
- 积分
+ {{ $lang('point.point') }}
+
{{
@@ -69,20 +69,20 @@
- 查看详情
+ {{ $lang('point.viewDetail') }}
-
+
@@ -104,9 +104,9 @@ export default {
outTradeNo: '',
payMoney: 0,
statusList: [
- { status: 'all', id: 'all', name: '全部' },
- { status: 0, id: 'pay', name: '待支付' },
- { status: 1, id: 'complete', name: '已完成' },
+ { status: 'all', id: 'all', name: this.$lang('order.all') },
+ { status: 0, id: 'pay', name: this.$lang('point.waitPay') },
+ { status: 1, id: 'complete', name: this.$lang('order.completed') },
],
orderStatus: 'all',
};
@@ -115,7 +115,7 @@ export default {
setTimeout(() => {
if (!this.addonIsExist.pointexchange) {
this.$util.showToast({
- title: '商家未开启积分商城',
+ title: this.$lang('point.notOpenPointMall'),
mask: true,
duration: 2000
});
@@ -182,8 +182,8 @@ export default {
},
orderClose(order_id, index) {
uni.showModal({
- title: '提示',
- content: '确定关闭此次兑换?',
+ title: this.$lang('common.reminder'),
+ content: this.$lang('point.confirmClose'),
success: res => {
if (res.confirm) {
this.$api.sendRequest({
@@ -195,7 +195,7 @@ export default {
if (res.code >= 0) {
this.orderList[index].order_status = -1;
this.$util.showToast({
- title: '关闭成功'
+ title: this.$lang('point.closeSuccess')
});
this.$forceUpdate();
}
diff --git a/pages_promotion/point/payment.vue b/pages_promotion/point/payment.vue
index ea0cebf..9b50aab 100644
--- a/pages_promotion/point/payment.vue
+++ b/pages_promotion/point/payment.vue
@@ -7,7 +7,7 @@
}">
- 确认订单
+ {{ $lang('point.confirmOrder') }}
@@ -39,16 +39,16 @@
- 由 {{ storeInfo.currStore.store_name }} 提供配送
+ {{ $lang('order.providedBy') }} {{ storeInfo.currStore.store_name }} {{ $lang('order.delivery') }}
- 点击切换
+ {{ $lang('common.clickSwitch') }}
- 您的附近没有可配送的门店,请选择其他配送方式
+ {{ $lang('order.noNearbyStore') }}
@@ -69,7 +69,7 @@
- 请设置收货地址
+ {{ $lang('order.setAddress') }}
@@ -80,11 +80,11 @@
- 送达时间
+ {{ $lang('order.deliverTime') }}
{{
orderCreateData.buyer_ask_delivery_title ?
- orderCreateData.buyer_ask_delivery_title : '请选择送达时间' }}
+ orderCreateData.buyer_ask_delivery_title : $lang('order.selectDeliverTime') }}
@@ -106,8 +106,8 @@
- 营业时间:{{ storeInfo.currStore.open_date }}
- 地址:{{ storeInfo.currStore.full_address }}
+ {{ $lang('order.businessHours') }}:{{ storeInfo.currStore.open_date }}
+ {{ $lang('order.address') }}:{{ storeInfo.currStore.full_address }}
{{ storeInfo.currStore.address }}
@@ -116,28 +116,28 @@
- 姓名
+ {{ $lang('member.name') }}
- 预留手机
- {{ $lang('member.reservePhone') }}
+
- 自提时间
+ {{ $lang('order.pickupTime') }}
{{ orderCreateData.buyer_ask_delivery_title }}
- 当前无自提门店,请选择其它配送方式
+ {{ $lang('order.noPickupStore') }}
@@ -147,12 +147,12 @@
- 购买虚拟类商品需填写手机号,方便商家与您联系
+ {{ $lang('order.virtualGoodsTip') }}
- 手机号码
- {{ $lang('member.phone') }}
+
@@ -188,7 +188,7 @@
{{ orderPaymentData.exchange_info.point }}
- 积分
+ {{ $lang('point.point') }}
+{{ $lang('common.currencySymbol') }}
{{ orderPaymentData.exchange_info.price }}
@@ -204,8 +204,8 @@
diff --git a/pages_promotion/point/public/js/payment.js b/pages_promotion/point/public/js/payment.js
index c0d7cbd..fdd5893 100644
--- a/pages_promotion/point/public/js/payment.js
+++ b/pages_promotion/point/public/js/payment.js
@@ -92,7 +92,7 @@ export default {
uni.removeStorageSync("pay_flag");
} else {
this.$util.showToast({
- title: '未获取到创建订单所需数据!'
+ title: this.$lang('point.notGetData')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
@@ -119,7 +119,7 @@ export default {
if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} else {
this.$util.showToast({
- title: '未获取到创建订单所需数据!'
+ title: this.$lang('point.notGetData')
});
setTimeout(() => {
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
@@ -280,9 +280,9 @@ export default {
this.isSub = false;
if (res.data.error_code == 10 || res.data.error_code == 12) {
uni.showModal({
- title: '订单未创建',
+ title: this.$lang('common.tip'),
content: res.message,
- confirmText: '去设置',
+ confirmText: this.$lang('member.toSet'),
success: res => {
if (res.confirm) {
this.selectAddress();
@@ -309,13 +309,13 @@ export default {
if (this.orderPaymentData.is_virtual == 1) {
if (!this.orderCreateData.member_address.mobile.length) {
this.$util.showToast({
- title: '请输入您的手机号码'
+ title: this.$lang('member.inputPhone')
});
return false;
}
if (!this.$util.verifyMobile(this.orderCreateData.member_address.mobile)) {
this.$util.showToast({
- title: '请输入正确的手机号码'
+ title: this.$lang('member.inputMobileCorrect')
});
return false;
}
@@ -324,7 +324,7 @@ export default {
if (this.orderPaymentData.is_virtual == 0) {
if (!this.orderCreateData.delivery || !this.orderCreateData.delivery.delivery_type) {
this.$util.showToast({
- title: '商家未设置配送方式'
+ title: this.$lang('order.notSetDelivery')
});
return false;
}
@@ -332,7 +332,7 @@ export default {
if (this.orderCreateData.delivery.delivery_type != 'store') {
if (!this.orderCreateData.member_address) {
this.$util.showToast({
- title: '请先选择您的收货地址'
+ title: this.$lang('order.pleaseSelectAddress')
});
return false;
}
@@ -341,26 +341,26 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'store') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
- title: '没有可提货的门店,请选择其他配送方式'
+ title: this.$lang('order.noPickupStoreForDelivery')
});
return false;
}
if (!this.member_address.mobile) {
this.$util.showToast({
- title: '请输入预留手机'
+ title: this.$lang('member.reservePhone')
});
return false;
}
if (!this.$util.verifyMobile(this.member_address.mobile)) {
this.$util.showToast({
- title: '请输入正确的预留手机'
+ title: this.$lang('member.inputMobileCorrect')
});
return false;
}
if (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date) {
this.$util.showToast({
- title: '请选择自提时间'
+ title: this.$lang('order.pleaseSelectPickupTime')
});
return false;
}
@@ -369,13 +369,13 @@ export default {
if (this.orderCreateData.delivery.delivery_type == 'local') {
if (!this.orderCreateData.delivery.store_id) {
this.$util.showToast({
- title: '没有可配送的门店,请选择其他配送方式'
+ title: this.$lang('order.noDeliveryStore')
});
return false;
}
if (this.orderPaymentData.config.local.is_use && this.orderPaymentData.delivery.local.info && this.orderPaymentData.delivery.local.info.time_is_open == 1 && (!this.orderCreateData.delivery.buyer_ask_delivery_time.start_date || !this.orderCreateData.delivery.buyer_ask_delivery_time.end_date)) {
this.$util.showToast({
- title: '请选择配送时间'
+ title: this.$lang('order.pleaseSelectDeliverTime')
});
return false;
}