From 3100488aab3002a76ab27342e8e022383f932f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 26 Apr 2023 14:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/Ordervideolearning/Ordervideolearning.vue | 11 ++++++-----
 pages/Videolearning/Videolearning.vue           |  4 ++--
 pages/personal/personal.vue                     | 11 ++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pages/Ordervideolearning/Ordervideolearning.vue b/pages/Ordervideolearning/Ordervideolearning.vue
index db8fdea..dc114cb 100644
--- a/pages/Ordervideolearning/Ordervideolearning.vue
+++ b/pages/Ordervideolearning/Ordervideolearning.vue
@@ -24,12 +24,12 @@
 					v-if="item.itemDirectoryWatchStatus=='NOT_WATCHED'">
 					开始播放
 				</view>
-				<view class="play"
-					:style="item.itemDirectoryWatchStatus=='WATCHED'?'background-color: #4271B9;color:#3D7DCA':''"
+				<view class="play" @tap='videoplay(item)'
+					:style="item.itemDirectoryWatchStatus=='WATCHED'?'background-color: #E3EAF5;color:#3D7DCA':''"
 					v-if="item.itemDirectoryWatchStatus=='WATCHED'">
 					继续播放
 				</view>
-				<view class="play"
+				<view class="play" @tap='videoplay(item)'
 					:style="item.itemDirectoryWatchStatus=='FINISHED_READING'?'background-color: #E6E6E6;color:#76777B':''"
 					v-if="item.itemDirectoryWatchStatus=='FINISHED_READING'">
 					已看完
@@ -79,7 +79,8 @@
 			},
 			//关闭播放弹出框
 			videoshowfalse() {
-				this.videoitem.watchTime = this.formatSeconds(this.videoitem.watchTime)
+				this.videoitem.watchTime = '00:00:01'
+				// this.videoitem.watchTime = this.formatSeconds(this.videoitem.watchTime)
 				insertTrainingItemWatchRecord(this.videoitem).then(res => {
 					this.videoitem.watchTime = 0
 					this.info();
@@ -106,7 +107,7 @@
 							}
 						}
 					})
-				} else {}
+				}
 				this.videoshow = true
 			},
 			info() {
diff --git a/pages/Videolearning/Videolearning.vue b/pages/Videolearning/Videolearning.vue
index 26ce8c2..51270ff 100644
--- a/pages/Videolearning/Videolearning.vue
+++ b/pages/Videolearning/Videolearning.vue
@@ -19,7 +19,7 @@
 				<view class="Introduce">
 					{{item.itemDirectoryIntroduce}}
 				</view>
-				<view class="play" v-if="!item.trainingOrderStatus" @tap='videoplay(item)'>
+				<view class="play" v-if="!item.trainingOrderStatus">
 					开始播放
 				</view>
 				<view class="" v-if="item.trainingOrderStatus=='PAY'">
@@ -107,7 +107,7 @@
 							}
 						}
 					})
-				} else {}
+				}
 				this.videoshow = true
 			},
 			info() {
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 5550504..ad32a21 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -160,9 +160,14 @@
 			},
 			//我的学习
 			goOrderlist() {
-				uni.navigateTo({
-					url: '/pages/Orderlist/Orderlist'
-				})
+				const personRoleLoginFlag = uni.getStorageSync('personRoleLoginFlag');
+				if (personRoleLoginFlag) {
+					uni.navigateTo({
+						url: '/pages/Orderlist/Orderlist'
+					})
+				} else {
+					this.gologin();
+				}
 			},
 			//敬请期待
 			gostudy() {