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;