diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue index a1e85814..6b7c1308 100644 --- a/components/goods-buy/goods-buy.vue +++ b/components/goods-buy/goods-buy.vue @@ -182,15 +182,11 @@ is_success_tips: is_success_tips, }); - // 是否初始化 - var is_init = (params.is_init == undefined || params.is_init) == 1 ? 1 : 0; - if (is_init == 1) { - // 不能选择规格处理 - this.spec_handle_dont(0, 1); - } else { - // 获取规格详情 - this.get_spec_detail(); - } + // 初始化不能选择规格处理 + this.spec_handle_dont(0, 1); + + // 获取规格详情 + this.get_spec_detail(); // 规格选中处理 this.selected_spec_handle(); diff --git a/lang/en.json b/lang/en.json index 573c1614..17d53b63 100644 --- a/lang/en.json +++ b/lang/en.json @@ -288,7 +288,6 @@ "x0nxxf": "Protocol URL address is incorrect", "05h35f": "Loading", "d76tgh": "If it is not automatically loaded, please manually click load!", - "4835p5": "Failed to call login SDK", "li9573": "Login method not processed" } }, diff --git a/lang/zh.json b/lang/zh.json index aaa9b4a0..45970850 100644 --- a/lang/zh.json +++ b/lang/zh.json @@ -280,7 +280,6 @@ "wysg7k": "请设置密码", "4wc3hr": "协议类型有误", "x0nxxf": "协议url地址有误", - "4835p5": "调用登录SDK失败", "li9573": "登录方式未处理" } }, diff --git a/pages/about/about.vue b/pages/about/about.vue index 2f599107..6f2238e9 100644 --- a/pages/about/about.vue +++ b/pages/about/about.vue @@ -5,7 +5,9 @@ {{title}} + {{app_version_info}} + {{describe}} {{ $t('login.login.2v11we') }} @@ -13,6 +15,7 @@ + Copyright 2018-{{year}} by {{title}} @@ -25,7 +28,8 @@ logo: app.globalData.get_application_logo_square(), title: app.globalData.get_application_title(), describe: app.globalData.get_application_describe(), - app_version_info: app.globalData.data.app_version_info + app_version_info: app.globalData.data.app_version_info, + year: (new Date()).getFullYear(), }; }, diff --git a/pages/login/login.vue b/pages/login/login.vue index cf1f39ee..412c942d 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1566,7 +1566,7 @@ ); }, fail: function (error) { - app.globalData.showToast(error.errMsg || this.$t('login.login.4835p5')); + app.globalData.showToast(error.errMsg+'('+error.code+')'); }, }); break; @@ -1590,7 +1590,7 @@ ); }, fail: function (error) { - app.globalData.showToast(error.errMsg || this.$t('login.login.4835p5')); + app.globalData.showToast(error.errMsg+'('+error.code+')'); }, }); break; diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue index eae806d3..154bdd86 100644 --- a/pages/setup/setup.vue +++ b/pages/setup/setup.vue @@ -85,11 +85,9 @@ {{ $t('setup.setup.11k15d') }} {{ $t('setup.setup.48r261') }} - {{ $t('setup.setup.tghrf2') }} -