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,8 +150,9 @@ 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() {
+    try {
       await session.QueryVersion();
       if (this.Version < session.Version) {
         // 版本更新提示
@@ -189,6 +190,10 @@ export default class LoginPage extends BasePage {
         });
         return;
       }
+    } catch (e) {
+      console.log('error', e);
+    }
+
     this.go();
   }
   /////////////////无用代码无用代码