Compare commits

..
12 Commits
Author SHA1 Message Date
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
6 changed files with 54 additions and 63 deletions
+9 -23
View File
@@ -22,35 +22,22 @@ function vote(){
// return // return
const token = localStorage.getItem('bearer-tokens'); const token = localStorage.getItem('bearer-tokens');
if(typeof token === "undefined"||token ==null|| token == ""|| token == "undefined") 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() goAuth()
} // const ticket = localStorage.getItem('qr-tickets');
else // if (typeof ticket === "undefined" || ticket == null || ticket == "" || ticket == "undefined") {
{ // goAuth()
// }else {
emits('vote-click',ticket) // emits('vote-click', ticket)
localStorage.setItem('qr-tickets', ""); // localStorage.setItem('qr-tickets', "");
} // }
}else {
}
else
{
emits('vote-click', '1') emits('vote-click', '1')
} }
} }
</script> </script>
<style scoped> <style scoped>
.votbg { .votbg {
height: 56px; height: 56px;
@@ -69,5 +56,4 @@ font-style: normal;
} }
</style> </style>
+3 -2
View File
@@ -54,7 +54,8 @@ router.beforeEach((to, from, next) => {
const urlToBeAccessed = to.fullPath; // 获取即将跳转的完整URL const urlToBeAccessed = to.fullPath; // 获取即将跳转的完整URL
// alert(urlToBeAccessed+' 11111') // alert(urlToBeAccessed+' 11111')
console.log('即将跳转到:', urlToBeAccessed); console.log('即将跳转到:', urlToBeAccessed);
if(urlToBeAccessed.includes('subscribe')){
if(1==1){
const token=localStorage.getItem('bearer-tokens'); const token=localStorage.getItem('bearer-tokens');
if(typeof token === "undefined"||token ==null|| token == ""|| token == "undefined") if(typeof token === "undefined"||token ==null|| token == ""|| token == "undefined")
{ {
@@ -62,7 +63,7 @@ router.beforeEach((to, from, next) => {
let queryParams = to.query; let queryParams = to.query;
let subscribe = queryParams.subscribe let subscribe = queryParams.subscribe
// alert(subscribe+' 3333') // alert(subscribe+' 3333')
if(subscribe == '1'){ if(1==1){
// let openid = queryParams.openid // let openid = queryParams.openid
let openid = getCookie('wechat_user_openid') let openid = getCookie('wechat_user_openid')
+1 -1
View File
@@ -33,7 +33,7 @@
<votButton v-text="'投票'" @vote-click="vote" ></votButton> <votButton v-text="'投票'" @vote-click="vote" ></votButton>
</div> </div>
</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> </template>
<script setup > <script setup >
+1 -1
View File
@@ -12,7 +12,7 @@
<div style="display: flex; justify-content: center;margin-top: 16px;"> <div style="display: flex; justify-content: center;margin-top: 16px;">
<votButton v-text="'开始投票'" @vote-click="voet"></votButton> <votButton v-text="'开始投票'" @vote-click="voet"></votButton>
</div> </div>
<votView :show=show :ticket=ticket @onchange="handlechange" ></votView> <!-- <votView :show=sho :ticket=ticket @onchange="handlechange" ></votView> -->
</div> </div>
</template> </template>
+8 -4
View File
@@ -28,13 +28,16 @@
<div class="contents" v-html="content"></div> <div class="contents" v-html="content"></div>
</div> </div>
</div> </div>
<div class="buttomcla"> <!-- <div class="buttomcla">
<div style="display: flex; justify-content: center;margin-top: 10px;"> <div style="display: flex; justify-content: center;margin-top: 10px;">
<div class="text3" @click="goList()">去首页</div> <div class="text3" @click="goList()">去首页</div>
<votButton v-text="'投票'" @vote-click="vote" ></votButton> <votButton v-text="'投票'" @vote-click="vote" ></votButton>
</div> </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> </template>
<script setup > <script setup >
import { useRouter,useRoute } from 'vue-router'; 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); 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(()=>{ }).then(()=>{
console.log("加载视频信息") console.log("加载视频信息")
loadPlayerScript(loadPlayer); loadPlayerScript(loadPlayer);
+1 -1
View File
@@ -194,7 +194,7 @@ v-show="voting">
<van-empty description="暂无数据" /> <van-empty description="暂无数据" />
</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> -->
</div> </div>
</template> </template>
<script setup > <script setup >