From 14de3e90ae29af2ccfd51b08c6a11ab02fe8f8e7 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 05 三月 2024 19:02:35 +0800
Subject: [PATCH] feat(合并代码): 和冰帝阿

---
 pages/bookServices/list/index.wxml |   70 ++++++++++------------------------
 1 files changed, 21 insertions(+), 49 deletions(-)

diff --git a/pages/bookServices/list/index.wxml b/pages/bookServices/list/index.wxml
index 20900a8..4082e4d 100644
--- a/pages/bookServices/list/index.wxml
+++ b/pages/bookServices/list/index.wxml
@@ -5,14 +5,7 @@
   <view>
     <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
   </view>
-  <t-search
-    model:value="{{searchValue}}"
-    shape="round"
-    placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
-    class="navBar-search"
-    style="width: 464rpx"
-    bind:submit="searchBook"
-  />
+  <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
 </view>
 
 <view class="bookServices-list">
@@ -20,32 +13,9 @@
     <scroll-view scroll-x="{{true}}" class="header-scroll">
       <t-dropdown-menu>
         <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
-        <t-dropdown-item
-          label="浜岀骇"
-          options="{{secondList.options}}"
-          optionsColumns="2"
-          multiple
-          defaultValue="{{secondList.value}}"
-          bind:confirm="onChangeSecond"
-        />
-        <t-dropdown-item
-          label="閲嶇偣椤圭洰"
-          options="{{majorProjectList.options}}"
-          optionsColumns="2"
-          multiple
-          defaultValue="{{majorProjectList.value}}"
-          bind:confirm="changeMajorProject"
-          bind:reset="resetMajorProject"
-        />
-        <t-dropdown-item
-          label="鏂板舰鎬佹暀鏉�"
-          options="{{newTextBook.options}}"
-          optionsColumns="2"
-          multiple
-          defaultValue="{{newTextBook.value}}"
-          bind:confirm="changeNewText"
-          bind:reset="resetNewText"
-        />
+        <t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
+        <t-dropdown-item label="閲嶇偣椤圭洰" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
+        <t-dropdown-item label="鏂板舰鎬佹暀鏉�" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
       </t-dropdown-menu>
     </scroll-view>
     <view class="header-sort" bind:tap="sortClick">
@@ -56,19 +26,21 @@
       </view>
     </view>
   </view>
-  <scroll-view scroll-y="{{true}}" class="list-container">
-    <view class="assort-title">
-      <view class="title-box"></view>
-      <view class="title-name">{{assortCheck.name}}</view>
-    </view>
-    <view class="book-list">
-      <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}">
-        <view class="book-img">
-          <t-image src="{{item.icon}}" width="105" height="145" aria-label="{item.name{}}" />
-        </view>
-        <view class="book-name book-color">{{ item.name}}</view>
-        <view class="book-author book-color">{{item.author}}</view>
+  <t-pull-down-refresh value="{{enable}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onRefresh">
+    <scroll-view scroll-y="{{true}}" class="list-container">
+      <view class="assort-title">
+        <view class="title-box"></view>
+        <view class="title-name">{{assortCheck.name}}</view>
       </view>
-    </view>
-  </scroll-view>
-</view>
+      <view class="book-list">
+        <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}">
+          <view class="book-img">
+            <t-image src="{{item.icon}}" width="105" height="145" aria-label="{item.name{}}" />
+          </view>
+          <view class="book-name book-color">{{ item.name}}</view>
+          <view class="book-author book-color">{{item.author}}</view>
+        </view>
+      </view>
+    </scroll-view>
+  </t-pull-down-refresh>
+</view>
\ No newline at end of file

--
Gitblit v1.9.1