From b45a01a8bee4a9bff5f9c248ead301b8675d1099 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 28 十月 2022 17:22:35 +0800
Subject: [PATCH] 2022.10.28

---
 pages/home/home.wxml |   65 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 9567bf9..6d0afc2 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,6 +1,6 @@
 <!--pages/home/home.wxml-->
 <view class="page">
-  <cp-notice msg="鎻愰珮娴嬭瘎寰楀垎灏忔妧宸ф潵浜嗭紝蹇偣瀛︿範鍝�" />
+  <!-- <cp-notice msg="鎻愰珮娴嬭瘎寰楀垎灏忔妧宸ф潵浜嗭紝蹇偣瀛︿範鍝�" /> -->
   <view class="page__hd">
     <view class="page__title">{{userRealName}}</view>
     <!-- <view class="page__desc">涓嬫娴嬭瘎鏃堕棿{{nextEvaluationTime}}</view> -->
@@ -22,31 +22,59 @@
         </view>
       </view>
     </view> -->
-    <view class="flex-h">
+    <view class="flex-h" style="margin-top: 4px;">
       <view class="flex-h_block">
         <view class="top-card" bindtap="goto" data-index="0">
-          <view class="top-card__score"><text class="top-card__num">{{historyPoint.score}}</text>鍒�</view>
-          <view class="top-card__time">鑷祴鏅鸿瘎寰楀垎 ></view>
-          <image src="/res/icons/wm_assessment.png"></image>
+          <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>瀹堟硶鎺掑悕</view>
+              <text>{{historyPoint.rank}}</text>
+            </view>
+            <view class="top-card__item">
+              <view>瀹堟硶鎸囨暟</view>
+              <text>{{historyPoint.legalIndex}}</text>
+            </view>
+            <!-- <view class="top-card__item">
+              <view>杩濇硶鎸囨暟</view>
+              <text>{{historyPoint.illegalIndex}}</text>
+            </view> -->
+          </view>
+          <image src="/res/icons/wm_assessment.png" mode="aspectFit"></image>
         </view>
       </view>
       <view class="flex-h_block">
         <view class="top-card top-card_2" bindtap="goto" data-index="5">
-          <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
-          <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
-          <image src="/res/icons/wm_ledger.png"></image>
+          <view class="flex-h">
+            <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__time">鑷贰鏌� ></view>
+            </view>
+          </view>
+          <image src="/res/icons/wm_ledger.png" mode="aspectFit"></image>
         </view>
         <view class="top-card top-card_3" bindtap="goto" data-index="6">
-          <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__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>
-          <view class="top-card__time">鎵胯鍊掕鏃� ></view>
-          <image src="/res/icons/wm_commitment.png"></image>
+          <image src="/res/icons/wm_commitment.png" mode="aspectFit"></image>
         </view>
       </view>
     </view>
   </view>
-  <view class="page__bd">
+  <view class="page__bd" style="padding-top: 8px;">
+    <c-schedule></c-schedule>
+
     <view class="fyui-panel" bindtap="goto" data-index="1">
       <view class="fyui-cell fyui-cell_select title">
         <view class="fyui-cell__hd">
@@ -66,21 +94,20 @@
       </view>
     </view>
 
-    <view class="flex-h" style="padding: 8px 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="/res/icons/btn_bg_2.png" 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="/res/icons/btn_bg_1.png" class="" />
         <text class="image-btn_title">鍦ㄧ嚎瀹堟硶瀛︿範</text>
         <text class="image-btn_abstract">瀹炴椂鍦ㄧ嚎瀛︿範鏈嶅姟</text>
         <view class="image-btn_goto"></view>
       </view>
     </view>
-
     <view class="fyui-panel">
       <view class="fyui-cell fyui-cell_select title">
         <view class="fyui-cell__hd">
@@ -96,12 +123,12 @@
             <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="" />
+            <image src="{{item.pic}}" class="fyui-box__hd_image" mode="aspectFill" />
           </view>
         </view>
       </view>

--
Gitblit v1.9.3