From 29bf3b4db0d536c1b782da42664c7f077ed846da Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 25 Feb 2022 14:37:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E8=AF=B7=E6=B1=82=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/server/index.vue | 2 ++ src/store/modules/session.ts | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/login/server/index.vue b/src/pages/login/server/index.vue index 79d2c1e..8359008 100644 --- a/src/pages/login/server/index.vue +++ b/src/pages/login/server/index.vue @@ -83,6 +83,7 @@ export default class ServerPage extends BasePage { } onSubmit(): void { + localStorage.removeItem('host'); this.$form.validate(async (valid: boolean) => { if (valid) { const { host, port } = this.form; @@ -98,6 +99,7 @@ export default class ServerPage extends BasePage { throw e; } server.setServerAddress({ address }); + 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 1edc8ea..5f1810c 100644 --- a/src/store/modules/session.ts +++ b/src/store/modules/session.ts @@ -160,7 +160,9 @@ class SessionService extends VuexModule { //查询版本号 @MutationAction async QueryVersion() { - const res: any = await request.get('https://seamom.haier.net/sgNginxDownload/Debug/setup.json'); + const a = localStorage.getItem('host'); + console.log('a', a); + const res: any = await request.get(a + '/sgNginxDownload/Debug/setup.json'); const Version = res.version; const url = res.url + '/' + res.file; console.log('url..........', url); From 753cb183960f58c24a477ed7b7916bdacf6c2ef8 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 25 Feb 2022 17:33:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=E7=99=BB=E5=BD=95=E9=A1=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=AC=E6=AC=A1=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index d40b3f3..82dedc9 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -9,7 +9,7 @@ Date: Fri, 25 Feb 2022 17:35:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update:=E8=A7=A3=E5=86=B3=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A4=B4=E9=83=A8=E6=9C=89=E7=A9=BA=E7=99=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/handover/aggregating/index.vue | 9 +++++---- src/pages/raw/handover/picking/index.vue | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index 7ff0f4c..ff8b161 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -2,7 +2,7 @@ - + {{ $t('message.Summary_Query') }} @@ -135,7 +135,7 @@ {{ $t('message.dn_Confirm') }} - {{ $t('message.po_Return') }} + {{ $t('message.po_Return') }} @@ -295,12 +295,13 @@ export default class Aggregating extends BasePage { .header { position: fixed; - top: 36rpx; + top: 0rpx; + padding-top: 12rpx; left: 0; right: 0; z-index: 99; display: flex; - height: 88rpx; + height: 100rpx; line-height: 88rpx; color: #fff; font-size: 34rpx; diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue index 3439aa9..e47d608 100644 --- a/src/pages/raw/handover/picking/index.vue +++ b/src/pages/raw/handover/picking/index.vue @@ -2,7 +2,7 @@ - + {{ $t('message.Pi_PickingQuery') }} @@ -43,7 +43,7 @@ {{ $t('message.dn_Confirm') }} - {{ $t('message.po_Return') }} + {{ $t('message.po_Return') }} @@ -218,12 +218,13 @@ export default class pickingDom extends BasePage { .header { position: fixed; - top: 36rpx; + top: 0rpx; + padding-top: 12rpx; left: 0; right: 0; z-index: 99; display: flex; - height: 88rpx; + height: 100rpx; line-height: 88rpx; color: #fff; font-size: 34rpx;