From 173a8edd07a35c9a380444103f0167fdd3941e08 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 9 Sep 2023 10:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             | 2 +-
 pages/oaHome/oaHome.vue             | 5 +----
 pages/otherSetting/otherSetting.vue | 2 +-
 store/modules/config.js             | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/App.vue b/App.vue
index 9f05fc1..44d36bd 100644
--- a/App.vue
+++ b/App.vue
@@ -46,7 +46,7 @@
           console.log(e);
         }
       }
-      console.log('App Launch')
+      console.log('App Launch', uni.getSystemInfoSync())
       this.$store.dispatch('initConfig');
       this.$isResolve()
       try {
diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 114c476..ee96eee 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -295,11 +295,8 @@ export default {
   },
   async onLoad () {
     await this.$onLaunched;
-    this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain
+    this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO"))?.is_captain
     this.options.data = bj;
-    // uni.$on('home_initUserInfo', (data=null)=>{
-    //   this.initUserInfo(data);
-    // });
     //#ifdef APP-PLUS
     let that = this;
     jpushModule.addNotificationListener(function (result) {
diff --git a/pages/otherSetting/otherSetting.vue b/pages/otherSetting/otherSetting.vue
index 6428a11..c81a2dc 100644
--- a/pages/otherSetting/otherSetting.vue
+++ b/pages/otherSetting/otherSetting.vue
@@ -53,7 +53,7 @@ import { destroyAccount } from '@/api/oaUser.js';
     },
     onLoad() {
       let os = uni.getSystemInfoSync();
-      this.version = 'v' + os.appVersion;
+      this.version = 'v' + (os?.appWgtVersion||os?.appVersion);
     },
     methods:{
       clickItem(e){
diff --git a/store/modules/config.js b/store/modules/config.js
index 54a7c5a..f62c827 100644
--- a/store/modules/config.js
+++ b/store/modules/config.js
@@ -58,7 +58,7 @@ const actions = {
     })
     const wgt_v = uni.getStorageSync('wgt_version')||'1.0.0';
     // 版本更新
-    if(compareVersions(res.data.version, os.appVersion||wgt_v)==1&&compareVersions(res.data.version, wgt_v)==1){
+    if(compareVersions(res.data.version, os.appWgtVersion||wgt_v)==1&&compareVersions(res.data.version, wgt_v)==1){
       try{
         let info = res.data.version_info||{};
         let version = {