版本更新修改

src/i18n/lang/cn.ts

@@ -10,6 +10,7 @@ export default {
     Cancel: '取消',
     LoginSuccessful: '登录成功',
     Loading: '加载中',
+    uploading: '正在下载中........',
     request_Tip1: '请求错误',
     request_Tip2: '未授权，请登录',
     request_Tip3: '拒绝访问',

src/i18n/lang/en.ts

@@ -10,6 +10,7 @@ export default {
     Cancel: 'Cancel',
     LoginSuccessful: 'Login success',
     Loading: 'Loading',
+    uploading: 'Downloading now........',
     request_Tip1: 'Request error',
     request_Tip2: 'Unauthorize, please log in',
     request_Tip3: 'Access denied',

src/pages/login/login/index.vue

@@ -86,6 +86,8 @@ import { session } from '@/store/modules/session';
 import { BasePage } from '@/components/base/page';
 import { VForm } from 'vue/types/form';
 import { Lang } from '@/i18n';
+import vm from '@/main';
+import checkAppUpdate from '@/plugins/app-update';
 // mixin 引入示例目前用于弹窗自定义
 // import { any } from 'lodash/fp';
 
@@ -147,12 +149,12 @@ export default class LoginPage extends BasePage {
     this.$form.setRules(this.rules);
     //this.update();
     console.log('image', this.image);
-    console.log("Version////",this.Version);
+    console.log('Version////', this.Version);
   }
   Version = '1.0.0';
   async update() {
     await session.QueryVersion();
-    if (this.Version != session.Version) {
+    if (this.Version == session.Version) {
       // 版本更新提示
       uni.showModal({
         content: this.$t('message.Tip1') as string,
@@ -162,69 +164,33 @@ export default class LoginPage extends BasePage {
           if (res.confirm) {
             //确定执行下载
             let downloadApkUrl = session.url;
+            uni.showLoading({
+              title: vm.$t('message.uploading') as string,
+              //title: '正在下载中..........',
+            });
             ////////////////uni下载方法,
             uni.downloadFile({
               url: downloadApkUrl,
               success: (downloadResult) => {
-                //uni.hideLoading();
+                uni.hideLoading();
                 if (downloadResult.statusCode == 200) {
                   //安装更新
                   plus.runtime.install(downloadResult.tempFilePath as any, { force: true }, function () {
                     //uni.showToast('更新成功，重启');
                     plus.runtime.restart();
                   });
-                  // uni.showModal({
-                  //   //content: '更新更新',
-                  //   content: this.$t('message.Tip2') as string,
-                  //   confirmText: this.$t('message.restart') as string,
-                  //   cancelText: this.$t('message.Cancel') as string,
-                  //   success: function (res) {
-                  //     if (res.confirm == true) {
-                  //       plus.runtime.install(downloadResult.tempFilePath, { force: true }, function (res) {
-                  //         //uni.showToast('更新成功，重启');
-                  //         plus.runtime.restart();
-                  //       });
-                  //     }
-                  //   },
-                  // });
                 }
               },
             });
-            ///////////////////// plus方法
+          } else {
-            // plus.downloader
-            //   .createDownload(downloadApkUrl, {}, function (d, status) {
-            //    uni.showModal({
-            //      content: status,
-            //    });
-            //     if (status == 200) {
-            //     uni.showModal({
-            //         title: '',
-            //         content: this.$t('message.Tip2') as string,
-            //         confirmText: this.$t('message.restart') as string,
-            //         cancelText: this.$t('message.Cancel') as string,
-            //         success: function (res) {
-            //           if (res.confirm == true) {
-            //             plus.runtime.install(plus.io.convertLocalFileSystemURL(d.filename), { force: true }, function (res) {
-            //               //uni.showToast('更新成功，重启');
-            //               plus.runtime.restart();
-            //             });
-            //           }
-            //         },
-            //       });
-            //     } else {
-            //       console.log('Download failed: ' + status);
-            //     }
-            //   })
-            //   .start();
-            // dtask.start();
-            /////////////////plus 方法
-          } else if (res.cancel) {
-            //console.log('用户点击取消');
-          }
-        },
-      });
-    }
             //return;
+            console.log("1111111");
+          }
+        },
+      });
+      return;
+    }
+    this.go();
   }
   /////////////////无用代码无用代码
   // 更新应用资源
@@ -260,18 +226,7 @@ export default class LoginPage extends BasePage {
     }, 1500);
   }
   ////////////////////////////
-  login(): void {
+  async go() {
-    this.$form.validate(async (valid: boolean) => {
-      if (valid) {
-        if (!server.isServerAddressSet) {
-          await uni.showToast({
-            icon: 'none',
-            title: this.$t('message.Tip') as string,
-          });
-          setTimeout(() => {
-            uni.navigateTo({ url: page.login.server });
-          }, 2000);
-        } else {
     const { username, password } = this.form;
     const loginResult = await session.login({
       username,
@@ -293,12 +248,52 @@ export default class LoginPage extends BasePage {
       icon: 'success',
       title: this.$t('message.LoginSuccessful') as string,
     });
-          //debugger;
-          // this.update();
     uni.navigateTo({
       url: page.login.area,
     });
   }
+
+  login(): void {
+    this.$form.validate(async (valid: boolean) => {
+      if (valid) {
+        if (!server.isServerAddressSet) {
+          await uni.showToast({
+            icon: 'none',
+            title: this.$t('message.Tip') as string,
+          });
+          setTimeout(() => {
+            uni.navigateTo({ url: page.login.server });
+          }, 2000);
+        } else {
+          //checkAppUpdate();
+          this.update();
+          //const { username, password } = this.form;
+          // const loginResult = await session.login({
+          //   username,
+          //   password,
+          //   lang: this.$i18n.locale as Lang,
+          // });
+          // const { code, factoryCode, list, loginName, msg, userId, userName } = loginResult;
+          // session.setUser({
+          //   code,
+          //   factoryCode,
+          //   loginName,
+          //   list,
+          //   msg,
+          //   userId,
+          //   userName,
+          //   lang: this.$i18n.locale as Lang,
+          // });
+          // uni.showToast({
+          //   icon: 'success',
+          //   title: this.$t('message.LoginSuccessful') as string,
+          // });
+          // //debugger;
+          // // this.update();
+          // uni.navigateTo({
+          //   url: page.login.area,
+          // });
+        }
       }
     });
   }

src/store/modules/session.ts

@@ -163,7 +163,8 @@ class SessionService extends VuexModule {
   async QueryVersion() {
     let res: any = await request.get('http://seamom.haier.net/sgNginxDownload/Debug/setup.json');
     let Version = res.version;
-    let url = res.url + res.file;
+    let url = res.url + '/' + res.file;
+    console.log("url..........", url);
     return { Version, url };
   }
   //直接下载