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 }}