From b6923adb7b6a5fcbe4a2eaa06e1ebe0e044ba0e2 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期四, 28 三月 2024 14:22:42 +0800 Subject: [PATCH] 代码合并 --- pages/bookExhibitionList/index.js | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js index a3ae6df..babb3d4 100644 --- a/pages/bookExhibitionList/index.js +++ b/pages/bookExhibitionList/index.js @@ -26,7 +26,6 @@ }, product: { value: '*', - options: [ { value: '*', @@ -59,6 +58,7 @@ navBarHeight: '', barHeight: '', windowHeight: '', + }, @@ -100,12 +100,14 @@ - + console.log(this.data.bookExhibitionList.length, 'this.data.bookExhibitionList.length'); // 鏇存柊鏁版嵁 this.setData({ 'multipleSelect.options': singleSelectOptions, }); + + // }, /** @@ -120,8 +122,8 @@ */ onShow() { this.bookExhibitionGet() - this.keyProjectsGet() + }, /** @@ -222,12 +224,24 @@ console.log(res, 'item'); this.data.total = res.total - // list.push(res.datas) + // list.push(res.datas) + console.log(res.datas.length); + + + if (res.datas.length == 0) { + this.setData({ + keynoteDisabled: true + }) + } + const list = [...res.datas] this.setData({ bookExhibitionList: list }) + // 鍒ゆ柇鏁版嵁闀垮害 + console.log(list.length, 'list.length'); + //鍙栨秷 wx.hideLoading() @@ -296,15 +310,11 @@ if (this.data.keynoteValue) { //濡傛灉鏈夋暟鎹氨娓呯┖骞跺埛鏂伴〉闈� this.data.keynoteValue = [] - this.bookExhibitionGet(newValue) this.onLoad() - console.log('true'); - } else { - // this.bookExhibitionGet(newValue); - // this.keyProjectsGet(newPrice); - console.log('fals'); } + + }, @@ -313,6 +323,7 @@ this.setData({ 'multipleSelect.value': e.detail.value, }); + }, handleConfirm(event) { @@ -324,6 +335,7 @@ this.bookExhibitionGet() }, handleReset() { + // 閲嶇疆鎿嶄綔鐨勫鐞嗛�昏緫 this.data.keynoteValue = [] console.log('閲嶇疆鎿嶄綔'); -- Gitblit v1.9.1