From 068be2757aa2d51e3f6604dae54287683160ad0e Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 19 一月 2026 17:29:48 +0800
Subject: [PATCH] 2026.1.19
---
pages/mSelfPatrol/components/self-patrol/index.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/pages/mSelfPatrol/components/self-patrol/index.js b/pages/mSelfPatrol/components/self-patrol/index.js
index 21d8d56..6a27a13 100644
--- a/pages/mSelfPatrol/components/self-patrol/index.js
+++ b/pages/mSelfPatrol/components/self-patrol/index.js
@@ -1,4 +1,5 @@
-import { parseLedgerStat, refreshLedgerStatus } from '../../../../model/ledger';
+import { parseSelfPatrol, refreshLedgerStatus } from '../../../../model/ledger';
+import configservice from '../../../../service/configservice';
const ledgerservice = require('../../../../service/ledgerservice');
const moment = require('../../../../utils/moment.min');
const app = getApp();
@@ -17,6 +18,9 @@
thisMonth: '',
tags1: { count: 0 },
pageList1: [],
+ // 鏄惁鏈夋潈闄愬彲浠ヨ繘琛岃嚜宸℃煡鎵胯
+ promiseValid: app.globalData.userSetting.selfPatrolPromise,
+ promised: false
},
lifetimes: {
@@ -37,15 +41,23 @@
this.getLedgerType(nowStr, r => {
this.setData({
tags1: {
- count: r[0][0].tag,
+ count: r.types[0].tag,
},
- pageList1: r[1][0],
- progress: r[2].percent2,
- finished: r[2].finishedSelf,
- tabList: [r[0][0]],
+ pageList1: r.items[0],
+ progress: r.monthInfo.percent,
+ finished: r.monthInfo.finishedMust,
+ tabList: r.types,
refresh: false,
});
});
+ },
+
+ getPromise() {
+ configservice.fetchUserSettingRecord(app.globalData.accessToken.userId, {
+ success: res => {
+
+ },
+ })
},
getLedgerType(time, success, lastMonth) {
@@ -56,7 +68,7 @@
time,
{
success(res) {
- let r = parseLedgerStat(res, lastMonth);
+ let r = parseSelfPatrol(res);
success(r);
},
},
--
Gitblit v1.9.3