From 48145f787eda81815f653ad21161a60e89b6a303 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 13 十一月 2024 16:41:32 +0800
Subject: [PATCH] 2024.11.13

---
 pages/home/home.wxml |  100 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 46615d3..cd0b0a1 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -22,18 +22,23 @@
         </view>
       </view>
     </view> -->
-    <view class="flex-h" style="margin-top: 4px;">
+    <view class="flex-h" style="margin-top: 4px">
       <view class="flex-h_block">
         <view class="top-card" bindtap="goto" data-index="0">
           <view>
-            <view class="top-card__score"><text class="top-card__num">{{historyPoint.score}}</text>鍒�</view>
+            <view style="font-size: 24rpx" class="top-card__time"
+              >{{historyPoint.time}}</view
+            >
+            <view class="top-card__score"
+              ><text class="top-card__num">{{historyPoint.score}}</text>鍒�</view
+            >
             <view class="top-card__time">鑷祴鏅鸿瘎寰楀垎 ></view>
           </view>
           <view class="top-card__items">
-            <view class="top-card__item">
+            <!-- <view class="top-card__item">
               <view>瀹堟硶鎺掑悕</view>
               <text>{{historyPoint.rank}}</text>
-            </view>
+            </view> -->
             <view class="top-card__item">
               <view>瀹堟硶鎸囨暟</view>
               <text>{{historyPoint.legalIndex}}</text>
@@ -43,18 +48,23 @@
               <text>{{historyPoint.illegalIndex}}</text>
             </view> -->
           </view>
-          <image src="/res/icons/wm_assessment.png" mode="aspectFit"></image>
+          <image src="{{icon3}}" mode="aspectFit"></image>
         </view>
       </view>
       <view class="flex-h_block">
         <view class="top-card top-card_2" bindtap="goto" data-index="5">
           <view class="flex-h">
             <view>
-              <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
+              <view class="top-card__score"
+                ><text class="top-card__num">{{monthInfo.percent}}</text>%</view
+              >
               <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
             </view>
             <view>
-              <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent2}}</text>%</view>
+              <view class="top-card__score"
+                ><text class="top-card__num">{{monthInfo.percent2}}</text
+                >%</view
+              >
               <view class="top-card__time">鑷贰鏌� ></view>
             </view>
           </view>
@@ -62,8 +72,12 @@
         </view>
         <view class="top-card top-card_3" bindtap="goto" data-index="6">
           <view>
-            <view class="top-card__score">{{promsieInfo.leftDays > 0 ? '鍓╀綑' : '澶辨晥'}}
-              <text class="top-card__num">{{promsieInfo.leftDays > 0 ? promsieInfo.leftDays : 0 - promsieInfo.leftDays}}</text>澶�
+            <view class="top-card__score"
+              >{{promsieInfo.leftDays > 0 ? '鍓╀綑' : '澶辨晥'}}
+              <text class="top-card__num"
+                >{{promsieInfo.leftDays > 0 ? promsieInfo.leftDays : 0 -
+                promsieInfo.leftDays}}</text
+              >澶�
             </view>
             <view class="top-card__time">鎵胯鍊掕鏃� ></view>
           </view>
@@ -72,8 +86,22 @@
       </view>
     </view>
   </view>
-  <view class="page__bd" style="padding-top: 8px;">
-    <c-schedule></c-schedule>
+  <view class="page__bd" style="padding-top: 8px">
+    <view class="schedule-wrap">
+      <view style="margin-top: 4px">
+        <c-supervision-card></c-supervision-card>
+      </view>
+      <view style="margin-top: 4px">
+        <c-schedule-today></c-schedule-today>
+      </view>
+      <c-schedule
+        ledgerCompleted="{{ledgerCompleted}}"
+        assessmentCompleted="{{assessmentCompleted}}"
+      ></c-schedule>
+      <view style="margin-top: 4px">
+        <c-practical-operation></c-practical-operation>
+      </view>
+    </view>
 
     <view class="fyui-panel" bindtap="goto" data-index="1">
       <view class="fyui-cell fyui-cell_select title">
@@ -81,12 +109,23 @@
           <image src="/res/icons/warn.png" class="icon" />
         </view>
         <view class="fyui-cell__bd">鏅鸿兘宸ヤ綔鎻愰啋</view>
-        <view class="fyui-cell__ft">鏌ョ湅鏇村</view>
+        <view class="fyui-cell__ft" wx:if="{{unReadNoiceCount > 0}}"
+          ><view class="{{unReadNoiceCount > 0 ? 'notice-not-read-text' : ''}}"
+            >{{unReadNoiceCount }}</view
+          ></view
+        >
       </view>
-      <view wx:for="{{notices}}" wx:key="index" data-index="index" wx:item="item">
+      <view
+        wx:for="{{notices}}"
+        wx:key="index"
+        data-index="index"
+        wx:item="item"
+      >
         <view class="fyui-cell">
           <view class="fyui-cell__hd">
-            <view class="{{item.isRead ? 'notice-read' : 'notice-not-read'}}"></view>
+            <view
+              class="{{item.isRead ? 'notice-read' : 'notice-not-read'}}"
+            ></view>
           </view>
           <view class="fyui-cell__bd notice">{{item.notice}}</view>
           <view class="fyui-cell__ft">{{item.time}}</view>
@@ -94,15 +133,15 @@
       </view>
     </view>
 
-    <view class="flex-h" style="padding: 8px 10px 0 10px;">
+    <view class="flex-h" style="padding: 8px 10px 0 10px">
       <view class="image-btn" bindtap="goto" data-index="2">
-        <image src="/res/icons/btn_bg_2.png" class="" />
+        <image src="{{icon2}}" class="" />
         <text class="image-btn_title">鏅鸿兘鍦ㄧ嚎鍜ㄨ</text>
         <text class="image-btn_abstract">鍦ㄧ嚎鏅鸿兘鍜ㄨ鏈嶅姟</text>
         <view class="image-btn_goto"></view>
       </view>
       <view class="image-btn" bindtap="goto" data-index="3">
-        <image src="/res/icons/btn_bg_1.png" class="" />
+        <image src="{{icon1}}" class="" />
         <text class="image-btn_title">鍦ㄧ嚎瀹堟硶瀛︿範</text>
         <text class="image-btn_abstract">瀹炴椂鍦ㄧ嚎瀛︿範鏈嶅姟</text>
         <view class="image-btn_goto"></view>
@@ -116,24 +155,39 @@
         <view class="fyui-cell__bd">瀹堟硶鍔ㄦ��</view>
         <view class="fyui-cell__ft">鏌ョ湅鏇村</view>
       </view>
-      <view wx:for="{{dynamic}}" wx:key="index" data-index="index" wx:item="item">
-        <view class="fyui-box" bindtap="goto" data-index="4" data-url="{{item.url}}" data-filetype="{{item.fileType}}">
+      <view
+        wx:for="{{dynamic}}"
+        wx:key="index"
+        data-index="index"
+        wx:item="item"
+      >
+        <view
+          class="fyui-box"
+          bindtap="goto"
+          data-index="4"
+          data-url="{{item.url}}"
+          data-filetype="{{item.fileType}}"
+        >
           <view class="fyui-box__bd">
             <view class="fyui-box__content">{{item.title}}</view>
             <view class="fyui-box__tag">
               <view>{{item.time}}</view>
               <view class="flex-h">
-                <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
+                <image src="/res/icons/view.png" class="image-16"></image
+                >{{item.views}}
               </view>
             </view>
           </view>
           <view class="fyui-box__hd">
-            <image src="{{item.pic}}" class="fyui-box__hd_image" mode="aspectFill" />
+            <image
+              src="{{item.pic}}"
+              class="fyui-box__hd_image"
+              mode="aspectFill"
+            />
           </view>
         </view>
       </view>
     </view>
   </view>
   <view class="page__ft"></view>
-
-</view>
\ No newline at end of file
+</view>

--
Gitblit v1.9.3