添加onPageLoadInitAuth函数判断登录

2026-03-10 11:33:42 +08:00
parent 511d29281e
commit 76c28f8d78
40 changed files with 816 additions and 526 deletions
--- a/miniprogram/pages/finance/flow/flow.ts
+++ b/miniprogram/pages/finance/flow/flow.ts
@@ -1,4 +1,4 @@
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  getAuthInfo,
@@ -35,11 +35,12 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
+
    this.getData();
  },
  searchChange(e: any) {
@@ -87,16 +88,24 @@ Page({
    this.data.params.curr_page = curr;
    this.setData({ params: this.data.params });
    const temp = cloneLite(this.data.params);
-
-    post('ErpAccount/flow', temp).then((res: any) => {
-      const list = toArray(res.data);
-      if (list.length == 0 && this.data.params.curr_page > 1) {
-        this.getList(this.data.params.curr_page - 1);
-      }
-      this.setData({
-        count: toNumber(res.count),
-        list: list,
-      });
+    return new Promise<void>((resolve, reject) => {
+      post('ErpAccount/flow', temp)
+        .then((res: any) => {
+          const list = toArray(res.data);
+          if (list.length == 0 && this.data.params.curr_page > 1) {
+            this.getList(this.data.params.curr_page - 1);
+          }
+          this.setData({
+            count: toNumber(res.count),
+            list: list,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
    });
  },

@@ -137,7 +146,7 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/giro/giro.ts
+++ b/miniprogram/pages/finance/giro/giro.ts
@@ -1,4 +1,4 @@
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  getAuthInfo,
@@ -32,11 +32,11 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
  },
  searchChange(e: any) {
    const key = getDataSet(e).key;
@@ -78,16 +78,24 @@ Page({
    } else {
      delete temp.process_state;
    }
-
-    post('ErpFinance/list', temp).then((res: any) => {
-      const list = toArray(res.data?.list);
-      if (list.length == 0 && this.data.params.curr_page > 1) {
-        this.getList(this.data.params.curr_page - 1);
-      }
-      this.setData({
-        count: toNumber(res.data?.count),
-        list: list,
-      });
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/list', temp)
+        .then((res: any) => {
+          const list = toArray(res.data?.list);
+          if (list.length == 0 && this.data.params.curr_page > 1) {
+            this.getList(this.data.params.curr_page - 1);
+          }
+          this.setData({
+            count: toNumber(res.data?.count),
+            list: list,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
    });
  },
  onOrderDetail(e: any) {
@@ -135,7 +143,7 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/giroDetail/giroDetail.ts
+++ b/miniprogram/pages/finance/giroDetail/giroDetail.ts
@@ -1,5 +1,5 @@
 import { OSSBaseUrl } from '@/utils/config';
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  formatFileSize,
@@ -29,25 +29,12 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
-  },
-
-  getList() {
-    this.setData({ params: this.data.params });
    const temp = cloneLite(this.data.params);
-    post('ErpFinance/info', temp).then((res: any) => {
-      const data = toObject(res.data);
-      const info = toObject(data.info);
-      wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
-      this.setData({
-        detail: toArray(info.rows),
-        info: info,
-      });
-    });
    post('ErpFinance/fileList', temp).then((res: any) => {
      this.setData({
        files: toArray(res.data).map((el) => {
@@ -59,6 +46,29 @@ Page({
      });
    });
  },
+
+  getList() {
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/info', temp)
+        .then((res: any) => {
+          const data = toObject(res.data);
+          const info = toObject(data.info);
+          wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
+          this.setData({
+            detail: toArray(info.rows),
+            info: info,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
+    });
+  },
  onPreview(e: any) {
    const data = getDataSet(e);
    const index = data.index;
@@ -78,7 +88,7 @@ Page({
  onLoad(options) {
    const { head_id } = options;
    this.data.params.head_id = head_id;
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/income/income.ts
+++ b/miniprogram/pages/finance/income/income.ts
@@ -1,4 +1,4 @@
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  getAuthInfo,
@@ -32,11 +32,11 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
  },
  searchChange(e: any) {
    const key = getDataSet(e).key;
@@ -78,16 +78,24 @@ Page({
    } else {
      delete temp.process_state;
    }
-
-    post('ErpFinance/list', temp).then((res: any) => {
-      const list = toArray(res.data?.list);
-      if (list.length == 0 && this.data.params.curr_page > 1) {
-        this.getList(this.data.params.curr_page - 1);
-      }
-      this.setData({
-        count: toNumber(res.data?.count),
-        list: list,
-      });
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/list', temp)
+        .then((res: any) => {
+          const list = toArray(res.data?.list);
+          if (list.length == 0 && this.data.params.curr_page > 1) {
+            this.getList(this.data.params.curr_page - 1);
+          }
+          this.setData({
+            count: toNumber(res.data?.count),
+            list: list,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
    });
  },
  onOrderDetail(e: any) {
@@ -135,7 +143,7 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/incomeDetail/incomeDetail.ts
+++ b/miniprogram/pages/finance/incomeDetail/incomeDetail.ts
@@ -1,5 +1,5 @@
 import { OSSBaseUrl } from '@/utils/config';
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  formatFileSize,
@@ -29,25 +29,12 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
-  },
-
-  getList() {
-    this.setData({ params: this.data.params });
    const temp = cloneLite(this.data.params);
-    post('ErpFinance/info', temp).then((res: any) => {
-      const data = toObject(res.data);
-      const info = toObject(data.info);
-      wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
-      this.setData({
-        detail: toArray(info.rows),
-        info: info,
-      });
-    });
    post('ErpFinance/fileList', temp).then((res: any) => {
      this.setData({
        files: toArray(res.data).map((el) => {
@@ -59,6 +46,29 @@ Page({
      });
    });
  },
+
+  getList() {
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/info', temp)
+        .then((res: any) => {
+          const data = toObject(res.data);
+          const info = toObject(data.info);
+          wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
+          this.setData({
+            detail: toArray(info.rows),
+            info: info,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
+    });
+  },
  onPreview(e: any) {
    const data = getDataSet(e);
    const index = data.index;
@@ -78,7 +88,7 @@ Page({
  onLoad(options) {
    const { head_id } = options;
    this.data.params.head_id = head_id;
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/outcome/outcome.ts
+++ b/miniprogram/pages/finance/outcome/outcome.ts
@@ -1,4 +1,4 @@
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  getAuthInfo,
@@ -32,11 +32,11 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
  },
  searchChange(e: any) {
    const key = getDataSet(e).key;
@@ -78,16 +78,24 @@ Page({
    } else {
      delete temp.process_state;
    }
-
-    post('ErpFinance/list', temp).then((res: any) => {
-      const list = toArray(res.data?.list);
-      if (list.length == 0 && this.data.params.curr_page > 1) {
-        this.getList(this.data.params.curr_page - 1);
-      }
-      this.setData({
-        count: toNumber(res.data?.count),
-        list: list,
-      });
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/list', temp)
+        .then((res: any) => {
+          const list = toArray(res.data?.list);
+          if (list.length == 0 && this.data.params.curr_page > 1) {
+            this.getList(this.data.params.curr_page - 1);
+          }
+          this.setData({
+            count: toNumber(res.data?.count),
+            list: list,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
    });
  },
  onOrderDetail(e: any) {
@@ -135,7 +143,7 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**
--- a/miniprogram/pages/finance/outcomeDetail/outcomeDetail.ts
+++ b/miniprogram/pages/finance/outcomeDetail/outcomeDetail.ts
@@ -1,5 +1,5 @@
 import { OSSBaseUrl } from '@/utils/config';
-import { loginStatusPage, post } from '@/utils/https';
+import { onPageLoadInitAuth, post } from '@/utils/https';
 import {
  cloneLite,
  formatFileSize,
@@ -29,25 +29,12 @@ Page({
    this.setData({ isLogin: e.detail });
    if (e.detail) {
      this.init();
+      this.getList();
    }
  },
  init() {
    this.setData({ authInfo: getAuthInfo() });
-    this.getList();
-  },
-
-  getList() {
-    this.setData({ params: this.data.params });
    const temp = cloneLite(this.data.params);
-    post('ErpFinance/info', temp).then((res: any) => {
-      const data = toObject(res.data);
-      const info = toObject(data.info);
-      wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
-      this.setData({
-        detail: toArray(info.rows),
-        info: info,
-      });
-    });
    post('ErpFinance/fileList', temp).then((res: any) => {
      this.setData({
        files: toArray(res.data).map((el) => {
@@ -59,6 +46,29 @@ Page({
      });
    });
  },
+
+  getList() {
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    return new Promise<void>((resolve, reject) => {
+      post('ErpFinance/info', temp)
+        .then((res: any) => {
+          const data = toObject(res.data);
+          const info = toObject(data.info);
+          wx.setNavigationBarTitle({ title: `${info.bill_no} 详情` });
+          this.setData({
+            detail: toArray(info.rows),
+            info: info,
+            isLogin: true,
+          });
+          resolve(res);
+        })
+        .catch((res) => {
+          this.setData({ isLogin: false });
+          reject(res);
+        });
+    });
+  },
  onPreview(e: any) {
    const data = getDataSet(e);
    const index = data.index;
@@ -78,7 +88,7 @@ Page({
  onLoad(options) {
    const { head_id } = options;
    this.data.params.head_id = head_id;
-    loginStatusPage(this);
+    onPageLoadInitAuth(this, () => this.getList());
  },

  /**