From f14ea940fb32105de8b592992e3f53c62f31d84d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 22 一月 2026 16:42:51 +0800
Subject: [PATCH] 2026.1.22

---
 pages/mSelfPatrol/components/self-patrol/index.js |   61 +++++++++++++++---------------
 1 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/pages/mSelfPatrol/components/self-patrol/index.js b/pages/mSelfPatrol/components/self-patrol/index.js
index 5791ed7..6154bc9 100644
--- a/pages/mSelfPatrol/components/self-patrol/index.js
+++ b/pages/mSelfPatrol/components/self-patrol/index.js
@@ -1,7 +1,4 @@
-import {
-  parseSelfPatrol,
-  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');
@@ -20,7 +17,7 @@
     refresh: false,
     thisMonth: '',
     tags1: {
-      count: 0
+      count: 0,
     },
     pageList1: [],
     // 鏄惁鏈夋潈闄愬彲浠ヨ繘琛岃嚜宸℃煡鎵胯
@@ -44,7 +41,7 @@
       const nowStr = now.format('YYYY-MM-DD');
       const thisMonth = now.format('YYYY骞碝M鏈�');
       this.setData({
-        thisMonth
+        thisMonth,
       });
       this.getLedgerType(nowStr, r => {
         this.setData({
@@ -58,7 +55,7 @@
           refresh: false,
         });
       });
-      this.getPromise()
+      this.getPromise();
     },
 
     /**
@@ -66,15 +63,20 @@
      */
     getPromise() {
       if (this.data.promiseValid) {
-        configservice.fetchUserSettingRecord(app.globalData.accessToken.userId, {
-          success: res => {
-            const nowYear = moment().year()
-            const promiseYear = moment(res.data?.lastPromisedTime).year()
-            this.setData({
-              promised: (res.data?.selfPatrolPromised == true) && (nowYear == promiseYear)
-            })
+        configservice.fetchUserSettingRecord(
+          app.globalData.accessToken.userId,
+          {
+            success: res => {
+              const nowYear = moment().year();
+              const promiseYear = moment(res.data?.lastPromisedTime).year();
+              this.setData({
+                promised:
+                  res.data?.selfPatrolPromised == true &&
+                  nowYear == promiseYear,
+              });
+            },
           },
-        })
+        );
       }
     },
 
@@ -83,7 +85,8 @@
       ledgerservice.getLedgerSummary(
         app.globalData.accessToken.userId,
         app.globalData.userInfo.extension2,
-        time, {
+        time,
+        {
           success(res) {
             let r = parseSelfPatrol(res);
             success(r);
@@ -93,9 +96,7 @@
     },
 
     gotoLedgerDetail(e) {
-      const {
-        index
-      } = e.currentTarget.dataset;
+      const { index } = e.currentTarget.dataset;
       const indexGroup = index;
       var ledger = this.data.pageList1[index];
       var that = this;
@@ -145,17 +146,17 @@
       wx.navigateTo({
         url: '/pages/mSelfPatrol/patrolpromise/index',
         events: {
-          doPromiseDone: (data)=> {
+          doPromiseDone: data => {
             this.setData({
-              promised: data.promised
-            })
+              promised: data.promised,
+            });
           },
         },
-        success: (res)=> {
+        success: res => {
           // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
-          // res.eventChannel.emit('acceptDataFromOpenerPage', {
-
-          // });
+          res.eventChannel.emit('acceptDataFromOpenerPage', {
+            review: false,
+          });
         },
       });
     },
@@ -166,13 +167,13 @@
     reviewPromise() {
       wx.navigateTo({
         url: '/pages/mSelfPatrol/patrolpromise/index',
-        success: (res)=> {
+        success: res => {
           // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
           res.eventChannel.emit('acceptDataFromOpenerPage', {
-            review: true
+            review: true,
           });
         },
       });
-    }
+    },
   },
-});
\ No newline at end of file
+});

--
Gitblit v1.9.3