From 996a13153ea8800c039e2647f30c17dcd51a4fac Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Sat, 30 Mar 2024 16:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=9C=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A0=87=E9=A2=98bug=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=20=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80bug=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driving-inspections/driving-item-list.vue | 33 ++++++++++---------
 pages/news/home.vue                           | 21 +++++++-----
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/pages/application/driving-inspections/driving-item-list.vue b/pages/application/driving-inspections/driving-item-list.vue
index ca48d4a..929a7c6 100644
--- a/pages/application/driving-inspections/driving-item-list.vue
+++ b/pages/application/driving-inspections/driving-item-list.vue
@@ -6,23 +6,23 @@
 		</cu-custom>
 		<scroll-view scroll-y>
 			<view class="spot-list">
-				<view class="spot-item" v-for="(item,index) in list" :key="item.CHECKTYPE_ID" @click="$noMultipleClicks(goToList,{
-					'CHECKTYPE_ID':item.CHECKTYPE_ID,
-					'CHECKTYPE_NAME':item.CHECKTYPE_NAME,
-					'WAYBILLREGISTRATION_ID':WAYBILLREGISTRATION_ID,index})">
-					<view class="spot-img">
-						<image v-if="item.CHECKTYPE_NAME == '出车前'" src="../../../static/driving_before.png"  class="cu-tag " mode=""></image>
-						<image v-else-if="item.CHECKTYPE_NAME == '行车中'" src="../../../static/driving.png" mode=""></image>
-						<image v-else src="../../../static/driving_affter.png" mode=""></image>
-					</view>
+        <view v-for="(item, index) in list" :key="item.CHECKTYPE_ID"
+              :class="['spot-item', { 'active': (pd.WAYBILLSTATUS == '0' && item.CHECKTYPE_NAME == '出车前') || (pd.WAYBILLSTATUS == '1' && item.CHECKTYPE_NAME == '行车中') || (pd.WAYBILLSTATUS == '2' && item.CHECKTYPE_NAME == '收车后') }]"
+              @click="$noMultipleClicks(goToList,{
+						'CHECKTYPE_ID':item.CHECKTYPE_ID,
+						'CHECKTYPE_NAME':item.CHECKTYPE_NAME,
+						'WAYBILLREGISTRATION_ID':WAYBILLREGISTRATION_ID,index})">
+          <view class="spot-img">
+            <image v-if="item.CHECKTYPE_NAME == '出车前'" src="../../../static/driving_before.png"  mode=""></image>
+            <image v-if="item.CHECKTYPE_NAME == '行车中'" src="../../../static/driving.png" mode=""></image>
+            <image v-if="item.CHECKTYPE_NAME == '收车后'" src="../../../static/driving_affter.png" mode=""></image>
+          </view>
 					<view class="spot-cont">
 						<view class="text f30">
 							{{item.CHECKTYPE_NAME}}
-
 						</view>
 					</view>
 				</view>
-
 			</view>
 			<view class="cu-tabbar-height"></view>
 		</scroll-view>
@@ -87,7 +87,6 @@
 					},
 					success: (res) => {
 						if ("success" == res.data.result) {
-              console.log(res.data,'1111111111111111111111111')
 							uni.hideLoading();
 							_this.list = res.data.varList;
 							_this.pd = res.data.pd;
@@ -102,7 +101,6 @@
 					}
 				});
 			},
-
 			//跳转事件
 			goToList(e) {
 				const index = e.index
@@ -157,8 +155,8 @@
 	}
 
 	.spot-img {
-		width: 100upx;
-		height: 100upx;
+		width: 50upx;
+		height: 50upx;
 	}
 
 	.spot-img image {
@@ -174,4 +172,9 @@
 		margin: 20upx;
 		padding: 20upx;
 	}
+
+  .spot-list .spot-item.active{
+    box-shadow: 0 0 10px #dcf7dc;
+    border: 1px solid #65da99;
+  }
 </style>
diff --git a/pages/news/home.vue b/pages/news/home.vue
index 625c26e..1d0e526 100644
--- a/pages/news/home.vue
+++ b/pages/news/home.vue
@@ -43,13 +43,11 @@
 					<view class="news-list">
             <view class="news-item" v-for="item in pclist" :key="item.NOTIFICATION_ID" @click="$noMultipleClicks(goToPcDetail, item.NOTIFICATION_ID)">
 							<view class="news-media-list">
-		<!--						<image src="https://ossweb-img.qq.com/images/lol/web201310/skin/big10006.jpg" mode="aspectFill" class="news-media-logo"></image>-->
 								<view class="news-media-body">
 									<view class="news-media-title">
 										{{item.SYNOPSIS}}
 									</view>
 									<view class="news-media-text">
-		<!--								<text>双控平台</text>-->
 										<text>{{item.CREATTIME}}</text>
 									</view>
 								</view>
@@ -75,12 +73,19 @@
 						<view class="news-item"  v-for="item in pclist" :key="item.NOTICECORP_ID" >
 							<view class="news-media-list">
 								<view class="news-media-body">
-									<view class="news-media-title" @click="$noMultipleClicks(goToPcDetail,item.NOTIFICATION_ID)">
-										{{item.LEVEL}}
-										<text style="float:right;">
-											<template v-if="item.TYPE=='0'">未读</template>
-											<template v-else-if="item.TYPE=='1'">已读</template>
-										</text>
+									<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>
+                    </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>
 									<view class="news-media-text">
 										<text>{{item.CREATETIME}}</text>