Merge branch 'master' of https://git.haier.net/Overseas_WMS/hgwms-factory-app

# Conflicts:
#	src/pages/login/login/index.vue

src/pages/login/login/index.vue

@@ -150,45 +150,50 @@ export default class LoginPage extends BasePage {
     console.log('image', this.image);
     console.log('Version////', this.Version);
   }
-  Version = '1.0.0';
+  Version = '1.0.2';
   async update() {
-    await session.QueryVersion();
+    try {
-    if (this.Version < session.Version) {
+      await session.QueryVersion();
-      // 版本更新提示
+      if (this.Version < session.Version) {
-      uni.showModal({
+        // 版本更新提示
-        content: this.$t('message.Tip1') as string,
+        uni.showModal({
-        confirmText: this.$t('message.workArea_Confirm') as string,
+          content: this.$t('message.Tip1') as string,
-        cancelText: this.$t('message.Cancel') as string,
+          confirmText: this.$t('message.workArea_Confirm') as string,
-        showCancel: false,
+          cancelText: this.$t('message.Cancel') as string,
-        success: (res) => {
+          showCancel: false,
-          if (res.confirm) {
+          success: (res) => {
-            //确定执行下载
+            if (res.confirm) {
-            let downloadApkUrl = session.url;
+              //确定执行下载
-            uni.showLoading({
+              let downloadApkUrl = session.url;
-              title: vm.$t('message.uploading') as string,
+              uni.showLoading({
-              //title: '正在下载中..........',
+                title: vm.$t('message.uploading') as string,
-            });
+                //title: '正在下载中..........',
-            ////////////////uni下载方法,
+              });
-            uni.downloadFile({
+              ////////////////uni下载方法,
-              url: downloadApkUrl,
+              uni.downloadFile({
-              success: (downloadResult) => {
+                url: downloadApkUrl,
-                uni.hideLoading();
+                success: (downloadResult) => {
-                if (downloadResult.statusCode == 200) {
+                  uni.hideLoading();
-                  //安装更新
+                  if (downloadResult.statusCode == 200) {
-                  plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
+                    //安装更新
-                    //uni.showToast('更新成功，重启');
+                    plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
-                    plus.runtime.restart();
+                      //uni.showToast('更新成功，重启');
-                  });
+                      plus.runtime.restart();
-                }
+                    });
-              },
+                  }
-            });
+                },
-          } else if (res.cancel) {
+              });
-            this.go();
+            } else if (res.cancel) {
-          }
+              this.go();
-        },
+            }
-      });
+          },
-      return;
+        });
+        return;
+      }
+    } catch (e) {
+      console.log('error', e);
     }
+
     this.go();
   }
   /////////////////无用代码无用代码