Merge branch 'master' of https://git.haier.net/Overseas_WMS/hgwms-factory-app

src/pages/login/login/index.vue

@@ -9,7 +9,7 @@
     </view>
     <view class="logo">
       <u-image width="288rpx" height="85rpx" :src="image.global.logo1"></u-image>
-      <span>V1.6</span>
+      <span>V{{ Version }}</span>
     </view>
     <u-form class="form" :model="form" ref="form" :border-bottom="false" :error-type="['toast']">
       <u-form-item

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,

src/pages/raw/handover/aggregating/index.vue

@@ -2,7 +2,7 @@
   <view class="page-raw-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.Summary_Query') }}</view>
       <view class="right"></view>
@@ -135,7 +135,7 @@
           <u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button>
         </u-col>
         <u-col :span="3">
-          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -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;

src/pages/raw/handover/picking/index.vue

@@ -2,7 +2,7 @@
   <view class="page-raw-receipt">
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.Pi_PickingQuery') }}</view>
       <view class="right"></view>
@@ -43,7 +43,7 @@
           <u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button>
         </u-col>
         <u-col :span="3">
-          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -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;

src/store/modules/session.ts

@@ -161,7 +161,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);