商品购买，单规格库存处理

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();

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

lang/zh.json

@@ -280,7 +280,6 @@
 			"wysg7k": "请设置密码",
 			"4wc3hr": "协议类型有误",
 			"x0nxxf": "协议url地址有误",
-			"4835p5": "调用登录SDK失败",
 			"li9573": "登录方式未处理"
 		}
 	},

pages/about/about.vue

@@ -5,7 +5,9 @@
                 <view class="padding-vertical-xxl">
                     <image class="logo circle br-f5 padding-sm dis-block auto margin-top-xl" :src="logo" mode="aspectFill"></image>
                     <view class="margin-top-sm text-size">{{title}}</view>
+                    <!-- #ifdef APP -->
                     <view class="margin-top-sm cr-grey-9">{{app_version_info}}</view>
+                    <!-- #endif -->
                     <view class="margin-top-xxl cr-base text-size-sm">{{describe}}</view>
                     <view class="margin-top-xxxxl padding-vertical-xxxxl">
                         <text class="cp cr-blue margin-right" data-value="userregister" @tap="agreement_event">{{ $t('login.login.2v11we') }}</text>
@@ -13,6 +15,7 @@
                     </view>
                 </view>
             </view>
+            <view class="margin-top cr-grey-c">Copyright 2018-{{year}} by {{title}}</view>
         </view>
     </view>
 </template>
@@ -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(),
             };
         },
 

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;

pages/setup/setup.vue

@@ -85,11 +85,9 @@
                     <text>{{ $t('setup.setup.11k15d') }}</text>
                     <text class="fr cr-grey">{{ $t('setup.setup.48r261') }}</text>
                 </view>
-                <!-- #ifdef APP -->
                 <view class="item padding-vertical-xxl padding-right-xxxl arrow-right" data-value="/pages/about/about" @tap="url_event">
                     <text>{{ $t('setup.setup.tghrf2') }}</text>
                 </view>
-                <!-- #endif -->
             </view>
 
             <!-- 打开语言选择弹层-->