From 2c4e83a19bbe6cc4c95f226f08ffb0dee6962ded Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 3 Jan 2023 17:13:48 +0800
Subject: [PATCH] BUG 22

---
 src/project/fengdu/AppVote/AppVote.vue                |  8 ++++----
 .../fengdu/AppVote/{ => component}/weixinLogin.vue    | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename src/project/fengdu/AppVote/{ => component}/weixinLogin.vue (93%)

diff --git a/src/project/fengdu/AppVote/AppVote.vue b/src/project/fengdu/AppVote/AppVote.vue
index af76a6b4..f9440f77 100644
--- a/src/project/fengdu/AppVote/AppVote.vue
+++ b/src/project/fengdu/AppVote/AppVote.vue
@@ -17,13 +17,13 @@
       <u-parse :html="detail.ending"/>
     </AiGroup>
     <u-gap height="160"/>
-    <weixin-login :autoShow="!user.token||wxLogin" content="投票需要您授权您的微信信息" @login="getList"/>
+    <weixin-login :autoShow="!user.token" :visible.sync="wxLogin" content="投票需要您授权您的微信信息" @login="getList"/>
   </section>
 </template>
 
 <script>
 import {mapState} from "vuex"
-import WeixinLogin from "./weixinLogin";
+import WeixinLogin from "./component/weixinLogin";
 
 export default {
   name: "AppVote",
@@ -33,7 +33,7 @@ export default {
     return {
       detail: {},
       list: [],
-      wxLogin: false
+      wxLogin: 0
     }
   },
   computed: {
@@ -60,7 +60,7 @@ export default {
       })
     },
     handleDetail(id) {
-      if (!this.user.token) this.wxLogin = true
+      if (!this.user.token) this.wxLogin++
       else uni.navigateTo({url: './voteDetail?id=' + id})
     }
   },
diff --git a/src/project/fengdu/AppVote/weixinLogin.vue b/src/project/fengdu/AppVote/component/weixinLogin.vue
similarity index 93%
rename from src/project/fengdu/AppVote/weixinLogin.vue
rename to src/project/fengdu/AppVote/component/weixinLogin.vue
index 95dfa3f7..3625491b 100644
--- a/src/project/fengdu/AppVote/weixinLogin.vue
+++ b/src/project/fengdu/AppVote/component/weixinLogin.vue
@@ -12,7 +12,8 @@ export default {
   name: "weixinLogin",
   props: {
     content: {default: "是否要进行微信授权?"},
-    autoShow: Boolean
+    autoShow: Boolean,
+    visible: {default: ""}
   },
   computed: {
     ...mapState(['user']),
@@ -20,8 +21,7 @@ export default {
   },
   data() {
     return {
-      show: false,
-      appid: ""
+      show: false
     }
   },
   methods: {
@@ -50,7 +50,7 @@ export default {
           }
         }), 500)
       })
-    }
+    },
   },
   watch: {
     autoShow: {
@@ -58,6 +58,9 @@ export default {
       handler(v) {
         this.wxCode ? this.autoLogin() : this.show = !!v
       }
+    },
+    visible(v) {
+      this.show = !!v
     }
   }
 }