Merge branch 'dev'

src/components/headTop.vue

@@ -25,7 +25,7 @@
   </div>
 </template>
 <script setup >
-const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456.png_hd.png'
+const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456.png_hd.png?v=2025'
 const props = defineProps({
   num1: {  
     type: Number,  

src/components/votButton.vue

@@ -1,73 +1,59 @@
 <template>
 
-    <div class="votbg" @click="vote()">
+  <div class="votbg" @click="vote()">
-        <div>{{ text }}</div>
+    <div>{{ text }}</div>
-   </div>
+  </div>
 
 </template>
-<script setup >
+<script setup>
-import {goAuth}from '@/utils/authorize.js';
+import { goAuth } from '@/utils/authorize.js';
 const props = defineProps({
- text: {  
+  text: {
-   type: String,  
+    type: String,
 
- }, 
+  },
 
 
 });
 const emits = defineEmits(["vote-click"]);
 
-function vote(){
+function vote() {
   // emits('vote-click','1')
   // return
-  const token=localStorage.getItem('bearer-tokens');
+  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')
-    }
-  
 
+  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;
-height: 56px;
+  margin-bottom: 16px;
-width: 212px;
+  background: url('../assets/votbutton.png');
-margin-bottom: 16px;
+  background-repeat: no-repeat;
-background: url('../assets/votbutton.png');
+  background-size: cover;
-background-repeat: no-repeat;
+  font-family: AlibabaPuHuiTiH;
-background-size: cover;
+  font-size: 24px;
-font-family: AlibabaPuHuiTiH;
+  color: #FFFFFF;
-font-size: 24px;
+  line-height: 56px;
-color: #FFFFFF;
+  text-shadow: 0px 2px 2px #00A9E6;
-line-height: 56px;
+  text-align: center;
-text-shadow: 0px 2px 2px #00A9E6;
+  font-style: normal;
-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 >
 
@@ -52,7 +52,7 @@ const tiltles = ref('')
 const article_author = ref([]);
 const id=ref('')
 import {browse,votearticle,getarticle} from '../utils/api.js'
-const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456.png'
+const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456-2.png?v=2025'
 
 onMounted(()=>{
     console.log("ee",route.query.id)
@@ -112,7 +112,7 @@ function initData(id)
     getarticle(id).then((data) => {
       console.log("getarticle",data)
       const Share_PATH = import.meta.env.VITE_SHARE_URL+'articleDetails?id='+route.query.id+'&name='+encodeURIComponent(route.query.name);
-      WXSHARE("投我1票 | "+route.query.name, '2024第九届肝胆英雄榜最具影响力视频投票开始啦！', Share_PATH+fromwexin,"");
+      WXSHARE("投我1票 | "+route.query.name, '2025第十届肝胆英雄榜最具影响力视频投票开始啦！', Share_PATH+fromwexin,"");
       rank.value = data.data.rank
       ticket.value = data.data.vote_num
       tiltles.value = data.data.article_title

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>
@@ -147,7 +147,7 @@ onMounted(() => {
 
   initData()
   updatBrowse()
-   WXSHARE('2024第九届肝胆英雄榜最具影响力视频投票开始啦！', '就差你一票~助力喜欢的专家或者视频上"肝胆英雄榜"', Share_PATH,"")
+   WXSHARE('2025第十届肝胆英雄榜最具影响力视频投票开始啦！', '就差你一票~助力喜欢的专家或者视频上"肝胆英雄榜"', Share_PATH,"")
 
 })
 function voet(eventData) {

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>
+      </div> -->
-      <votView :show =show :shows =shows @onchange="handlechange"  @onchanges="handlechange" :ticket=tickets ></votView>
+      <!-- <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';
@@ -53,7 +56,7 @@ const article_author = ref([]);
 const id=ref('')
 const video_author_t=ref("")
 import {browse,votevideo,getvideo} from '../utils/api.js'
-const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456.png'
+const IMG_PATH = import.meta.env.VITE_IMAGE_URL+'/static/images/1178172634346456-2.png?v=2025'
 const players = ref([])
 const playerJs=ref('//player.polyv.net/script/player.js')
 const vid = ref('')
@@ -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, '2024第九届肝胆英雄榜最具影响力视频投票开始啦！', 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

@@ -78,8 +78,23 @@ v-show="voting">
           <div class="title">{{ item.article_title }}</div>
           <div>
           <div class='name'>
-            <div v-for="auther in item.article_author">
+            <div v-for="auther in item.article_author" style="display: flex;align-items: center;">
-              <div>{{ auther.author_name}}&nbsp;{{ auther.hospital_name }}</div>
+              <div style="flex: 1;" v-if="auther.author_avatar" >
+                <van-image 
+                  :src="auther.author_avatar" 
+                  width="40" 
+                  height="40"
+                  fit="cover"
+                  round
+                  style="margin-right: 8px;"
+                />
+              </div>
+              
+              <div style="display: flex;flex-direction: column;flex: 4;">
+                <div>{{ auther.author_name}}</div>
+                <div>{{ auther.hospital_name }}</div>
+              </div>
+              
               
             </div>
           </div>
@@ -142,8 +157,22 @@ v-show="voting">
           <div class="title">{{ item.video_title }}</div>
           <div>
           <div class='name'>
-            <div v-for="auther in item.video_author">
+            <div v-for="auther in item.video_author" style="display: flex;align-items: center;">
-              <div>{{ auther.author_name}}&nbsp;{{ auther.hospital_name }}</div>
+              <div style="flex: 1;" v-if="auther.author_avatar" >
+                <van-image 
+                  :src="auther.author_avatar" 
+                  width="40" 
+                  height="40"
+                  fit="cover"
+                  round
+                  style="margin-right: 8px;"
+                />
+              </div>
+              
+              <div style="display: flex;flex-direction: column;flex: 4;">
+                <div>{{ auther.author_name}}</div>
+                <div>{{ auther.hospital_name }}</div>
+              </div>
               
             </div>
           </div>
@@ -165,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 >
@@ -555,7 +584,7 @@ onMounted(() => {
     
   initData()
   updatBrowse()
-  WXSHARE('2024第九届肝胆英雄榜最具影响力视频投票开始啦！', '就差你一票~助力喜欢的专家或者视频上"肝胆英雄榜"', Share_PATH,"")
+  WXSHARE('2025第十届肝胆英雄榜最具影响力视频投票开始啦！', '就差你一票~助力喜欢的专家或者视频上"肝胆英雄榜"', Share_PATH,"")
   saveurl('/voteList','','')
 
   })
@@ -704,7 +733,7 @@ white-space: pre-wrap;
     display: flex;
     flex-direction: column;
     align-items: center;
-    min-width: 50px;
+    /* min-width: 50px; */
   }
   .toubg1{