From 608eefe5fb03d2f3d3145b11d7de573434451e76 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 29 三月 2024 19:42:58 +0800
Subject: [PATCH] 详情页bug修改
---
packageBookService/pages/bookServices/detail/components/note/note.wxml | 2
packageBookService/pages/bookServices/list/index.wxml | 120 +++++++++++++++++------------
packageBookService/pages/bookServices/detail/components/note/note.wxss | 6 +
packageBookService/pages/bookServices/examination/questionList/index.wxss | 7 +
packageBookService/pages/bookServices/examination/questionList/index.wxml | 17 +++
packageBookService/pages/bookServices/list/index.wxss | 4 +
packageBookService/pages/bookServices/examination/examination.js | 6 -
packageBookService/pages/bookServices/detail/index.wxml | 2
packageBookService/pages/bookServices/list/index.js | 44 ++++++++++
packageBookService/pages/bookServices/detail/index.wxss | 1
10 files changed, 148 insertions(+), 61 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.wxml b/packageBookService/pages/bookServices/detail/components/note/note.wxml
index 1a1f5e5..6a772b5 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.wxml
+++ b/packageBookService/pages/bookServices/detail/components/note/note.wxml
@@ -53,7 +53,7 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</view>
- <view class="bottom-box">
+ <view class="bottom-box" wx:if="{{noteList.length}}">
<t-loading wx:if="{{isMore == true}}"></t-loading>
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.wxss b/packageBookService/pages/bookServices/detail/components/note/note.wxss
index 959c6d2..0c36147 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.wxss
+++ b/packageBookService/pages/bookServices/detail/components/note/note.wxss
@@ -1,9 +1,14 @@
/* pages/bookServices/detail/components/note/note.wxss */
+.note {
+ height: 100%;
+}
+
.popup {
padding: 40rpx;
width: 600rpx;
}
+
.note-btn {
height: 140rpx;
@@ -141,6 +146,7 @@
}
.bottom-box {
+ margin-top: 100rpx;
display: flex;
justify-content: center;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index a932168..1461b12 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -173,7 +173,7 @@
<view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy}}">鍔犲叆璐墿杞�</view>
<view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy}}">绔嬪嵆璐拱</view>
- <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
+ <view class="buy read " bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
</view>
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 8da704e..1f96b4b 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -283,6 +283,7 @@
align-items: center;
justify-content: center;
color: #fff;
+ background-color: #F14B3B;
}
.shopCarColor {
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 196a0ce..fc94dce 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -277,8 +277,7 @@
item.userAnswer = radioChecked
item.isUserAnswer = this.isHaveAnswer(radioChecked)
if ((item.questionType == 'singleChoice' || item.questionType == 'judge') && (this.data.answerType == 'collectQuestion' || this.data.answerType == 'errorQuestion') && !item.isComplete) {
- let index = this.data.currentIndex - 1 >= 0 ? this.data.currentIndex - 1 : 0
- this.handleQuestion(index)
+ this.handleQuestion(this.data.currentIndex)
}
}
}
@@ -824,9 +823,8 @@
})
},
// 鎵规敼棰樼洰 锛堢粌涔狅紝鎴戠殑閿欓锛屾垜鐨勬敹钘�,锛岀粍鍗凤級
- handleQuestion(num) {
+ handleQuestion(index) {
const questionList = this.data.questionDataList
- const index = num
if (questionList[index].isComplete) {
// 棰樼洰宸插畬鎴愶紝璺宠繃
return true
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index f866510..9153292 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -120,6 +120,7 @@
<view
wx:if="{{item.optionStyle == 'TxtAndImage'}}"
class="fl-center"
+ style="height: min-content"
>
<text>{{contentItem.value}}銆�</text>
<text class="radio-textimg">{{contentItem.txt}}</text>
@@ -170,14 +171,18 @@
<t-checkbox
block="{{false}}"
value="{{contentItem.value}}"
- style="background-color:{{isNight ? '#222' :'#fff'}}; display: flex; align-items: center;"
+ style="background-color:{{isNight ? '#222' :'#F9F9F9'}}; display: flex; align-items: center; margin-bottom: 20rpx;"
>
<!-- 浠呮枃瀛� -->
- <text
+ <view
+ class="fl-center"
wx:if="{{item.optionStyle == 'Txt'}}"
style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
- >{{contentItem.value}}銆亄{contentItem.txt}}</text
>
+ <text>{{contentItem.value}}銆�</text>
+ <text class="check-text-box">{{contentItem.txt}}</text>
+ </view>
+
<!-- 浠呭浘鐗� -->
<view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
<text
@@ -237,6 +242,12 @@
style="background-color:{{isNight ? '#000' : '#fff'}}; "
/>
</view>
+ <!-- 鎴戠殑閿欓妯″紡涓嬶紝鏌ョ湅瑙ｆ瀽鎸夐挳 -->
+ <view
+ wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.questionType == 'multipleChoice' || item.questionType == 'completion' || item.questionType == 'shortAnswer')}}"
+ >
+ 鏌ョ湅瑙ｆ瀽
+ </view>
<!-- 鍗曢�夈�佸閫夎В鏋� -->
<view
class="analysis"
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 6e45efd..8b7b3b5 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -48,6 +48,7 @@
}
.radio-item {
+ max-height: 300rpx;
padding: 0 32rpx;
min-height: 98rpx;
display: flex;
@@ -246,5 +247,11 @@
.radio-textimg {
display: inline-block;
+ height: min-content;
width: calc(100% - 90rpx);
+}
+
+.check-text-box {
+ display: inline-block;
+ width: calc(100% - 25px);
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index a2bf820..f8279a2 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -34,7 +34,6 @@
options: [],
disabled: false,
},
- disabledSecondList: false,
majorProjectList: {
value: [],
options: [],
@@ -54,6 +53,11 @@
noData: false,
showDropdown: false,
isRequesting: false,
+ disabledStair: false,
+ disabledSecondList: false,
+ disabledProject: false,
+ disabledNewForms: false,
+ triggered: false,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -135,7 +139,13 @@
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
onPullDownRefresh() {
- console.log('涓嬫媺');
+ this.setData({
+ triggered: true
+ })
+ this.setData({
+ 'pageCount.page': 1
+ })
+ this.getBookList(this.data.path);
},
/**
@@ -173,6 +183,9 @@
},
// 鑾峰彇涓�绾у垪琛�
getStairList(path) {
+ this.setData({
+ disabledStair: false
+ })
const query = {
path,
filterList: [],
@@ -202,6 +215,11 @@
'stairList.options': options,
'stairList.value': this.data.stairCode,
});
+ if (!options.length) {
+ this.setData({
+ disabledStair: true
+ })
+ }
});
},
// 鑾峰彇涓�绾у垎绫讳笅浜岀骇鍒嗙被
@@ -239,6 +257,10 @@
},
// 鑾峰彇閲嶇偣椤圭洰
getProjectList(type) {
+ this.setData({
+ disabledProject: false,
+ disabledNewForms: false
+ })
const options = [];
const arr = [];
let array = [];
@@ -264,6 +286,11 @@
label: element.name,
});
}
+ if (!options.length) {
+ this.setData({
+ disabledProject: true
+ })
+ }
this.setData({
'majorProjectList.options': options,
});
@@ -274,6 +301,11 @@
value: element.value,
label: element.name,
});
+ }
+ if (!options.length) {
+ this.setData({
+ disabledNewForms: true
+ })
}
this.setData({
'newTextBook.options': options,
@@ -367,6 +399,14 @@
})
}
}
+ if (this.data.triggered) {
+ this.setData({
+ triggered: false
+ })
+ wx.showToast({
+ title: '鍒锋柊鎴愬姛',
+ })
+ }
});
},
// 涓�绾у垎绫诲垏鎹�
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 5629905..95db35c 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -25,6 +25,7 @@
<view class="header-scroll">
<t-dropdown-menu style="width: 1000rpx">
<t-dropdown-item
+ disabled="{{disabledStair}}"
optionsColumns="2"
options="{{stairList.options}}"
value="{{stairList.value}}"
@@ -44,6 +45,7 @@
/>
<t-dropdown-item
label="閲嶇偣椤圭洰"
+ disabled="{{disabledProject}}"
options="{{majorProjectList.options}}"
optionsColumns="2"
multiple
@@ -53,6 +55,7 @@
/>
<t-dropdown-item
label="鏂板舰鎬佹暀鏉�"
+ disabled="{{disabledNewForms}}"
options="{{newTextBook.options}}"
optionsColumns="2"
multiple
@@ -80,67 +83,84 @@
<!-- </view> -->
</view>
</view>
- <t-pull-down-refresh
+ <!-- <t-pull-down-refresh
value="{{enable}}"
loadingProps="{{loadingProps}}"
loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
bind:refresh="onRefresh"
class="down-refresh"
>
- <scroll-view
- scroll-y="{{true}}"
- class="list-container"
- bindrefresherrefresh="onPullDownRefresh"
- bindscrolltolower="onReachBottom"
- >
- <view class="assort-title">
- <view class="title-box"></view>
- <view class="title-name">{{assortCheck.name}}</view>
- </view>
- <view class="page-content">
- <view class="book-list" wx:if="{{!loaidng}}">
- <view
- class="book-box"
- wx:for="{{bookList}}"
- wx:key="id"
- bind:tap="goDetail"
- data-book="{{item}}"
- >
- <view class="book-img">
- <image
- src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
- aria-label="{item.name{}}"
- mode="aspectFit"
- />
- </view>
- <view class="book-name book-color">{{ item.name}}</view>
- <view class="book-author book-color">{{item.author}}</view>
- </view>
- <view wx:if="{{noData}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view>
- </view>
- <!-- loading -->
- <view class="loading-box" wx:if="{{loaidng}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{loaidng}}"
- wx:if="{{loaidng}}"
- />
- </view>
- </view>
- <view class="bottom-box">
+ </t-pull-down-refresh> -->
+ <scroll-view
+ scroll-y="{{true}}"
+ refresher-enabled="{{true}}"
+ lower-threshold="{{200}}"
+ refresher-threshold="{{80}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindrefresherpulling="{{refresh.onPulling}}"
+ class="list-container"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindscrolltolower="onReachBottom"
+ >
+ <view slot="refresher" class="refresh-container">
+ <view class="loading">
<t-loading
theme="circular"
size="40rpx"
+ text="姝ｅ湪鍒锋柊..."
class="wrapper"
- wx:if="{{isMore == true}}"
/>
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
- </scroll-view>
- </t-pull-down-refresh>
+ </view>
+ <view class="assort-title">
+ <view class="title-box"></view>
+ <view class="title-name">{{assortCheck.name}}</view>
+ </view>
+ <view class="page-content">
+ <view class="book-list" wx:if="{{!loaidng}}">
+ <view
+ class="book-box"
+ wx:for="{{bookList}}"
+ wx:key="id"
+ bind:tap="goDetail"
+ data-book="{{item}}"
+ >
+ <view class="book-img">
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ aria-label="{item.name{}}"
+ mode="aspectFit"
+ />
+ </view>
+ <view class="book-name book-color">{{ item.name}}</view>
+ <view class="book-author book-color">{{item.author}}</view>
+ </view>
+ <view wx:if="{{noData}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+ </view>
+ <!-- loading -->
+ <view class="loading-box" wx:if="{{loaidng}}">
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{loaidng}}"
+ wx:if="{{loaidng}}"
+ />
+ </view>
+ </view>
+ <view class="bottom-box">
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
+ </view>
+ </scroll-view>
</view>
</page-meta>
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index c4c528e..26de0a8 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -248,4 +248,8 @@
.t-dropdown-item__body {
padding-bottom: 10rpx !important;
+}
+
+.refresh-container {
+ margin: 0 auto;
}
\ No newline at end of file
--
Gitblit v1.9.1