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.js | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index af065cf..42c3a83 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -55,6 +55,13 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
+ //鍒ゆ柇鐢ㄦ埛鏄惁涓洪娆＄櫥褰曪紝鍐冲畾鏄惁寮哄埗淇敼榛樿瀵嗙爜
+ if (app.globalData.userInfo.remark == null || app.globalData.userInfo.remark == '') {
+ wx.navigateTo({
+ url: '/pages/m_user/p_changepw/p_changepw',
+ })
+ }
+
wx.getStorage({
key: 'accessToken',
success: (result) => {
@@ -205,18 +212,28 @@
let monthInfo = {
totalMust: 0,
finishedMust: 0,
+ totalSelf: 0,
+ finishedSelf: 0
}
subtypes.forEach(s => {
//鏈堝害缁熻
if (s.needUpdate) {
monthInfo.totalMust++
+ //缁熻鑷贰鏌ョ被鍨嬬殑鍙拌处锛岀被鍒负-1锛堟殏瀹氾級
+ if (s.ledgerTypeId == -1) {
+ monthInfo.totalSelf++
+ }
if (s.upLoad) {
monthInfo.finishedMust++
+ if (s.ledgerTypeId == -1) {
+ monthInfo.finishedSelf++
+ }
}
}
});
- monthInfo.percent = Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
+ monthInfo.percent = monthInfo.totalMust == 0 ? 0 : Math.round(monthInfo.finishedMust / monthInfo.totalMust * 100)
+ monthInfo.percent2 = monthInfo.totalSelf == 0 ? 0 : Math.round(monthInfo.finishedSelf / monthInfo.totalSelf * 100)
this.setData({monthInfo})
},
@@ -285,6 +302,13 @@
wx.navigateTo({
url: url
})
+ } else {
+ wx.showToast({
+ title: '鍔熻兘鏁鏈熷緟',
+ duration: 1000,
+ icon: 'none',
+ mask: true,
+ })
}
}
})
\ No newline at end of file
--
Gitblit v1.9.3