From 6a189829531106872319d1508d93a3e05573ce74 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 02 四月 2024 15:08:07 +0800
Subject: [PATCH] 样式修改

---
 packageDomain/pages/sampleBookList/index.js |   79 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 9d63ba3..0858a02 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -145,11 +145,7 @@
       this.setData({
         userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
       })
-      this.getAlreadyPBookList()
-      this.getAlreadyEBookList()
-      // 鑾峰彇鐢宠娆℃暟
-      this.getSelectPaperBookCount()
-      this.getSelectBookCount()
+
     }
   },
 
@@ -164,19 +160,32 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow() {
-    if (wx.getStorageSync("paperBookList")) {
-      this.setData({
-        paperBookList: wx.getStorageSync("paperBookList"),
-      })
-    }
-    if (wx.getStorageSync("electronicBookList")) {
-      this.setData({
-        electronicBookList: wx.getStorageSync("electronicBookList"),
-      })
-    }
     this.setData({
-      num: this.data.paperBookList.length + this.data.electronicBookList.length
+      page: 1,
+      paperBookList: [],
+      electronicBookList: []
     })
+    this.getAlreadyPBookList()
+    this.getAlreadyEBookList()
+    // 鑾峰彇鐢宠娆℃暟
+    this.getSelectPaperBookCount()
+    this.getSelectBookCount()
+    console.log(this.data.electronicBookList.length, this.data.paperBookList.length, 1)
+    if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
+      if (wx.getStorageSync("paperBookList")) {
+        this.setData({
+          paperBookList: wx.getStorageSync("paperBookList"),
+        })
+      }
+      if (wx.getStorageSync("electronicBookList")) {
+        this.setData({
+          electronicBookList: wx.getStorageSync("electronicBookList"),
+        })
+      }
+      this.setData({
+        num: this.data.paperBookList.length + this.data.electronicBookList.length
+      })
+    }
     this.getBookList(false);
   },
   goBack() {
@@ -184,7 +193,7 @@
   },
 
   // 鑾峰彇绾歌川涔﹀墿浣欐鏁�
-  getSelectPaperBookCount(item) {
+  getSelectPaperBookCount() {
     app.MG.app
       .getTicketResult({
         ticketRefCodeOrGuid: 'paperSampleBookapplyNum',
@@ -197,7 +206,7 @@
       })
   },
   // 鑾峰彇鐢靛瓙涔﹀墿浣欐鏁�
-  getSelectBookCount(item) {
+  getSelectBookCount() {
     app.MG.app
       .getTicketResult({
         ticketRefCodeOrGuid: 'electronicSampleBookapplyNum',
@@ -430,26 +439,30 @@
             }
             if (that.data.alreadyPaperBookList.length > 0) {
               that.data.alreadyPaperBookList.forEach((pBook) => {
-                pBook.content.forEach((pBookItem) => {
-                  if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
-                    item.paperDisabled = true
-                    item.paperChecked = true
-                  }
-                  if (pBookItem.id === item.id && pBook.state == 'Normal') {
-                    item.paperDisabled = false
-                  }
-                })
+                if (pBook.content.length > 0) {
+                  pBook.content.forEach((pBookItem) => {
+                    if (pBookItem.id === item.id && pBook.state == 'WaitAudit') {
+                      item.paperDisabled = true
+                      item.paperChecked = true
+                    }
+                    if (pBookItem.id === item.id && pBook.state == 'Normal') {
+                      item.paperDisabled = false
+                    }
+                  })
+                }
               })
             }
 
             if (that.data.alreadyElectronicBookList.length > 0) {
               that.data.alreadyElectronicBookList.forEach((eBook) => {
-                eBook.content.forEach((eBookItem) => {
-                  if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
-                    item.electronDisabled = true
-                    item.electronChecked = true
-                  }
-                })
+                if (eBook.content.length > 0) {
+                  eBook.content.forEach((eBookItem) => {
+                    if (eBookItem.id === item.id && !eBook.isExpiry && eBook.state != 'Reject') {
+                      item.electronDisabled = true
+                      item.electronChecked = true
+                    }
+                  })
+                }
               })
             }
             if (that.data.paperBookList.length > 0) {

--
Gitblit v1.9.1