Merge branch 'dev'

4
3
2026-01-09 15:18:42 +08:00 · 2026-01-09 15:18:21 +08:00 · 2026-01-09 15:17:03 +08:00 · 2026-01-09 15:15:35 +08:00 · 2026-01-09 15:13:54 +08:00 · 2026-01-09 15:13:14 +08:00
7 changed files with 60 additions and 69 deletions
@@ -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,  
@@ -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"]);

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

  })
Author	SHA1	Message	Date
haomingming	1314a1ea67	Merge branch 'dev'	2026-01-09 15:18:42 +08:00
haomingming	9a3398ce4b	4	2026-01-09 15:18:21 +08:00
haomingming	72476f3b10	3	2026-01-09 15:17:03 +08:00
haomingming	d669d1dcb9	2	2026-01-09 15:15:35 +08:00
haomingming	36b5dc97fc	Merge branch 'dev'	2026-01-09 15:13:54 +08:00
haomingming	95682b4b40	12	2026-01-09 15:13:14 +08:00
haomingming	8a2bf1bad2	去 vconsole	2025-12-28 09:17:19 +08:00
haomingming	0c9587b100	cc	2025-12-28 09:14:24 +08:00
haomingming	9de11a5f52	11	2025-12-28 09:11:07 +08:00
haomingming	09e794b2ef	auu	2025-12-28 09:10:01 +08:00
haomingming	90407680af	去掉关注	2025-12-28 09:08:07 +08:00
haomingming	34a338fa55	去掉关注	2025-12-28 09:02:41 +08:00
haomingming	3a547c16de	去掉关注	2025-12-28 08:56:58 +08:00
haomingming	da1fbce575	图片	2025-12-17 17:20:44 +08:00
haomingming	091a22cddb	图片	2025-12-17 17:11:44 +08:00
haomingming	2dd1eb4e98	分享文字	2025-12-17 10:58:55 +08:00