From 558845242a07b68f42fa1802c45ab2769395d8b8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 29 四月 2024 14:31:30 +0800
Subject: [PATCH] 合并代码
---
pages/bookExhibitionList/index.js | 193 +++++++++++++++++++++++++++---------------------
1 files changed, 108 insertions(+), 85 deletions(-)
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 37a8d66..cdbed47 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -1,6 +1,6 @@
// pages/bookExhibitionList/index.js
import Toast from 'tdesign-miniprogram/toast/index';
-
+import watch from './watch/watch'
const app = getApp()
Page({
@@ -8,6 +8,8 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ name: "娴嬭瘯watch",
+ newPrice: '',
loading: true,
hidden: true,
totalSize: '',
@@ -37,26 +39,20 @@
},
{
value: 'jsek_bFHigherEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_higherEducation',
label: '楂樼瓑鏁欒偛',
},
{
value: 'jsek_bFVocationalEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_vocationalEducation',
label: '鑱屼笟鏁欒偛',
},
{
value: 'jsek_bFTeacherEducation',
- //閲嶇偣椤圭洰
- price: 'jsek_teacherEducation',
label: '鏁欏笀鏁欒偛',
},
],
},
multipleSelect: {
- value: [],
+ // value: [],
options: [],
},
navBarHeight: '',
@@ -82,6 +78,7 @@
},
],
},
+ newValue: ''
},
@@ -91,7 +88,9 @@
*/
onLoad(options) {
-
+ // this.setData({
+ // 'product.value': '*',
+ // });
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -100,38 +99,23 @@
barHeight: systInfo.statusBarHeight,
})
- // 鍗曞垪閫夋嫨鍣ㄩ�夐」
- const singleSelectOptions = this.data.filteredItems.map(item => ({
- label: item.name,
- value: item.value,
- disabled: false,
- }))
- if (this.data.filteredItems = []) {
-
- // singleSelectOptions.push({
- // label: '鏆傛棤鏁版嵁',
- // value: 'disabled',
- // disabled: true,
- // });
- } else {
- console.log(7889);
- }
-
-
-
-
-
-
- // 鏇存柊鏁版嵁
- this.setData({
- 'multipleSelect.options': singleSelectOptions,
- });
-
-
- //
+ // watch.setWatcher(this);
+ // let that = this;
+ // setTimeout(function () {
+ // that.data.name = "娴嬭瘯watch鍙樺寲浜�"
+ // }, 500)
+ // console.log(11111);
},
-
+ watch: {
+ name: function (newVal, oldVal) {
+ //杩欓噷鐨則his鍜宱nLoad閲岀殑this鎸囧悜涓�鏍�
+ console.log(newVal, oldVal);
+ },
+ newPrice: function (newVal, oldVal) {
+ console.log(newVal, oldVal);
+ }
+ },
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
@@ -144,8 +128,7 @@
*/
onShow() {
this.bookExhibitionGet()
- this.keyProjectsGet()
-
+ this.keyProjectsGet(this.data.newPrice)
},
/**
@@ -159,6 +142,8 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
onUnload() {
+
+
},
@@ -199,7 +184,6 @@
onReachBottom() {
if (this.data.page.size >= this.data.total) {
-
Toast({
context: this,
selector: '#t-toast',
@@ -217,9 +201,6 @@
'page.size': newSize
});
// this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
-
-
-
}
},
@@ -267,7 +248,7 @@
app.MG.store.getProductList({
storeInfo: 'jsek_bookFair',
- path: newValue,
+ path: this.data.newValue,
queryType: '*',
fields: {
jsek_link: [],
@@ -299,7 +280,7 @@
if (res.datas.length == 0) {
this.setData({
- keynoteDisabled: true
+ // keynoteDisabled: true
})
}
@@ -325,33 +306,82 @@
},
//閲嶇偣椤圭洰鎺ュ彛
keyProjectsGet(newPrice) {
+ this.setData({
+ filteredItems: [] // 濡傛灉瀛樺湪瀛愰」鍒欒祴鍊硷紝鍚﹀垯璧嬪�间负绌烘暟缁�
+ });
+ //楠ㄦ灦灞�
this.setData({
loading: true,
hidden: true,
})
+ // 鍙傛暟
let parms = {
refCodes: ['bookClassification']
}
+ //璇锋眰鏁版嵁
app.MG.store.getProductTypeField(parms).then(res => {
+
+ // 鏍煎紡鍖栨暟鎹�
const checkData = JSON.parse(res[0].config)
+ console.log(checkData);
+
+ // 寰幆鐒跺悗鍒ゆ柇鐩稿尮閰嶇殑鏁版嵁璧嬪�肩粰filteredItems
checkData.option.forEach(item => {
if (newPrice == item.value) {
+
+
+
this.setData({
filteredItems: item.child || [] // 濡傛灉瀛樺湪瀛愰」鍒欒祴鍊硷紝鍚﹀垯璧嬪�间负绌烘暟缁�
});
-
}
})
- this.onLoad();
+ let singleSelectOptions = []
+ // 鍗曞垪閫夋嫨鍣ㄩ�夐」
+ // 鍗曞垪閫夋嫨鍣ㄩ�夐」
+ this.data.filteredItems.forEach(item => {
+ singleSelectOptions.push({
+ label: item.name,
+ value: item.value,
+ });
+ });
+
+
+
+ if (singleSelectOptions.length === 0) {
+ singleSelectOptions.push({
+ label: '鏆傛棤鏁版嵁',
+
+ });
+
+ }
+
+ // 鏇存柊鏁版嵁
+ this.setData({
+ 'multipleSelect.options': singleSelectOptions,
+ });
+
+
+ // 鍙栨秷楠ㄦ灦灞�
this.setData({
loading: false,
hidden: false,
})
})
+ // if (newPrice) {
+ // this.setData({
+ // keynoteDisabled: false
+ // })
+ // }
+ // if (!newPrice) {
+ // this.setData({
+ // keynoteDisabled: true
+ // })
+ // }
},
@@ -360,73 +390,66 @@
// 鎬诲垎绫�
// 鎬诲垎绫�
onChange(e) {
- this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+
+
+
const newValue = e.detail.value;
- const selectedOption = this.data.product.options.find(option => option.value === newValue);
- const newPrice = selectedOption ? selectedOption.price : null;
-
-
- // const bookExhibitionListsubsidiary = []
- // this.setData({
- // bookExhibitionListsubsidiary: this.data.bookExhibitionList
- // })
-
-
- if (newPrice) {
- this.setData({
- keynoteDisabled: false
- })
- }
- if (!newPrice) {
- this.setData({
- keynoteDisabled: true
- })
- }
this.setData({
'product.value': newValue,
- 'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
+ newValue: newValue
});
- this.bookExhibitionGet(newValue);
- this.keyProjectsGet(newPrice);
- // 璋冪敤鏇存柊椤甸潰鏁版嵁鐨勫嚱鏁帮紝浼犲叆鏂扮殑 value 鍜� price 鍊�
+ let newPrice = ''
+ if (newValue == 'jsek_bFHigherEducation') {
+ newPrice = 'jsek_higherEducation'
+ // this.setData({
+ // newPrice: 'jsek_higherEducation'
+ // })
+ } else if (newValue == 'jsek_bFVocationalEducation') {
+ // this.setData({
+ // newPrice: 'jsek_vocationalEducation'
+ // })
+ newPrice = 'jsek_vocationalEducation'
+ } else if (newValue == 'jsek_bFTeacherEducation') {
+ // this.setData({
+ // newPrice: 'jsek_teacherEducation'
+ // })
+ newPrice = 'jsek_teacherEducation'
+ } else {
+ newPrice = ''
+ }
+
+ this.keyProjectsGet(newPrice)
+ this.bookExhibitionGet(newValue);
if (this.data.keynoteValue) {
//濡傛灉鏈夋暟鎹氨娓呯┖骞跺埛鏂伴〉闈�
this.data.keynoteValue = []
this.bookExhibitionGet(newValue)
- this.onLoad()
}
-
-
-
-
-
-
- // e.stopImmediatePropagation()
+ this.onLoad()
},
// 閲嶇偣椤圭洰
handleMultipleSelect(e) {
+ console.log(e);
this.setData({
'multipleSelect.value': e.detail.value,
});
},
handleConfirm(event) {
+ console.log(event);
const {
value
} = event.detail;
// 纭鎿嶄綔鐨勫鐞嗛�昏緫
-
-
this.data.keynoteValue = value
this.bookExhibitionGet()
},
handleReset(e) {
-
// 閲嶇疆鎿嶄綔鐨勫鐞嗛�昏緫
this.data.keynoteValue = []
this.bookExhibitionGet()
--
Gitblit v1.9.1