From 0b523220931d70aa752c3beaca5ed32ca85511c5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 11:36:05 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageDomain/pages/sampleBookList/index.wxml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 2dd041e..ff98b95 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -10,13 +10,15 @@
</view>
<view class="list-header">
<view class="header-scroll">
- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox">
+ <!-- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox"> -->
+ <view class="srcolbox">
<t-dropdown-menu>
- <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" default-value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" arrow-icon="" />
- <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" arrow-icon="" />
+ <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
+ <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" />
<t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
</t-dropdown-menu>
- </scroll-view>
+ </view>
+ <!-- </scroll-view> -->
</view>
<view class="header-sort" bind:tap="sortClick">
<view class="sort-name">鎺掑簭</view>
@@ -50,8 +52,8 @@
<view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
<view class="checkbox">
- <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' default-checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
- <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" default-checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
+ <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
+ <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
</view>
</view>
</view>
--
Gitblit v1.9.1