From 04acf6421dded7b6f6eef9d2cf41d0b4a0e8dd0d Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期日, 28 四月 2024 09:23:10 +0800
Subject: [PATCH] 设置表单的bug

---
 packagePersonal/pages/userSetting/index.wxml |   24 ++
 packagePersonal/pages/aboutUs/index.js       |    7 
 packagePersonal/pages/userSetting/index.wxss |   23 ++
 app.wxss                                     |    3 
 pages/bookExhibitionList/select/select.wxml  |    2 
 pages/bookExhibitionList/watch/watch.js      |   40 ++++
 pages/bookExhibitionList/index.wxss          |    2 
 pages/bookExhibitionList/index.js            |  161 +++++++++--------
 pages/bookExhibitionList/index.wxml          |   24 +-
 packagePersonal/pages/aboutUs/index.wxss     |   52 +++--
 packagePersonal/pages/userSetting/index.js   |   22 ++
 packagePersonal/pages/aboutUs/index.wxml     |    4 
 app.json                                     |    3 
 pages/bookExhibitionList/select/select.js    |   66 +++++++
 pages/bibliographyList/index.wxml            |   11 +
 pages/bibliographyList/index.wxss            |   13 +
 assets/js/config.js                          |    8 
 pages/bibliographyList/index.js              |   59 ++++++
 18 files changed, 387 insertions(+), 137 deletions(-)

diff --git a/app.json b/app.json
index 1bb2d0d..f78a613 100644
--- a/app.json
+++ b/app.json
@@ -14,7 +14,8 @@
     "pages/personalCenter/certificate/index",
     "pages/bookServices/assort/index",
     "pages/testLogin/index",
-    "pages/bindInfo/index"
+    "pages/bindInfo/index",
+    "pages/bookExhibitionList/select/select"
   ],
   "subPackages": [
     {
diff --git a/app.wxss b/app.wxss
index 19efb42..fc0f368 100644
--- a/app.wxss
+++ b/app.wxss
@@ -12,5 +12,4 @@
 
 .t-loading__circular {
   color: #ff6d00 !important;
-}
-
+}
\ No newline at end of file
diff --git a/assets/js/config.js b/assets/js/config.js
index c98d8ff..458bd1a 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -1,7 +1,7 @@
-export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
-export const appId = 27;
-// export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
-// export const appId = 3;
+// export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
+// export const appId = 27;
+export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
+export const appId = 3;
 // export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
 export const epubUrl = "https://jsek.bnuic.com/epubReadMobile/#/";
 export const pdfUrl = "http://182.92.203.7:3007/pdfRead/";
diff --git a/packagePersonal/pages/aboutUs/index.js b/packagePersonal/pages/aboutUs/index.js
index 1900b12..b0dd42c 100644
--- a/packagePersonal/pages/aboutUs/index.js
+++ b/packagePersonal/pages/aboutUs/index.js
@@ -127,14 +127,13 @@
       },
     }).then(res => {
       // console.log(res.datas[0].content);
-
+      let modifiedContent = `<div class="richTextBox">${res.datas[0].content}</div>`;
+      console.log(modifiedContent);
       this.setData({
-        aboutText: res.datas[0].content,
+        aboutText: modifiedContent,
         loading: false,
         hidden: false,
       })
-
-
     })
   },
   goBack() {
diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml
index 4dbe5a2..163b54c 100644
--- a/packagePersonal/pages/aboutUs/index.wxml
+++ b/packagePersonal/pages/aboutUs/index.wxml
@@ -25,7 +25,7 @@
       <rich-text nodes="{{aboutText}}" space="emsp"></rich-text>
     </view>
   </view>
-  <view wx:else class="aboutText" style="margin: 5rpx;">
-    <rich-text class="richTextBox" style="width: 100%;" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text>
+  <view wx:else class="aboutText richTextBox" style="margin: 5rpx;">
+    <rich-text style="width: 100%;" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text>
   </view>
 </view>
\ No newline at end of file
diff --git a/packagePersonal/pages/aboutUs/index.wxss b/packagePersonal/pages/aboutUs/index.wxss
index 6786ef7..8103da5 100644
--- a/packagePersonal/pages/aboutUs/index.wxss
+++ b/packagePersonal/pages/aboutUs/index.wxss
@@ -48,44 +48,46 @@
 }
 
 
+
+.titleTextBox {
+  margin: 0 auto;
+}
+
+
+/* 瀵屾枃鏈垵濮嬪寲鏍峰紡 */
 .richTextBox {
-  line-height: 1.4;
-  font-size: 14px;
+  line-height: 1.4 !important;
+  font-size: 14px !important;
 }
 
 .richTextBox {
-  margin: revert;
-  padding: revert;
-  border: revert;
-  font: revert;
-  vertical-align: revert;
-  color: #000;
+  margin: revert !important;
+  padding: revert !important;
+  border: revert !important;
+  font: revert !important;
+  vertical-align: revert !important;
+  color: #000 !important;
 }
+
 
 .richTextBox p {
-  display: block;
-  text-align: center;
-  -webkit-margin-before: 1em;
-  margin-block-start: 1em;
-  -webkit-margin-after: 1em;
-  margin-block-end: 1em;
-  -webkit-margin-start: 0;
-  margin-inline-start: 0;
-  -webkit-margin-end: 0;
-  margin-inline-end: 0;
+  display: block !important;
+  -webkit-margin-before: 1em !important;
+  margin-block-start: 1em !important;
+  -webkit-margin-after: 1em !important;
+  margin-block-end: 1em !important;
+  -webkit-margin-start: 0 !important;
+  margin-inline-start: 0 !important;
+  -webkit-margin-end: 0 !important;
+  margin-inline-end: 0 !important;
 }
 
 .richTextBox td {
-  border-bottom: 1px dashed;
-  border-right: 1px dashed;
+  border-bottom: 1px dashed !important;
+  border-right: 1px dashed !important;
   border-width: 1px !important;
 }
 
 .richTextBox table {
   border-width: 2px !important;
-}
-
-.titleTextBox {
-  margin: 0 auto;
-
 }
\ No newline at end of file
diff --git a/packagePersonal/pages/userSetting/index.js b/packagePersonal/pages/userSetting/index.js
index 33ac09a..1bbd3e3 100644
--- a/packagePersonal/pages/userSetting/index.js
+++ b/packagePersonal/pages/userSetting/index.js
@@ -24,6 +24,7 @@
     emailError: false,
     imgCode: '',
     countDown: 0,
+    mailCountDown: 0,
     userInfoBox: false,
     height: '', //灞忓箷楂樺害
   },
@@ -126,6 +127,7 @@
     this.setData({
       userInfoBox: e.detail.visible,
       countDown: 0,
+      mailCountDown:0
     });
   },
   editIconInfo(e) {
@@ -343,6 +345,8 @@
               icon: 'none',
               duration: 1000
             })
+            // 寮�鍚煭淇¢獙璇佸�掕鏃�
+            this.getSecondEmail(60)
           } else {
             wx.showToast({
               title: '閭楠岃瘉鐮佸彂閫佸け璐�',
@@ -360,6 +364,24 @@
       })
     }
   },
+  getSecondEmail(time) {
+    if (this.data.mailCountDown <= 0) {
+      this.setData({
+        mailCountDown: time,
+      });
+
+      let timer = setInterval(() => {
+        let count = this.data.mailCountDown - 1;
+        this.setData({
+          mailCountDown: count,
+        });
+
+        if (count === 0) {
+          clearInterval(timer);
+        }
+      }, 1000);
+    }
+  },
 
   confirmInfo() {
     if (this.data.editType == 'nickName') {
diff --git a/packagePersonal/pages/userSetting/index.wxml b/packagePersonal/pages/userSetting/index.wxml
index 4971506..8147931 100644
--- a/packagePersonal/pages/userSetting/index.wxml
+++ b/packagePersonal/pages/userSetting/index.wxml
@@ -109,17 +109,29 @@
         <view class="from-item" wx:if="{{editType == 'phone'}}">
           <view class="label"> 鎵嬫満鍙凤細 </view>
           <view class="item-content">
-            <view class="inputBox1">
-              <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{userInfoForm.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onPhoneInput" />
+            <view class="outsideInputBox1">
+
+              <view class="inputBox1">
+                <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{userInfoForm.phone}}" type="number" bindchange="onPhoneInput" />
+              </view>
+              <view wx:if="{{phoneError}}" style="font-size: 24rpx; color: red;">鎵嬫満鍙疯緭鍏ヤ笉姝g‘</view>
+
+
             </view>
+
           </view>
         </view>
         <view class="from-item" wx:if="{{editType == 'email'}}">
           <view class=" label"> 閭锛� </view>
           <view class="item-content">
-            <view class="inputBox1">
-              <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" />
+            <view class="outsideInputBox1">
+              <view class="inputBox1">
+                <t-input placeholder="杈撳叆閭" borderless value="{{userInfoForm.email}}" bindchange="onEmailInput" />
+
+              </view>
+              <view wx:if="{{emailError}}" style="font-size: 24rpx; color: red;">閭杈撳叆涓嶆纭�</view>
             </view>
+
           </view>
         </view>
         <view class="from-item" wx:if="{{editType !== 'nickName'}}">
@@ -141,7 +153,7 @@
               <t-input placeholder="杈撳叆鐭俊楠岃瘉鐮�" borderless value="{{userInfoForm.code}}" type="number" bindchange="onCodeInput" />
             </view>
             <view class="code">
-              <button class="btn" bindtap="getPhoneCode">{{countDown > 0 ? '楠岃瘉鐮�(' + countDown + 's)' : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
+              <button class="{{countDown > 0 ? ' disabled' : 'btn'}}" bindtap="getPhoneCode">{{countDown > 0 ? '楠岃瘉鐮�(' + countDown + 's)' : '鑾峰彇鐭俊楠岃瘉鐮�'}}</button>
             </view>
           </view>
         </view>
@@ -152,7 +164,7 @@
               <t-input placeholder="杈撳叆閭楠岃瘉鐮�" borderless value="{{userInfoForm.code}}" type="number" bindchange="onCodeInput" />
             </view>
             <view class="code">
-              <button class="btn" bindtap="getEmailCode">鑾峰彇閭楠岃瘉鐮�</button>
+              <button class="{{mailCountDown > 0 ? ' disabled' : 'btn'}}" bindtap="getEmailCode"> {{mailCountDown > 0 ? '楠岃瘉鐮�(' + mailCountDown + 's)' : '鑾峰彇閭楠岃瘉鐮�'}}</button>
             </view>
           </view>
         </view>
diff --git a/packagePersonal/pages/userSetting/index.wxss b/packagePersonal/pages/userSetting/index.wxss
index 40e4259..383a21c 100644
--- a/packagePersonal/pages/userSetting/index.wxss
+++ b/packagePersonal/pages/userSetting/index.wxss
@@ -74,13 +74,21 @@
 .row-info .body .from-item .item-content {
   flex: 1;
   display: flex;
+
 }
 
 .inputBox1 {
   border: 2rpx solid #D9D9D9;
   flex: 1;
+  width: 100%;
+
 }
 
+.outsideInputBox1 {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
 
 
 .block {
@@ -129,6 +137,17 @@
   border: 2rpx solid #ff6c00;
   color: #fff;
   font-size: 28rpx;
+}
+
+.disabled {
+  width: 190rpx;
+  height: 72rpx;
+  background: #ccc;
+
+  color: #000;
+  cursor: not-allowed;
+  font-size: 28rpx;
+  padding: 0 10rpx !important;
 }
 
 .footer {
@@ -195,4 +214,8 @@
 .right-btn {
   background-color: #ff6c00;
   color: white;
+}
+
+.t-input--default+.t-input__tips {
+  color: var(--td-input-default-tips-color, var(--td-font-gray-3, rgba(229, 62, 48))) !important;
 }
\ No newline at end of file
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 2432d98..ee3e3b0 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -8,6 +8,9 @@
      * 椤甸潰鐨勫垵濮嬫暟鎹�
      */
     data: {
+      hiddenmodalput: false,
+      name: "",
+      phoneNum: '',
       input: '',
       dialogKey: '',
       showWithInput: false,
@@ -36,6 +39,10 @@
      * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
      */
     onLoad(options) {
+
+
+
+
       this.higherGet()
       this.vocationalGet()
       this.teacherGet()
@@ -437,10 +444,12 @@
 
 
       this.setData({
-        [key]: true,
-        dialogKey: key,
+        // [key]: true,
+        // dialogKey: key,
+        hiddenmodalput: true,
         input: '',
         Md5: item.datas.freeFile.FileList[0].Md5
+
       });
 
 
@@ -495,7 +504,53 @@
       });
       console.log(111);
     },
+    //鍙栨秷寮规
+    cancelM: function (e) {
+      this.setData({
+        hiddenmodalput: false,
+      })
+    },
+    //鎻愪氦
+    confirmM: function (e) {
+      console.log("濮撳悕锛�" + this.data.name + "  鐢佃瘽锛�" + this.data.phoneNum);
+      if (!this.data.emailError && this.data.name) {
 
 
 
+
+        if (this.data.name) {
+          let query = {
+            eMail: this.data.name,
+            md5s: [this.data.Md5]
+          }
+          app.MG.file.sendFileWithEmail(query).then(res => {
+            console.log(res);
+            this.setData({
+              hiddenmodalput: false,
+            })
+          })
+        }
+      } else {
+        // 鏍¢獙涓嶉�氳繃锛岀粰鍑洪敊璇彁绀�
+        wx.showToast({
+          title: '閭鏍煎紡涓嶆纭�',
+          icon: 'none',
+        });
+      }
+
+    },
+
+    iName: function (e) {
+      this.setData({
+        name: e.detail.value
+      })
+      // console.log(this.data.name);
+    },
+    iPhoneNum: function (e) {
+      this.setData({
+        phoneNum: e.detail.value
+      })
+    },
+
+
   })
\ No newline at end of file
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index 61c8f19..19be58d 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -129,4 +129,15 @@
   </view>
 
 </view>
+
+
+<modal hidden="{{!hiddenmodalput}}" title="璇疯緭鍏ラ偖绠�" confirm-text="纭畾" cancel-text="鍙栨秷" bindcancel="cancelM" bindconfirm="confirmM" style="height: 300rpx !important;">
+  <view style="height: 50rpx;"></view>
+  <input bindinput='iName' type='text' placeholder="璇疯緭鍏ラ偖绠卞彿" auto-focus />
+  <view style="height: 50rpx;"></view>
+</modal>
+
+
+
+
 <t-toast id="t-toast" />
\ No newline at end of file
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index 5a3bbaf..2c5794b 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -26,10 +26,12 @@
 
 .higherBox {
   width: 220rpx;
-  /* height: 390rpx; */
+  /* min-height: 390rpx; */
   /* box-shadow: 10rpx 10rpx 10rpx 10rpx rgba(0, 0, 0, 0.08); */
+  box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(0, 0, 0, 0.08);
   margin: 30rpx 15rpx;
   background-color: #fff;
+  margin-bottom: 0rpx ;
 }
 
 .outsideHigherBox {
@@ -50,13 +52,20 @@
 }
 
 .higherTextBox {
+  height: 50rpx;
   font-weight: bold;
   font-size: 25rpx;
   color: #333333;
   padding: 15rpx;
-  margin-bottom: 10rpx;
+  margin-bottom: 20rpx;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
+
 .outsideHigherImageBox {}
 
 .downloadIcon {
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 37a8d66..7064469 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: '',
@@ -91,7 +87,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 +98,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鍙樺寲浜�"
+    }, 5000)
     // 
   },
-
+  watch: {
+    name: function (newVal, oldVal) {
+      //杩欓噷鐨則his鍜宱nLoad閲岀殑this鎸囧悜涓�鏍� 
+      console.log(newVal, oldVal);
+    },
+    newPrice: function (newVal, oldVal) {
+      console.log(newVal, oldVal);
+    }
+  },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
@@ -143,8 +126,11 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
    */
   onShow() {
+    // debugger
     this.bookExhibitionGet()
-    this.keyProjectsGet()
+
+    // this.keyProjectsGet(this.data.newPrice)
+
 
   },
 
@@ -159,6 +145,8 @@
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
    */
   onUnload() {
+
+
 
   },
 
@@ -209,6 +197,10 @@
         preventScrollThrough: true,
         icon: 'poweroff',
       });
+
+
+
+
     } else {
       // const currentPage = this.data.page.start + 1; // 鑾峰彇褰撳墠椤垫暟骞跺姞1
       const newSize = this.data.page.size + 10; // 鍘熸潵鐨勫熀纭�涓婂姞10
@@ -299,7 +291,7 @@
 
       if (res.datas.length == 0) {
         this.setData({
-          keynoteDisabled: true
+          // keynoteDisabled: true
         })
       }
 
@@ -325,53 +317,39 @@
   },
   //閲嶇偣椤圭洰鎺ュ彛
   keyProjectsGet(newPrice) {
-
     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);
       checkData.option.forEach(item => {
         if (newPrice == item.value) {
           this.setData({
             filteredItems: item.child || [] // 濡傛灉瀛樺湪瀛愰」鍒欒祴鍊硷紝鍚﹀垯璧嬪�间负绌烘暟缁�
           });
-
         }
       })
-
-      this.onLoad();
+      // 鍗曞垪閫夋嫨鍣ㄩ�夐」
+      const singleSelectOptions = this.data.filteredItems.map(item => ({
+        label: item.name,
+        value: item.value,
+      }))
+      // 鏇存柊鏁版嵁
+      this.setData({
+        'multipleSelect.options': singleSelectOptions,
+      });
 
       this.setData({
         loading: false,
         hidden: false,
       })
     })
-  },
-
-
-
-
-  // 鎬诲垎绫�
-  // 鎬诲垎绫�
-  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
@@ -382,44 +360,77 @@
         keynoteDisabled: true
       })
     }
+  },
+
+
+
+
+  // 鎬诲垎绫�
+  // 鎬诲垎绫�
+  onChange(e) {
+
+
+
+    // this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+    const newValue = e.detail.value;
 
     this.setData({
       'product.value': newValue,
-      'product.price': newPrice, // 灏嗛�変腑鐨� price 鍊间繚瀛樺湪鏁版嵁涓�
+
     });
+
+
+    // debugger
+    // let newPrice = ''
+
+
+
+
+    if (newValue == 'jsek_bFHigherEducation') {
+
+      this.setData({
+        newPrice: 'jsek_higherEducation'
+      })
+    } else if (newValue == 'jsek_bFVocationalEducation') {
+      this.setData({
+        newPrice: 'jsek_vocationalEducation'
+      })
+    } else if (newValue == 'jsek_bFTeacherEducation') {
+      this.setData({
+        newPrice: 'jsek_teacherEducation'
+      })
+    }
     this.bookExhibitionGet(newValue);
-    this.keyProjectsGet(newPrice);
-    // 璋冪敤鏇存柊椤甸潰鏁版嵁鐨勫嚱鏁帮紝浼犲叆鏂扮殑 value 鍜� price 鍊�
+    this.keyProjectsGet(this.data.newPrice)
+
+
+
 
     if (this.data.keynoteValue) {
       //濡傛灉鏈夋暟鎹氨娓呯┖骞跺埛鏂伴〉闈�
       this.data.keynoteValue = []
       this.bookExhibitionGet(newValue)
-      this.onLoad()
+
     }
 
 
 
 
-
-
-    // e.stopImmediatePropagation()
-
   },
 
   // 閲嶇偣椤圭洰
   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()
   },
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index e68147d..2d93faa 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -20,33 +20,30 @@
         </view>
         <view class="example-search">
           <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功灞曞悕绉�" bind:submit="onSearchSubmit" />
-
         </view>
-
       </view>
     </view>
+
+
     <view class="outsideMenuBox">
       <view class="menuBox">
+
         <t-dropdown-menu>
-          <!-- show-overlay="{{false}}" -->
-          <!-- <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" /> -->
-          <t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
+
+
+
+
+          <t-dropdown-item options="{{product.options}}" default-value="{{product.value}}" bindchange="onChange" />
 
 
           <!-- disabled="{{keynoteDisabled}}" -->
-          <t-dropdown-item disabled="{{keynoteDisabled}}" label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset">
+          <t-dropdown-item label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset">
           </t-dropdown-item>
-
           <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
-
         </t-dropdown-menu>
-
       </view>
     </view>
   </view>
-
-
-
   <view class="assembleContent">
     <view class="titleBox">
       <view class="frameBox"></view>
@@ -59,7 +56,7 @@
       <view class="outside">
 
 
-        <!-- <button bind:tap="onTest">鐐逛竴涓�</button> -->
+
 
 
 
@@ -80,6 +77,7 @@
         <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
         <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
       </view>
+      <!-- <Select prop-array='{{selectArray}}'></Select> -->
     </scroll-view>
 
   </view>
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index f6a9b09..801fa1e 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -137,7 +137,7 @@
 
 .menuBox {
   display: flex;
-  /* height: 75rpx; */
+  height: 100rpx;
   margin-top: 10rpx;
   align-items: center;
 
diff --git a/pages/bookExhibitionList/select/select.js b/pages/bookExhibitionList/select/select.js
new file mode 100644
index 0000000..c4bd5ad
--- /dev/null
+++ b/pages/bookExhibitionList/select/select.js
@@ -0,0 +1,66 @@
+// pages/bookExhibitionList/select/select.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/bookExhibitionList/select/select.wxml b/pages/bookExhibitionList/select/select.wxml
new file mode 100644
index 0000000..fff5a83
--- /dev/null
+++ b/pages/bookExhibitionList/select/select.wxml
@@ -0,0 +1,2 @@
+<!--pages/bookExhibitionList/select/select.wxml-->
+<text>pages/bookExhibitionList/select/select.wxml</text>
\ No newline at end of file
diff --git a/pages/bookExhibitionList/watch/watch.js b/pages/bookExhibitionList/watch/watch.js
new file mode 100644
index 0000000..bd29a36
--- /dev/null
+++ b/pages/bookExhibitionList/watch/watch.js
@@ -0,0 +1,40 @@
+const observe = (obj, key, watchFun, deep, page) => {
+  let val = obj[key];
+  if (val != null && typeof val === "object" && deep) {
+    Object.keys(val).forEach((item) => {
+      observe(val, item, watchFun, deep, page);
+    });
+  }
+  Object.defineProperty(obj, key, {
+    configurable: true,
+    enumerable: true,
+    set: (value) => {
+      watchFun.call(page, value, val);
+      val = value;
+      if (deep) {
+        observe(obj, key, watchFun, deep, page);
+      }
+    },
+    get: () => {
+      return val;
+    }
+  });
+}
+const setWatcher = (page) => {
+  let data = page.data;
+  let watch = page.watch;
+  Object.keys(watch).forEach((item) => {
+    let targetData = data;
+    let keys = item.split(".");
+    for (let i = 0; i < keys.length - 1; i++) {
+      targetData = targetData[keys[i]];
+    }
+    let targetKey = keys[keys.length - 1];
+    let watchFun = watch[item].handler || watch[item];
+    let deep = watch[item].deep;
+    observe(targetData, targetKey, watchFun, deep, page);
+  });
+}
+module.exports = {
+  setWatcher
+};
\ No newline at end of file

--
Gitblit v1.9.1