From ab70c6eb4a181b282af0eb200275cd8a4d2ab172 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.js | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 4a2b497..57116f8 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -30,7 +30,7 @@
userRealName: '',
//鍘嗗彶璇勫垎璇︽儏
- assessmentCompleted: false,
+ assessmentCompleted: undefined,
historyPoint: {
time: '娴嬭瘎鍛ㄦ湡----骞�--鏈�',
score: '--',
@@ -40,7 +40,7 @@
period: '',
},
//鍙拌处瀹屾垚鎯呭喌
- ledgerCompleted: false,
+ ledgerCompleted: undefined,
monthInfo: {
//蹇呭～椤规�绘暟
totalMust: 0,
@@ -161,10 +161,19 @@
let year = lastOne.updateDate.substring(0, 4);
let month = lastOne.updateDate.substring(5, 7);
const now = moment();
- if (now.year() == year && now.month() + 1 == month) {
+ // fixme 2024.5.24 涓存椂娣诲姞闈欏畨鍖荤枟鏈烘瀯鐨勮瘎浼板懆鏈熶负1骞达紝鍚庣画鍐嶅仛瀹屽杽
+ const inPeriod =
+ app.globalData.userInfo.extension1 == '闈欏畨鍖�' &&
+ app.globalData.userInfo.extension2 == '9' &&
+ year == now.year();
+ if ((now.year() == parseInt(year) && now.month() + 1 == parseInt(month) ) || inPeriod) {
that.setData({
- assessmentCompleted: true,
+ assessmentCompleted: 2,
});
+ } else {
+ that.setData({
+ assessmentCompleted: 1,
+ });
}
that.setData({
historyPoint: {
@@ -289,8 +298,7 @@
this.setData({
monthInfo,
- ledgerCompleted: monthInfo.percent >= 100 && monthInfo.percent2 >= 100,
- // ledgerCompleted: true
+ ledgerCompleted: monthInfo.percent >= 100 && monthInfo.percent2 >= 100 ? 2 : 1,
});
},
--
Gitblit v1.9.3