add: 提醒数量更新

home.html

@@ -51,12 +51,11 @@
 		top: 0.15rem;
 		right: 0.1rem;
 		min-width: .8rem;
-		text-align: center;
-		height: 0.4rem;
-		line-height: 0.26rem;
-		/* padding: 0 0.12rem; */
-		/* border-radius: 0.2rem; */
-		font-size: 0.12rem;
+		text-align: left;
+		text-indent: .16rem;
+		height: 0.36rem;
+		line-height: 0.36rem;
+		font-size: 0.2rem;
 		color: #FFFFFF;
 		background-image: url(image/code/home/tip.png);
 		background-size: contain;
@@ -297,7 +296,7 @@
           >
             <p>{{item.title}} <van-icon name="arrow" /></p>
             <p class="module-intro">{{item.remark}}</p>
-			<div class="new-badge">new</div>
+			<div class="new-badge">新</div>
           </div>
         </div>
       </div>

src/_checkrecord-all.css

@@ -93,4 +93,36 @@ body {
 
 .van-field__control {
 	color: #737373;
-}
+}
\ No newline at end of file
+
+.tab1-row1{
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: #333;
+	font-size: 0.3rem;
+	font-weight: bold;
+	margin-bottom: 8px;
+}
+.tab1-row2{
+	display: flex; justify-content: space-between; color: #666; font-size: 0.28rem; margin-bottom: 8px;
+}
+.tab1-row2 span{
+	display: inline-block; width: 50%;
+}
+
+ .reminder-badge {
+    position: absolute;
+    top: 0.15rem;
+    right: 0.1rem;
+    min-width: .8rem;
+    text-align: left;
+    text-indent: .16rem;
+    height: 0.36rem;
+    line-height: 0.36rem;
+    font-size: 0.2rem;
+    color: #FFFFFF;
+    background-image: url(../image/code/home/tip.png);
+    background-size: contain;
+    background-repeat: no-repeat;
+  }
\ No newline at end of file

src/_checkrecord-all.html

@@ -7,6 +7,7 @@
 			content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0, viewprot-fit:cover">
 		<title>高区“码”上</title>
 		<script type="text/javascript" src="../sdk/includeHead.js"></script>
+
 	</head>
 	<div id="app">
 		<div class="wrapper" v-cloak>
@@ -25,10 +26,32 @@
 				</van-tabs>
 			</div>
 
-
 			<van-list>
 				<van-cell v-for="item in hazardList" :key="item.id" @click="viewDetail(item.id)">
-					<div style="width: 100%;">
+					<div style="width: 100%;position: relative;" v-if="activeTab=='1'">
+						<div class="reminder-badge">新</div>
+						<!-- 第一行：商户名称 -->
+						<div class="tab1-row1">{{ item.merchantName }}</div>
+				  
+						<!-- 第二行：场所类型 + 检查单位（两列） -->
+						<div class="tab1-row2">
+						  <span>场所类型：{{ item.smallPlaceTypeName }}</span>
+						  <span>检查单位：{{ item.checkUnit }}</span>
+						</div>
+				  
+						<!-- 第三行：监察人 + 检查日期（两列） -->
+						<div class="tab1-row2">
+						  <span>检查人：{{ item.checkPeopleName }}</span>
+						  <span>检查日期：{{ item.checkDate }}</span>
+						</div>
+				  
+						<!-- 第四行：未整改数 + 隐患数（两列） -->
+						<div class="tab1-row2">
+						  <span>未整改数：{{ item.notRectifiedCount }}处</span>
+						  <span>隐患数：{{ item.hiddenCount }}处</span>
+						</div>
+					</div>
+					<div style="width: 100%;" v-if="activeTab=='2'">
 						<!-- 第一行：隐患描述 -->
 						<div style="
 							white-space: nowrap;

src/_checkrecord-all.js

@@ -8,7 +8,46 @@ window.addEventListener('load', function () {
         // 新增子Tab数据
         activeTab: '1',
         hazardList: [
-          // 更多示例数据...
+          {
+            id: 1,
+            merchantName: '福源便利店',         // 商户名称
+            smallPlaceTypeName: '零售店铺',      // 场所类型
+            checkUnit: '高区消防救援大队',       // 检查单位
+            checkPeopleName: '王建军',           // 监察人
+            checkDate: '2024-07-12',             // 检查日期
+            notRectifiedCount: 3,                // 未整改数
+            hiddenCount: 7                       // 隐患数
+          },
+          {
+            id: 2,
+            merchantName: '美味家火锅店',
+            smallPlaceTypeName: '餐饮场所',
+            checkUnit: '高区市场监督管理局',
+            checkPeopleName: '李雪晴',
+            checkDate: '2024-07-14',
+            notRectifiedCount: 0,
+            hiddenCount: 2
+          },
+          {
+            id: 3,
+            merchantName: '阳光网吧',
+            smallPlaceTypeName: '娱乐场所',
+            checkUnit: '高区应急管理局',
+            checkPeopleName: '张卫国',
+            checkDate: '2024-07-15',
+            notRectifiedCount: 1,
+            hiddenCount: 5
+          },
+          {
+            id: 4,
+            merchantName: '康旭药店',
+            smallPlaceTypeName: '医疗场所',
+            checkUnit: '高区消防救援大队',
+            checkPeopleName: '陈雨桐',
+            checkDate: '2024-07-16',
+            notRectifiedCount: 4,
+            hiddenCount: 9
+          }
         ],
         // 新增以下数据
         userInfo: {},
@@ -45,7 +84,7 @@ window.addEventListener('load', function () {
 		},
       //初始化页面
       init() {
-        this.getMerchantSelfCheckData()
+        // this.getMerchantSelfCheckData()
       },
 	  tabChange(){
 		   this.resetSearchPara()

src/_yh_check.html

@@ -30,7 +30,7 @@
 				<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px"
 					style="margin-bottom: 15px;">
 					<van-tab title="全部" name=""></van-tab>
-					<van-tab title="待审核" ></van-tab>
+					<van-tab title="待审核" badge="5"></van-tab>
 					<van-tab title="待整改" ></van-tab>
 					<van-tab title="已整改"  ></van-tab>
 					<van-tab title="整改逾期"  ></van-tab>