Prechádzať zdrojové kódy

新增 版本检测

wzh 3 rokov pred
rodič
commit
40b8adffdc

+ 21 - 1
miniprogram/app.js

@@ -3,7 +3,6 @@ import {
 } from "./utils/wxUtils"
 App({
   onLaunch: function () {
-    wxSetSessionKey()
     const updateManager = wx.getUpdateManager()
 
     updateManager.onCheckForUpdate(function (res) {
@@ -35,4 +34,25 @@ App({
       maintab: 1
     }
   },
+  onShow() {
+    this.checkEnvVersion()
+  },
+  checkEnvVersion() {
+    let v = wx.getAccountInfoSync()
+    let appVersion = wx.getStorageSync('appVersion')
+    let {
+      envVersion
+    } = v.miniProgram
+    if (appVersion != envVersion) {
+      wx.clearStorage({
+        success: (res) => {
+          wx.setStorageSync('appVersion', envVersion)
+          wx.redirectTo({
+            url: '/pages/index/index',
+          })
+        },
+      })
+    }
+    wxSetSessionKey()
+  }
 })

+ 7 - 0
miniprogram/pages/index/index.js

@@ -38,6 +38,13 @@ Page({
     this.getIndexInfo()
   },
   goTo(e) {
+    if (!wx.getStorageSync('loginAccountId')) {
+      wx.showToast({
+        title: '请登录!',
+        icon: "error"
+      })
+      return
+    }
     let {
       url,
       maintab

+ 12 - 18
miniprogram/pages/me/me.js

@@ -81,28 +81,22 @@ Page({
     }
   },
   onLoad() {
-    let proxyCompanyName = wx.getStorageSync('proxyCompanyName')
-    let loginName = wx.getStorageSync('loginName')
-    let loginPhone = wx.getStorageSync('loginPhone')
-    let proxyCompanyId = wx.getStorageSync('proxyCompanyId')
-    let proxyId = wx.getStorageSync('proxyId')
-    let proxyCompany = wx.getStorageSync('proxyCompany')
-    let voyageNum = wx.getStorageSync('voyageNum')
-    let shipOwnerNum = wx.getStorageSync('shipOwnerNum')
-    this.setData({
-      proxyCompanyName,
-      loginName,
-      loginPhone,
-      proxyCompanyId,
-      proxyId,
-      proxyCompany,
-      voyageNum,
-      shipOwnerNum
-    })
+
   },
   onShow() {
     if (wx.getStorageSync('loginAccountId')) {
       this.getCargoOwnerInfo()
+    } else {
+      this.setData({
+        proxyCompanyName: '',
+        loginName: '',
+        loginPhone: '',
+        proxyCompanyId: '',
+        proxyId: '',
+        proxyCompany: '',
+        voyageNum: '',
+        shipOwnerNum: ''
+      })
     }
   }
 })

+ 4 - 0
miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.js

@@ -13,6 +13,10 @@ Page({
   },
   async getShipOwnerList(type) {
     if (!wx.getStorageSync('loginAccountId')) {
+      this.setData({
+        shipOwnerList: [],
+        currentLetter: ''
+      })
       wx.showToast({
         title: '尚未登录',
         icon: "error"

+ 1 - 1
miniprogram/pages/voyageManage/voyageManage.js

@@ -22,7 +22,7 @@ Page({
     total: 0,
     term: "",
     isFreshing: false,
-    apiArr: ['/voyage/list', '/dayReport/list', '/bill/list']
+    apiArr: ['/voyage/wx/list', '/dayReport/list', '/bill/list']
   },
   selectCargoOwner(e) {
     this.setData({