From 04664e58b30d9df4e695c57e39cf6aab4dda3b32 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 3 Jan 2023 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=86=8D=E6=AC=A1=E5=A4=A7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppVote/AppVote.vue    |  8 ++++---
 src/project/fengdu/AppVote/voteDetail.vue | 29 ++++++++---------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/project/fengdu/AppVote/AppVote.vue b/src/project/fengdu/AppVote/AppVote.vue
index c373c8fc..af76a6b4 100644
--- a/src/project/fengdu/AppVote/AppVote.vue
+++ b/src/project/fengdu/AppVote/AppVote.vue
@@ -17,7 +17,7 @@
       <u-parse :html="detail.ending"/>
     </AiGroup>
     <u-gap height="160"/>
-    <weixin-login :autoShow="!user.token" content="投票需要您授权您的微信信息" @login="getList"/>
+    <weixin-login :autoShow="!user.token||wxLogin" content="投票需要您授权您的微信信息" @login="getList"/>
   </section>
 </template>
 
@@ -32,7 +32,8 @@ export default {
   data() {
     return {
       detail: {},
-      list: []
+      list: [],
+      wxLogin: false
     }
   },
   computed: {
@@ -59,7 +60,8 @@ export default {
       })
     },
     handleDetail(id) {
-      uni.navigateTo({url: './voteDetail?id=' + id})
+      if (!this.user.token) this.wxLogin = true
+      else uni.navigateTo({url: './voteDetail?id=' + id})
     }
   },
   onShow() {
diff --git a/src/project/fengdu/AppVote/voteDetail.vue b/src/project/fengdu/AppVote/voteDetail.vue
index 82a380f7..bd26bc47 100644
--- a/src/project/fengdu/AppVote/voteDetail.vue
+++ b/src/project/fengdu/AppVote/voteDetail.vue
@@ -10,27 +10,22 @@
         <div class="text circle mar-l16" :class="{disabled:canotVote}" @click="handleVote">投票</div>
       </div>
     </AiBottomBtn>
-    <weixin-login :autoShow="showWxLogin" @login="handleVote"/>
   </section>
 </template>
 
 <script>
 import {mapState} from "vuex"
-import WeixinLogin from "./weixinLogin";
 
 export default {
   name: "voteDetail",
-  components: {WeixinLogin},
   appName: "投票详情",
   computed: {
     ...mapState(['user']),
-    wxCode: v => v.$route.query.code,
     canotVote: v => !!v.user.token && v.detail.isVote == '0'
   },
   data() {
     return {
       detail: {},
-      showWxLogin: false
     }
   },
   methods: {
@@ -44,20 +39,16 @@ export default {
       })
     },
     handleVote() {
-      if (!this.user.token) {//未登录,获取openId和token
-        this.showWxLogin = true
-      } else {//已登录,直接投票
-        if (!this.canotVote) {
-          const {id} = this.$route.query
-          this.$http.post("/app/appvideovoteinfo/voteByVideoId", null, {
-            params: {id}
-          }).then(res => {
-            if (res?.code == 0) {
-              this.$u.toast("投票成功!")
-              this.getDetail()
-            } else if (res?.msg) this.$u.toast(res.msg)
-          })
-        }
+      if (!this.canotVote) {
+        const {id} = this.$route.query
+        this.$http.post("/app/appvideovoteinfo/voteByVideoId", null, {
+          params: {id}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$u.toast("投票成功!")
+            this.getDetail()
+          }
+        }).catch(err => this.$u.toast(err || "投票失败!"))
       }
     },
   },