diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js
index 73f39c6..8363dbf 100644
--- a/common/js/golbalConfig.js
+++ b/common/js/golbalConfig.js
@@ -5,7 +5,7 @@ export default {
themeColor: '' //''--base-color:#fa5d14;--base-help-color:#ff7e00;'
}
},
- onLoad() {},
+ onLoad() { },
onShow() {
// 刷新多语言
this.$langConfig.refresh();
@@ -18,6 +18,10 @@ export default {
}, 50);
},
computed: {
+ // 是否是英文环境
+ isEnEnv() {
+ return uni.getStorageSync('lang') === 'en-us';
+ },
themeStyle() {
return this.$store.state.themeStyle;
},
@@ -113,11 +117,11 @@ export default {
if (this.tabBarHeight != '56px') this.themeColor += `--tab-bar-height:${this.tabBarHeight};`
Object.keys(theme).forEach(key => {
let data = theme[key];
- if (typeof(data) == "object") {
+ if (typeof (data) == "object") {
Object.keys(data).forEach(k => {
this.themeColor += '--' + k.replace(/_/g, "-") + ':' + data[k] + ';';
});
- } else if (typeof(key) == "string" && key) {
+ } else if (typeof (key) == "string" && key) {
this.themeColor += '--' + key.replace(/_/g, "-") + ':' + data + ';';
}
});
diff --git a/components-diy/diy-bargain.vue b/components-diy/diy-bargain.vue
index fa92ffe..373dd8a 100644
--- a/components-diy/diy-bargain.vue
+++ b/components-diy/diy-bargain.vue
@@ -35,7 +35,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -104,7 +104,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -149,7 +149,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/components-diy/diy-category-item.vue b/components-diy/diy-category-item.vue
index dacf555..4446591 100644
--- a/components-diy/diy-category-item.vue
+++ b/components-diy/diy-category-item.vue
@@ -88,7 +88,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -180,7 +180,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/components-diy/diy-fenxiao-goods-list.vue b/components-diy/diy-fenxiao-goods-list.vue
index eedd5d0..fbdd61f 100644
--- a/components-diy/diy-fenxiao-goods-list.vue
+++ b/components-diy/diy-fenxiao-goods-list.vue
@@ -13,7 +13,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/components-diy/diy-goods-list.vue b/components-diy/diy-goods-list.vue
index ebbfeef..5d41156 100644
--- a/components-diy/diy-goods-list.vue
+++ b/components-diy/diy-goods-list.vue
@@ -23,7 +23,7 @@
- {{ lang == 'en-us' ? item.en_goods_name : item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -131,7 +131,7 @@
- {{ lang == 'en-us' ? item.en_goods_name : item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -198,7 +198,7 @@
- {{ lang == 'en-us' ? dataItem.en_goods_name : dataItem.goods_name }}
+ {{ isEnEnv ? dataItem.en_goods_name : dataItem.goods_name }}
diff --git a/components-diy/diy-goods-recommend.vue b/components-diy/diy-goods-recommend.vue
index 26649f4..c179408 100644
--- a/components-diy/diy-goods-recommend.vue
+++ b/components-diy/diy-goods-recommend.vue
@@ -27,7 +27,7 @@
- {{ dataItem.goods_name }}
+ {{ isEnEnv ? dataItem.en_goods_name : dataItem.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/components-diy/diy-pinfan.vue b/components-diy/diy-pinfan.vue
index 717fcb7..86486c1 100644
--- a/components-diy/diy-pinfan.vue
+++ b/components-diy/diy-pinfan.vue
@@ -14,7 +14,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
不限次数
剩余{{ item.num - item.use_num }}次
diff --git a/components/ns-goods-sku/ns-goods-sku-category.vue b/components/ns-goods-sku/ns-goods-sku-category.vue
index 7cc117c..a220d93 100644
--- a/components/ns-goods-sku/ns-goods-sku-category.vue
+++ b/components/ns-goods-sku/ns-goods-sku-category.vue
@@ -9,7 +9,7 @@
- {{ goodsDetail.goods_name }}
+ {{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ? goodsDetail.en_goods_name : goodsDetail.goods_name) }}
库存{{ goodsDetail.stock }}{{ goodsDetail.unit }}
diff --git a/pages_goods/cart.vue b/pages_goods/cart.vue
index 5773890..7a8eca5 100644
--- a/pages_goods/cart.vue
+++ b/pages_goods/cart.vue
@@ -34,7 +34,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/pages_goods/detail.vue b/pages_goods/detail.vue
index 6e7048c..fe50330 100644
--- a/pages_goods/detail.vue
+++ b/pages_goods/detail.vue
@@ -84,7 +84,7 @@
- {{ goodsSkuDetail.goods_name }}
+ {{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}
{{ goodsSkuDetail.introduction }}
@@ -235,7 +235,7 @@
{{ goodsSkuDetail.price }}
- {{ goodsSkuDetail.goods_name }}
+ {{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}
@@ -280,7 +280,7 @@
{{ goodsSkuDetail.price }}
- {{ goodsSkuDetail.goods_name }}
+ {{ isEnEnv ? goodsSkuDetail.en_goods_name : goodsSkuDetail.goods_name }}
diff --git a/pages_goods/list.vue b/pages_goods/list.vue
index 80dcea0..3f0b152 100644
--- a/pages_goods/list.vue
+++ b/pages_goods/list.vue
@@ -52,17 +52,7 @@
-
-
- {{ item.en_goods_name }}
-
-
- {{ item.goods_name }}
-
-
-
- {{ item.goods_name }}
-
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -148,7 +138,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
index f326efd..31146fb 100644
--- a/pages_promotion/fenxiao/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -70,7 +70,7 @@
{{ goodsTag(item) }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
{{ $lang('common.currencySymbol') }}
@@ -107,7 +107,7 @@
{{ goodsTag(item) }}
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
{{ $lang('common.currencySymbol') }}
{{ item.market_price > 0 ? item.market_price : item.price }}
diff --git a/pages_promotion/merch/detail.vue b/pages_promotion/merch/detail.vue
index ac3ba0c..ac7dd4a 100644
--- a/pages_promotion/merch/detail.vue
+++ b/pages_promotion/merch/detail.vue
@@ -68,7 +68,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
@@ -154,7 +154,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}
diff --git a/pages_promotion/point/detail.vue b/pages_promotion/point/detail.vue
index a418a7f..0d541b0 100644
--- a/pages_promotion/point/detail.vue
+++ b/pages_promotion/point/detail.vue
@@ -42,7 +42,7 @@
- {{ pointInfo.goods_name }}
+ {{ isEnEnv ? pointInfo.en_goods_name : pointInfo.goods_name }}
{{ pointInfo.name }}
diff --git a/pages_tool/components/ns-chat/ns-chat-goods.vue b/pages_tool/components/ns-chat/ns-chat-goods.vue
index cfc0cea..0985de9 100644
--- a/pages_tool/components/ns-chat/ns-chat-goods.vue
+++ b/pages_tool/components/ns-chat/ns-chat-goods.vue
@@ -1,9 +1,9 @@
-
+
- {{ goodsInfo.sku_name ? goodsInfo.sku_name : goodsInfo.goods_name }}
+ {{ goodsInfo.sku_name ? goodsInfo.sku_name : (isEnEnv ? goodsInfo.en_goods_name : goodsInfo.goods_name) }}
¥
@@ -16,7 +16,7 @@
- {{ goodsDetail.sku_name ? goodsDetail.sku_name : goodsDetail.goods_name }}
+ {{ goodsDetail.sku_name ? goodsDetail.sku_name : (isEnEnv ? goodsDetail.en_goods_name : goodsDetail.goods_name) }}
¥
diff --git a/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue b/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
index ee2d4f6..ce09d2b 100644
--- a/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
+++ b/pages_tool/components/ns-chat/ns-chat-receiveGoods.vue
@@ -3,7 +3,7 @@
- {{ goodsInfo.goods_name }}
+ {{ isEnEnv ? goodsInfo.en_goods_name : goodsInfo.goods_name }}
库存:{{ goodsInfo.stock }}
销量:{{ goodsInfo.sale_num }}
diff --git a/pages_tool/member/footprint.vue b/pages_tool/member/footprint.vue
index c400c71..f0a2aa8 100644
--- a/pages_tool/member/footprint.vue
+++ b/pages_tool/member/footprint.vue
@@ -19,7 +19,7 @@
- {{ item.goods_name }}
+ {{ isEnEnv ? item.en_goods_name : item.goods_name }}