From 338ad19ee45b5380a0d8433cbbce2a727a576dfa Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期五, 19 四月 2024 17:34:36 +0800
Subject: [PATCH] bug2

---
 packageBookService/pages/bookServices/list/index.js |  120 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 6f9dd50..6cdf707 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -1,5 +1,4 @@
 const app = getApp();
-import { loginInfo } from "../../../../assets/js/login";
 Page({
   /**
    * 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -22,12 +21,7 @@
     bookList: [],
     stairList: {
       value: "",
-      options: [
-        {
-          value: "",
-          label: "涓�绾�",
-        },
-      ],
+      options: [],
     },
     secondList: {
       value: [],
@@ -40,8 +34,7 @@
     },
     sortList: {
       value: "default",
-      options: [
-        {
+      options: [{
           value: "default",
           label: "榛樿鎺掑簭",
         },
@@ -84,6 +77,7 @@
     disabledNewForms: false,
     triggered: false,
     backTop: "",
+    isshowLoading: true
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -127,13 +121,11 @@
     if (options.secondCode) {
       this.setData({
         secondCode: options.secondCode,
-        pathList: [
-          {
-            Path: options.secondCode,
-            Type: "*",
-            StoreRefCode: app.config.goodsStore,
-          },
-        ],
+        pathList: [{
+          Path: options.secondCode,
+          Type: "*",
+          StoreRefCode: app.config.goodsStore,
+        }, ],
       });
     }
     // 鑾峰彇浜岀骇鍒嗙被
@@ -172,6 +164,7 @@
       triggered: true,
     });
     this.setData({
+      isshowLoading: false,
       "pageCount.page": 1,
     });
     this.getBookList(this.data.path);
@@ -187,6 +180,7 @@
         this.setData({
           isMore: true,
           "pageCount.page": this.data.pageCount.page + 1,
+          isshowLoading: false
         });
         this.getBookList(this.data.path);
       }
@@ -228,12 +222,10 @@
       },
     };
     app.MG.store.getStoreChannelList(query).then(async (res) => {
-      const options = [
-        {
-          value: "",
-          label: "涓�绾�",
-        },
-      ];
+      const options = [{
+        value: "",
+        label: "涓�绾у垎绫�",
+      }, ];
       for (let index = 0; index < res.datas.length; index++) {
         const item = res.datas[index];
         options.push({
@@ -253,7 +245,7 @@
     });
   },
   // 鑾峰彇涓�绾у垎绫讳笅浜岀骇鍒嗙被
-  getSecondList(path) {
+  async getSecondList(path) {
     const options = [];
     const query = {
       path,
@@ -268,16 +260,7 @@
         field: "LinkOrder",
       },
     };
-    app.MG.store.getStoreChannelList(query).then((res) => {
-      if (!res.datas.length) {
-        this.setData({
-          disabledSecondList: true,
-        });
-      } else {
-        this.setData({
-          disabledSecondList: false,
-        });
-      }
+    await app.MG.store.getStoreChannelList(query).then((res) => {
       for (let index = 0; index < res.datas.length; index++) {
         const item = res.datas[index];
         options.push({
@@ -361,10 +344,15 @@
       return false;
     }
     this.setData({
-      loading: true,
       noData: false,
       isRequesting: true,
+      disabledSecondList: false
     });
+    if (this.data.isshowLoading) {
+      this.setData({
+        loading: true
+      })
+    }
     let sort;
     let pathObj = {};
     if (this.data.pathList.length) {
@@ -426,12 +414,10 @@
     }
     const query = {
       ...pathObj,
-      filterList: [
-        {
-          value: "Normal",
-          field: "state",
-        },
-      ],
+      filterList: [{
+        value: "Normal",
+        field: "state",
+      }, ],
       sort,
       paging: {
         start: 0,
@@ -453,11 +439,24 @@
         "pageCount.total": res.total,
         loading: false,
         isRequesting: false,
+        isshowLoading: true
       });
       if (!res.datas.length) {
         this.setData({
           noData: true,
         });
+      }
+      // 浜岀骇绂佺敤閫昏緫
+      // 1.涓�绾у垎绫绘湭閫変腑锛屼簩绾у垎绫荤鐢�
+      if (!this.data.stairList.value) {
+        this.setData({
+          disabledSecondList: true
+        })
+      } else if (this.data.stairList.value && !this.data.secondList.options.length) {
+        // 2. 涓�绾у垎绫婚�変腑锛屾棤浜岀骇鍒嗙被
+        this.setData({
+          disabledSecondList: true
+        })
       }
       if (this.data.triggered) {
         this.setData({
@@ -470,12 +469,10 @@
     });
   },
   // 涓�绾у垎绫诲垏鎹�
-  onChangeStair(e) {
-    const path = e.detail.value.length
-      ? `${this.data.assortCheck.code}\\${e.detail.value}`
-      : this.data.assortCheck.code;
-    console.log(this.data.path);
-
+  async onChangeStair(e) {
+    const path = e.detail.value.length ?
+      `${this.data.assortCheck.code}\\${e.detail.value}` :
+      this.data.assortCheck.code;
     this.setData({
       backTop: "#assort-title",
       pathList: [],
@@ -483,20 +480,21 @@
       secondCode: "",
       path: path,
       "stairList.value": e.detail.value,
+      // disabledSecondList: false
     });
-
-    if (e.detail.value == "") {
-      this.setData({
-        disabledSecondList: true,
-      });
-    } else {
-      this.getSecondList(path);
-    }
-    this.getBookList(path);
-    console.log(this.data.disabledSecondList);
+    // if (e.detail.value == "") {
+    //   this.setData({
+    //     disabledSecondList: true,
+    //   });
+    // } else {
+    await this.getSecondList(path);
+    // }
+    await this.getBookList(path);
   },
   // 浜岀骇鍒嗙被鍒囨崲
   onChangeSecond(e) {
+
+    console.log(789);
     const pathList = [];
     for (let index = 0; index < e.detail.value.length; index++) {
       const element = e.detail.value[index];
@@ -514,6 +512,8 @@
   },
   //
   onConfirmSecond() {
+
+
     this.getBookList(this.data.path);
   },
   // 閲嶇偣椤圭洰鏀瑰彉
@@ -603,7 +603,9 @@
   },
   // 璺宠浆鍥句功璇︽儏
   goDetail(e) {
-    const { book } = e.currentTarget.dataset;
+    const {
+      book
+    } = e.currentTarget.dataset;
     wx.navigateTo({
       url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
     });
@@ -615,15 +617,13 @@
     this.getBookList(this.data.path);
   },
   openDropdown() {
-    console.log("灞曞紑鍝�");
     this.setData({
       showDropdown: true,
     });
   },
   closeDropdown() {
-    console.log("鍏抽棴");
     this.setData({
       showDropdown: false,
     });
   },
-});
+});
\ No newline at end of file

--
Gitblit v1.9.1