From 5ecbede1d3fa747f33b93e2b62c7a0e18045c409 Mon Sep 17 00:00:00 2001
From: xiepeng <xiepeng@zcloudchina.com>
Date: Tue, 25 Jun 2024 10:30:59 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96=20=20=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=20?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=85=AC=E5=91=8A=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/application/onlinexxks/video_study.vue | 22 ++++++---
 pages/news/home.vue                          | 48 ++++++++++++++------
 pages/news/notice-list-detail.vue            |  4 +-
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/pages/application/onlinexxks/video_study.vue b/pages/application/onlinexxks/video_study.vue
index 744fc53..01ca02d 100644
--- a/pages/application/onlinexxks/video_study.vue
+++ b/pages/application/onlinexxks/video_study.vue
@@ -514,16 +514,24 @@ export default {
         USERNAME: loginUser.NAME,
         USER_ID: loginUser.USER_ID,
       });
-      if (!resData.pd.PORTRAIT) {
-        uni.showModal({
-          title: "温馨提示",
-          confirmText: "确定",
-          content: "您当前还未进行人脸认证，请先进行认证",
-        });
-      } else {
+      if (resData.pd.PORTRAIT) {
         uni.navigateTo({
           url: '/pages/application/onlinexxks/face/index?params=' + params
         })
+      } else {
+        uni.showModal({
+          title: "温馨提示",
+          content: "您当前还未进行人脸认证，请先进行认证",
+          confirmText: "前往人脸认证",
+          cancelText: "确定",
+          success: (res) => {
+            if(res.confirm) {
+              uni.navigateTo({
+                url: `/pages/my/set/set`,
+              });
+            }
+          }
+        });
       }
     },
     fnNavigationExercises(VIDEOCOURSEWARE_ID) {
diff --git a/pages/news/home.vue b/pages/news/home.vue
index 0430798..5bdabd9 100644
--- a/pages/news/home.vue
+++ b/pages/news/home.vue
@@ -41,7 +41,7 @@
 			<scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
 				<view v-if="list.length>0" >
 					<view class="news-list">
-            <view class="news-item" v-for="item in list" :key="item.NOTIFICATION_ID" @click="$noMultipleClicks(goToPcDetail, item.NOTIFICATION_ID)">
+            <view class="news-item" v-for="item in list" :key="item.NOTICE_ID" @click="$noMultipleClicks(goToPcDetail, item.NOTICE_ID)">
 							<view class="news-media-list">
 								<view class="news-media-body">
 									<view class="news-media-title">
@@ -66,7 +66,7 @@
 				<view class="cu-tabbar-height"></view>
 			</scroll-view>
 		</block>
-		<block v-if="TabCur==1">
+		<block v-else-if="TabCur==1">
 			<scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
 				<view v-if="pclist.length>0" >
 					<view class="news-list">
@@ -75,15 +75,13 @@
 								<view class="news-media-body">
 									<view @click="$noMultipleClicks(goToPcDetail,item.NOTIFICATION_ID)">
                     <view class="dy-title-flex">
-                      <text>通知标题：</text>
-                      <text class="bg-red light cu-tag radius">{{item.LEVEL}}</text>
+
+                      <text>  <view class="yuan" v-if="!item.TYPE == '1'"></view> 通知标题：</text>
+                      <text class="light red  blue ">{{item.LEVEL}}</text>
                     </view>
                     <view>
                       <text>{{item.TITLE}}</text>
-                      <text class="bg-red light cu-tag bg-green radius" style="float:right; height:40upx;">
-                        <template v-if="item.TYPE=='0'">未读</template>
-                        <template v-else-if="item.TYPE=='1'">已读</template>
-                      </text>
+
                     </view>
 
 									</view>
@@ -109,7 +107,7 @@
 				<view class="cu-tabbar-height"></view>
 			</scroll-view>
 		</block>
-    <block v-if="TabCur==2">
+    <block v-else-if="TabCur==2">
       <scroll-view class="dy-scroll-nobg"  scroll-y :style="'top:'+sTop+'px;height:calc(100vh - '+totalHeight+'px)'">
         <view v-if="txlist.length>0" >
           <view class="news-list">
@@ -340,9 +338,7 @@
       },
 			//跳转事件
 			goToDetail(e) {
-				uni.navigateTo({
-					url: '/pages/news/notice-list-detail?id='+e+'&type=0',
-				});
+
 			},
       goToTxDetail(e){
         uni.navigateTo({
@@ -350,9 +346,16 @@
         });
       },
 			goToPcDetail(e){
-				uni.navigateTo({
-					url: '/pages/news/news-list-detail?id='+e+'&type=1',
-				});
+        console.log(e)
+        if(this.TabCur == 0) {
+          uni.navigateTo({
+            url: '/pages/news/notice-list-detail?id='+e+'&type=0',
+          });
+        }else if(this.TabCur == 1){
+          uni.navigateTo({
+            url: '/pages/news/news-list-detail?id='+e+'&type=1',
+          });
+        }
 			},
       deleteNoticeTx(ID){
         var _this = this;
@@ -469,6 +472,15 @@
 		flex-direction: row;
 	}
 
+  .yuan{
+    width: 8px;
+     height: 8px;
+    background: #ff0000;
+    border-radius: 100%;
+    display: inline-block;
+    margin-right: 5px;
+  }
+
 	.news-media-logo {
 		width: 90px;
 		height: 70px;
@@ -519,4 +531,10 @@
 		font-size: 13px;
 		color: #8f8f94;
 	}
+  .red{
+    color: #df4343;
+  }
+  .blue{
+    color: #548de7;
+  }
 </style>
diff --git a/pages/news/notice-list-detail.vue b/pages/news/notice-list-detail.vue
index 1e8246f..ea11057 100644
--- a/pages/news/notice-list-detail.vue
+++ b/pages/news/notice-list-detail.vue
@@ -16,7 +16,7 @@
 				<view class="content">
 					<rich-text :nodes="content"></rich-text>
 				</view>
-				<view class="message-warp" v-if="pd.FILEPATH">
+				<view class="message-warp"  v-if="pd.FILEPATH">
 					<view class="cu-item" @click="$noMultipleClicks(goStuToOpen,pd.FILEPATH)">
 						<view class="content">
 							<text class="cuIcon-read text-blue"></text>
@@ -61,7 +61,7 @@
 				if("1"==_this.type){
 					url =  basePath + '/app/notice/goEditForPc'
 				}
-				console.log(_this.id)
+				console.log("1111",_this.id)
 				uni.request({
 					url:url,
 					method: 'POST',