From 5d8e52e398bff7bc8f83e8f5b8a387175b958c98 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 24 二月 2023 10:20:18 +0800
Subject: [PATCH] 2023.2.24
---
pages/home/home.wxml | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 3d8627d..0b9e42c 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,10 +22,11 @@
</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>
+ <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>
@@ -48,9 +49,15 @@
</view>
<view class="flex-h_block">
<view class="top-card top-card_2" bindtap="goto" data-index="5">
- <view>
- <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
- <view class="top-card__time">鍙拌处瀹屾垚鐜� ></view>
+ <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>
@@ -66,7 +73,9 @@
</view>
</view>
</view>
- <view class="page__bd">
+ <view class="page__bd" style="padding-top: 8px;">
+ <c-schedule ledgerCompleted="{{ledgerCompleted}}" assessmentCompleted="{{assessmentCompleted}}"></c-schedule>
+
<view class="fyui-panel" bindtap="goto" data-index="1">
<view class="fyui-cell fyui-cell_select title">
<view class="fyui-cell__hd">
@@ -86,7 +95,7 @@
</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="" />
<text class="image-btn_title">鏅鸿兘鍦ㄧ嚎鍜ㄨ</text>
@@ -100,7 +109,6 @@
<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">
@@ -116,12 +124,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