From 13567fcb3d1494e34a971cd4bafafd739245a36f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 29 Jun 2022 18:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/extra/AppAuth/AppAuth.vue            |  2 +-
 .../AppPartyOrganization.vue                  |  2 +-
 src/mods/party/AppThreeSessions/qrcode.vue    | 19 ++++++++++---------
 src/project/sanjianxi/AppAuth/AppAuth.vue     |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/mods/extra/AppAuth/AppAuth.vue b/src/mods/extra/AppAuth/AppAuth.vue
index b0a5428..97a36bf 100644
--- a/src/mods/extra/AppAuth/AppAuth.vue
+++ b/src/mods/extra/AppAuth/AppAuth.vue
@@ -69,7 +69,7 @@ export default {
       }).then(res => {
         if (res.code == 0) {
           if (res.data == 2 || res.data == 0) {
-            this.$store.commit('getUserInfo')
+            this.$store.dispatch('getUserInfo')
             uni.redirectTo({
               url: `./authSuccess?status=${res.data}`, success: () => {
                 if (res.data == 0) {
diff --git a/src/mods/party/AppPartyOrganization/AppPartyOrganization.vue b/src/mods/party/AppPartyOrganization/AppPartyOrganization.vue
index 71ad7f0..886cfa2 100644
--- a/src/mods/party/AppPartyOrganization/AppPartyOrganization.vue
+++ b/src/mods/party/AppPartyOrganization/AppPartyOrganization.vue
@@ -139,7 +139,7 @@ export default {
         if (res?.code == 0) {
           this.$toast('党组织变更成功')
           this.getUserInfo()
-          this.$store.commit("getUserInfo")
+          this.$store.dispatch("getUserInfo")
         }
       })
     },
diff --git a/src/mods/party/AppThreeSessions/qrcode.vue b/src/mods/party/AppThreeSessions/qrcode.vue
index c64e316..7f55291 100644
--- a/src/mods/party/AppThreeSessions/qrcode.vue
+++ b/src/mods/party/AppThreeSessions/qrcode.vue
@@ -13,6 +13,8 @@
   </div>
 </template>
 <script>
+import {mapActions, mapState} from "vuex"
+
 export default {
   data() {
     return {
@@ -24,6 +26,9 @@ export default {
       isSign: true
     };
   },
+  computed: {
+    ...mapState(['user']),
+  },
   onShow() {
     uni.setNavigationBarColor({
       frontColor: "#ffffff",
@@ -32,7 +37,10 @@ export default {
     if (uni.getStorageSync('token')) {
       this.meetingId = this.$mp.query.scene
       // this.meetingId = 'c29aacb54f074c14ab93532e384a6daa'
-      this.getUserInfo()
+      this.getUserInfo().then(() => {
+        this.userId = this.user.id
+        this.getDetailInfo()
+      })
     } else {
       uni.showModal({
         title: '提示',
@@ -50,14 +58,7 @@ export default {
     }
   },
   methods: {
-    getUserInfo() {
-      this.$store.commit("getUserInfo", v => {
-        if (v) {
-          this.userId = res.data.id
-          this.getDetailInfo()
-        }
-      })
-    },
+    ...mapActions(['getUserInfo']),
     getDetailInfo() {
       this.$instance.post(`/app/appthreemeetinguser/queryWeathersignByMeetingIdAndUserIdForWX?meetingId=${this.meetingId}&userId=${this.userId}`, null, {}).then(res => {
         if (res.data) {
diff --git a/src/project/sanjianxi/AppAuth/AppAuth.vue b/src/project/sanjianxi/AppAuth/AppAuth.vue
index b0a5428..97a36bf 100644
--- a/src/project/sanjianxi/AppAuth/AppAuth.vue
+++ b/src/project/sanjianxi/AppAuth/AppAuth.vue
@@ -69,7 +69,7 @@ export default {
       }).then(res => {
         if (res.code == 0) {
           if (res.data == 2 || res.data == 0) {
-            this.$store.commit('getUserInfo')
+            this.$store.dispatch('getUserInfo')
             uni.redirectTo({
               url: `./authSuccess?status=${res.data}`, success: () => {
                 if (res.data == 0) {