From 921a2435d354dbcb844bcd391eff0019d7205bac Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sat, 26 Feb 2022 00:06:44 +0800
Subject: [PATCH] =?UTF-8?q?update:=E7=89=88=E6=9C=AC=E5=8F=B7=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue  | 2 +-
 src/pages/login/server/index.vue | 3 +--
 src/store/modules/session.ts     | 6 ++++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index ff2f5d2..318781e 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -153,7 +153,7 @@ export default class LoginPage extends BasePage {
   Version = '1.0.1';
   async update() {
     await session.QueryVersion();
-    if (this.Version != session.Version) {
+    if (this.Version < session.Version) {
       // 版本更新提示
       uni.showModal({
         content: this.$t('message.Tip1') as string,
diff --git a/src/pages/login/server/index.vue b/src/pages/login/server/index.vue
index 8ae7100..fb4090c 100644
--- a/src/pages/login/server/index.vue
+++ b/src/pages/login/server/index.vue
@@ -83,7 +83,6 @@ export default class ServerPage extends BasePage {
   }
 
   onSubmit(): void {
-    localStorage.removeItem('host');
     this.$form.validate(async (valid: boolean) => {
       if (valid) {
         const { host, port } = this.form;
@@ -99,7 +98,7 @@ export default class ServerPage extends BasePage {
           throw e;
         }
         server.setServerAddress({ address });
-        localStorage.setItem('host', host);
+        //localStorage.setItem('host', host);
         uni.showToast({
           //icon: 'success',
           title: this.$t('message.SetServerSuccessfully') as string,
diff --git a/src/store/modules/session.ts b/src/store/modules/session.ts
index 896b255..2d8e83a 100644
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@@ -6,7 +6,7 @@ import { url } from '@/utils/url';
 import { stringify } from 'query-string';
 import store from '@/store';
 import { page } from '@/utils/page';
-
+import { server } from '@/pages/login/server/model';
 export interface User {
   code?: string;
   msg?: string;
@@ -161,7 +161,9 @@ class SessionService extends VuexModule {
   //查询版本号
   @MutationAction
   async QueryVersion() {
-    const a = localStorage.getItem('host');
+    const a = server.serverAddress;
+    //const ServeUrl = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__'));
+    //const a = ServeUrl.server.address;
     console.log('a', a);
     const res: any = await request.get(a + '/sgNginxDownload/Debug/setup.json');
     const Version = res.version;