From fc1fd226622d663808216f316e64a4448fff376a Mon Sep 17 00:00:00 2001
From: abu <3109389044@qq.com>
Date: Sat, 15 Mar 2025 10:09:26 +0800
Subject: [PATCH] 1

---
 App.vue                             |  6 +---
 components/vlog/videoComp.vue       | 43 +++++++++--------------------
 components/vlog/videoDetail.vue     | 37 ++++++-------------------
 components/vlog/videoFollowComp.vue | 38 +++++++------------------
 pages/passport/login.vue            |  2 +-
 pages/tabbar/vlog/index.nvue        |  2 +-
 6 files changed, 34 insertions(+), 94 deletions(-)

diff --git a/App.vue b/App.vue
index c60f073d..0b302ef3 100644
--- a/App.vue
+++ b/App.vue
@@ -84,11 +84,6 @@
 					// 未登录不能发布视频
 					let myUserInfo = null
 					if (myUserInfo == null) {
-						uni.showToast({
-							duration: 3000,
-							title: "请登录~",
-							icon: "none",
-						});
 						uni.navigateTo({
 							// url: "../loginRegist/loginRegist",
 							url: '/pages/passport/login', 
@@ -264,6 +259,7 @@
 	}
 	.activate-line {
 	  background-color: #ffffff;
+	  
 	  transition-duration: 300ms;
 	}
 </style>
\ No newline at end of file
diff --git a/components/vlog/videoComp.vue b/components/vlog/videoComp.vue
index bddc67f4..64369152 100755
--- a/components/vlog/videoComp.vue
+++ b/components/vlog/videoComp.vue
@@ -10,7 +10,7 @@
 				:style="{ height: screenHeight + 'px' }">
 				<!-- <uni-video :src="item.url" :playStatus="playStatus" :screenHeight="screenHeight" v-if="playerCur === index" @play="onplay"></uni-video> -->
 				<video ref="myVideo" id="myVideo" :object-fit="item.width >= item.height ? 'contain' : 'fill'"
-					:src="item.url" :controls="false" :enable-progress-gesture="false" v-if="playerCur === index" loop
+					:src="item.url" :controls="false" :enable-progress-gesture="false" :show-progress="true" v-if="playerCur === index" loop
 					autoplay show-loading="true" style="width: 750rpx" :style="{ height: screenHeight + 'px' }"
 					@click="playOrPause" @play="onplay" @error="onerror" @timeupdate="timeupdate"></video>
 				<image :lazy-load="true" :fade-show="false" v-if="!item.play" :src="item.cover"
@@ -157,9 +157,11 @@
 
 			// 查询首页短视频列表
 			this.displayVideoPaging(this.page + 1, true);
-
-			var videoContext = uni.createVideoContext("myVideo");
-			this.videoContext = videoContext;
+		},
+		mounted() {
+			var videoContext = uni.createVideoContext("myVideo",this);
+			console.log(videoContext)
+			this.videoContext = videoContext;
 		},
 		watch: {
 			refreshList(value) {
@@ -212,17 +214,10 @@
 				if (isLike == 1) {
 					// 喜欢/点赞视频
 					if (myUserInfo == null) {
-						uni.showToast({
-							duration: 3000,
-							title: "请登录~",
-							icon: "none",
-						});
 						uni.navigateTo({
 							url: "/pages/passport/login",
 							animationType: "slide-in-bottom",
-							success() {
-								me.loginWords = "请登录";
-							},
+							
 						});
 						return;
 					}
@@ -242,17 +237,11 @@
 					// 取消喜欢/点赞视频
 					var myUserInfo = storage.getVlogUserInfo()
 					if (myUserInfo == null) {
-						uni.showToast({
-							duration: 3000,
-							title: "请登录~",
-							icon: "none",
-						});
+						
 						uni.navigateTo({
-							url: "../loginRegist/loginRegist",
+							url: "/pages/passport/login",
 							animationType: "slide-in-bottom",
-							success() {
-								me.loginWords = "请登录";
-							},
+							
 						});
 						return;
 					}
@@ -339,18 +328,12 @@
 				var myUserInfo = storage.getVlogUserInfo()
 				var userId = myUserInfo.id;
 				if (myUserInfo == null) {
-					uni.showToast({
-						duration: 3000,
-						title: "请登录~",
-						icon: "none",
-					});
+ 
 
 					uni.navigateTo({
-						url: "../loginRegist/loginRegist",
+						url: "/pages/passport/login",
 						animationType: "slide-in-bottom",
-						success() {
-							me.loginWords = "请登录";
-						},
+						 
 					});
 
 					return;
diff --git a/components/vlog/videoDetail.vue b/components/vlog/videoDetail.vue
index 67873a7e..cb4145a4 100755
--- a/components/vlog/videoDetail.vue
+++ b/components/vlog/videoDetail.vue
@@ -288,17 +288,11 @@ export default {
         // 点赞视频
         let myUserInfo = getApp().getUserInfoSession();
         if (app.isStrEmpty(myUserInfo)) {
-          uni.showToast({
-            duration: 3000,
-            title: "请登录后再进行操作~",
-            icon: "none",
-          });
+      
           uni.navigateTo({
-            url: "../loginRegist/loginRegist",
+            url: "/pages/passport/login",
             animationType: "slide-in-bottom",
-            success() {
-              me.loginWords = "请登录";
-            },
+ 
           });
           return;
         }
@@ -337,17 +331,11 @@ export default {
       } else if (isLike == 0) {
         let myUserInfo = getApp().getUserInfoSession();
         if (app.isStrEmpty(myUserInfo)) {
-          uni.showToast({
-            duration: 3000,
-            title: "请登录后再进行操作~",
-            icon: "none",
-          });
+ 
           uni.navigateTo({
-            url: "../loginRegist/loginRegist",
+            url: "/pages/passport/login",
             animationType: "slide-in-bottom",
-            success() {
-              me.loginWords = "请登录";
-            },
+             
           });
           return;
         }
@@ -416,18 +404,9 @@ export default {
       let me = this;
       let myUserInfo = getApp().getUserInfoSession();
       if (app.isStrEmpty(myUserInfo)) {
-        uni.showToast({
-          duration: 3000,
-          title: "请登录后再进行操作~",
-          icon: "none",
-        });
-
         uni.navigateTo({
-          url: "../loginRegist/loginRegist",
-          animationType: "slide-in-bottom",
-          success() {
-            me.loginWords = "请登录";
-          },
+          url: "/pages/passport/login",
+          animationType: "slide-in-bottom"
         });
 
         return;
diff --git a/components/vlog/videoFollowComp.vue b/components/vlog/videoFollowComp.vue
index 43baf6df..b002a753 100755
--- a/components/vlog/videoFollowComp.vue
+++ b/components/vlog/videoFollowComp.vue
@@ -332,17 +332,11 @@
 						
 					var myUserInfo = getApp().getUserInfoSession();
 					if (myUserInfo == null) {
-						uni.showToast({
-							duration: 3000,
-							title: "请登录~",
-							icon: "none"
-						});
+ 
 						uni.navigateTo({
-							url: "../loginRegist/loginRegist",
-							animationType: "slide-in-bottom",
-							success() {
-								me.loginWords = "请登录"
-							}
+							url: "/pages/passport/login",
+							animationType: "slide-in-bottom"
+							 
 						});
 						return;
 					}
@@ -379,17 +373,11 @@
 					
 					var myUserInfo = getApp().getUserInfoSession();
 					if (myUserInfo == null) {
-						uni.showToast({
-							duration: 3000,
-							title: "请登录~",
-							icon: "none"
-						});
+						 
 						uni.navigateTo({
-							url: "../loginRegist/loginRegist",
+							url: "/pages/passport/login",
 							animationType: "slide-in-bottom",
-							success() {
-								me.loginWords = "请登录"
-							}
+							 
 						});
 						return;
 					}
@@ -489,18 +477,12 @@
 				var me = this;
 				var myUserInfo = getApp().getUserInfoSession();
 				if (myUserInfo == null) {
-					uni.showToast({
-						duration: 3000,
-						title: "请登录~",
-						icon: "none"
-					});
+					 
 					
 					uni.navigateTo({
-						url: "../loginRegist/loginRegist",
+						url: "/pages/passport/login",
 						animationType: "slide-in-bottom",
-						success() {
-							me.loginWords = "请登录"
-						}
+						 
 					});
 					
 					return;
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index b9c9fc70..883f2061 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -283,7 +283,7 @@
 			},
 		},
 		onLoad(options) {
-			console.log(JSON.stringify(options))
+			console.log((options))
 			if (options && options.state) {
 				this.stateLogin(options.state);
 			}
diff --git a/pages/tabbar/vlog/index.nvue b/pages/tabbar/vlog/index.nvue
index 8d54ee26..15b430f6 100644
--- a/pages/tabbar/vlog/index.nvue
+++ b/pages/tabbar/vlog/index.nvue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 左中右的三个页面切换, 依次是: 附近 - 关注 - 推荐 -->
-		<swiper style="my-swiper" :style="{height: screenHeight + 'px'}" :current="curIndex" @change="changeTopTab">
+		<swiper style="my-swiper" :style="{height: screenHeight + 'px'}" :current="curIndex" @change="changeTopTab" >
 			<swiper-item>
 				<view class="near-by" :style="{height: screenHeight+'px'}">
 					<text class="warn-info">暂未开放，敬请期待!</text>