Merge branch 'dev'

src/components/votButton.vue

@@ -1,73 +1,59 @@
 <template>
 
-    <div class="votbg" @click="vote()">
-        <div>{{ text }}</div>
-   </div>
+  <div class="votbg" @click="vote()">
+    <div>{{ text }}</div>
+  </div>
 
 </template>
-<script setup >
-import {goAuth}from '@/utils/authorize.js';
+<script setup>
+import { goAuth } from '@/utils/authorize.js';
 const props = defineProps({
- text: {  
-   type: String,  
-  
- }, 
+  text: {
+    type: String,
+
+  },
 
 
-});  
-const emits = defineEmits(["vote-click"]); 
+});
+const emits = defineEmits(["vote-click"]);
 
-function vote(){
+function vote() {
   // emits('vote-click','1')
   // return
-  const token=localStorage.getItem('bearer-tokens');
-  
-  if(typeof token === "undefined"||token ==null|| token == ""|| token == "undefined")
-      { 
-        
-        const ticket=  localStorage.getItem('qr-tickets');
-      
-        if(typeof ticket === "undefined"||ticket ==null|| ticket == ""|| ticket == "undefined")
-        {
-         
-          goAuth()
-        }
-        else
-        {
-         
-          emits('vote-click',ticket)
-          localStorage.setItem('qr-tickets', "");
-        }
-      
-      }
-    else
-    {
-      emits('vote-click','1')
-    }
-  
-   
+  const token = localStorage.getItem('bearer-tokens');
+
+  if (typeof token === "undefined" || token == null || token == "" || token == "undefined") {
+    goAuth()
+    // const ticket = localStorage.getItem('qr-tickets');
+    // if (typeof ticket === "undefined" || ticket == null || ticket == "" || ticket == "undefined") {
+    //   goAuth()
+    // }else {
+    //   emits('vote-click', ticket)
+    //   localStorage.setItem('qr-tickets', "");
+    // }
+  }else {
+    emits('vote-click', '1')
+  }
 }
 
 </script>
 <style scoped>
+.votbg {
 
-.votbg{
-
-height: 56px;
-width: 212px;
-margin-bottom: 16px;
-background: url('../assets/votbutton.png');
-background-repeat: no-repeat;
-background-size: cover;
-font-family: AlibabaPuHuiTiH;
-font-size: 24px;
-color: #FFFFFF;
-line-height: 56px;
-text-shadow: 0px 2px 2px #00A9E6;
-text-align: center;
-font-style: normal;
+  height: 56px;
+  width: 212px;
+  margin-bottom: 16px;
+  background: url('../assets/votbutton.png');
+  background-repeat: no-repeat;
+  background-size: cover;
+  font-family: AlibabaPuHuiTiH;
+  font-size: 24px;
+  color: #FFFFFF;
+  line-height: 56px;
+  text-shadow: 0px 2px 2px #00A9E6;
+  text-align: center;
+  font-style: normal;
 
 
 }
-
 </style>

src/router/index.js

@@ -54,7 +54,8 @@ router.beforeEach((to, from, next) => {
     const urlToBeAccessed = to.fullPath; // 获取即将跳转的完整URL
     // alert(urlToBeAccessed+'  11111')
     console.log('即将跳转到:', urlToBeAccessed);
-    if(urlToBeAccessed.includes('subscribe')){
+    
+    if(1==1){
       const token=localStorage.getItem('bearer-tokens');
       if(typeof token === "undefined"||token ==null|| token == ""|| token == "undefined")
         { 
@@ -62,7 +63,7 @@ router.beforeEach((to, from, next) => {
           let queryParams = to.query;
         let subscribe = queryParams.subscribe  
         // alert(subscribe+'  3333')
-        if(subscribe == '1'){
+        if(1==1){
           
           // let openid = queryParams.openid
           let openid = getCookie('wechat_user_openid')

src/views/articleDetails.vue

@@ -33,7 +33,7 @@
             <votButton v-text="'投票'" @vote-click="vote" ></votButton>
             </div>
         </div>
-        <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView>
+        <!-- <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView> -->
 </template>
 <script setup >
 

src/views/home.vue

@@ -12,7 +12,7 @@
     <div style="display: flex; justify-content: center;margin-top: 16px;">
       <votButton v-text="'开始投票'" @vote-click="voet"></votButton>
     </div>
-    <votView :show=show :ticket=ticket   @onchange="handlechange"  ></votView>
+    <!-- <votView :show=sho :ticket=ticket   @onchange="handlechange"  ></votView> -->
   </div>
 
 </template>

src/views/videoDetails.vue

@@ -28,13 +28,16 @@
           <div class="contents" v-html="content"></div>
       </div>
       </div>
-      <div class="buttomcla">
+      <!-- <div class="buttomcla">
           <div style="display: flex; justify-content: center;margin-top: 10px;">  
               <div class="text3" @click="goList()">去首页</div>
           <votButton v-text="'投票'"  @vote-click="vote" ></votButton>
           </div>
-      </div>
-      <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView>
+      </div> -->
+      <!-- <div class="buttomcla"> -->
+        <!-- 投票已结束 -->
+      <!-- </div> -->
+      <!-- <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView> -->
 </template>
 <script setup >
 import { useRouter,useRoute } from 'vue-router';
@@ -193,7 +196,8 @@ console.log(vid.value)
     video_author_t.value=video_author_t.value.slice(0, -1);
       }
      
-    WXSHARE("投我1票 | "+video_author_t.value+"："+route.query.name, '2025第十届肝胆英雄榜最具影响力视频投票开始啦！', Share_PATH,"");
+    // WXSHARE("投我1票 | "+video_author_t.value+"："+route.query.name, '2025第十届肝胆英雄榜最具影响力视频投票开始啦！', Share_PATH,"");
+    WXSHARE(video_author_t.value+"："+route.query.name, '2025第十届肝胆英雄榜最具影响力视频', Share_PATH,"");
   }).then(()=>{
     console.log("加载视频信息")
     loadPlayerScript(loadPlayer);

src/views/voteList.vue

@@ -194,7 +194,7 @@ v-show="voting">
   <van-empty description="暂无数据"   />
 </div>
 
-<votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView>
+<!-- <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView> -->
   </div> 
 </template>
 <script setup >