From 1053bf2995141d5f73868bd2fb58deb1bc68c480 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 27 三月 2024 11:07:46 +0800
Subject: [PATCH] 图书详情，答题器bug修改
---
packageBookService/pages/bookServices/list/index.wxml | 1
packageBookService/pages/bookServices/examination/questionList/index.wxml | 19 +++-
packageBookService/pages/bookServices/list/index.wxss | 23 ++++-
static/images/bookService/detail/biji-click-icon.png | 0
static/images/bookService/detail/biji-icon-g.png | 0
static/images/bookService/detail/test-click-icon.png | 0
packageBookService/pages/bookServices/detail/index.wxml | 18 ++++
packageBookService/pages/bookServices/detail/index.wxss | 13 +++
packageBookService/pages/bookServices/examination/examination.json | 3
pages/bookServices/assort/index.js | 3
packageBookService/pages/bookServices/examination/examination.wxml | 2
static/images/bookService/detail/test-icon-g.png | 0
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 2
static/images/bookService/detail/yunxuexi.png | 0
static/images/bookService/detail/jiaoxueziyuan.png | 0
packageBookService/pages/bookServices/detail/components/tag/index.js | 30 +++++++
static/images/bookService/detail/ebook-g.png | 0
packageBookService/pages/bookServices/detail/components/tag/index.json | 4 +
packageBookService/pages/bookServices/detail/index.js | 39 +++++++++
packageBookService/pages/bookServices/detail/components/tree/index.json | 3
static/images/bookService/detail/ebook-click.png | 0
packageBookService/pages/bookServices/examination/questionOptions/index.js | 8 +
static/images/bookService/detail/jiaoxueziyuan-click.png | 0
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 21 ++---
static/images/bookService/detail/yunxuexi-click.png | 0
packageBookService/pages/bookServices/detail/components/tag/index.wxss | 1
packageBookService/pages/bookServices/detail/components/tag/index.wxml | 8 ++
static/images/bookService/detail/tushujianjie-g.png | 0
static/images/bookService/detail/tushujianjie-click.png | 0
29 files changed, 164 insertions(+), 34 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.js b/packageBookService/pages/bookServices/detail/components/tag/index.js
new file mode 100644
index 0000000..bc0a86a
--- /dev/null
+++ b/packageBookService/pages/bookServices/detail/components/tag/index.js
@@ -0,0 +1,30 @@
+// packageBookService/pages/bookServices/detail/components/tag/index.js
+Component({
+ /**
+ * 缁勪欢鐨勫睘鎬у垪琛�
+ */
+ properties: {
+
+ },
+
+ /**
+ * 缁勪欢鐨勫垵濮嬫暟鎹�
+ */
+ data: {
+ list: [
+ { id: 1, name: '鍥句功绠�浠�' },
+ { id: 2, name: '鐢靛瓙涔�' },
+ { id: 3, name: '鏁欏璧勬簮' },
+ { id: 2, name: '浜戝涔�' },
+ { id: 2, name: '浜戞祴璇�' },
+ { id: 2, name: '浜戠瑪璁�' },
+ ]
+ },
+
+ /**
+ * 缁勪欢鐨勬柟娉曞垪琛�
+ */
+ methods: {
+
+ }
+})
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.json b/packageBookService/pages/bookServices/detail/components/tag/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/packageBookService/pages/bookServices/detail/components/tag/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.wxml b/packageBookService/pages/bookServices/detail/components/tag/index.wxml
new file mode 100644
index 0000000..58943ab
--- /dev/null
+++ b/packageBookService/pages/bookServices/detail/components/tag/index.wxml
@@ -0,0 +1,8 @@
+<!--packageBookService/pages/bookServices/detail/components/tag/index.wxml-->
+<scroll-view scroll-x="{{true}}">
+ <view wx:for="{{list}}" wx:key="id">
+ <view>
+ <text>{{item.name}}</text>
+ </view>
+ </view>
+</scroll-view>
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.wxss b/packageBookService/pages/bookServices/detail/components/tag/index.wxss
new file mode 100644
index 0000000..e5506f6
--- /dev/null
+++ b/packageBookService/pages/bookServices/detail/components/tag/index.wxss
@@ -0,0 +1 @@
+/* packageBookService/pages/bookServices/detail/components/tag/index.wxss */
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.json b/packageBookService/pages/bookServices/detail/components/tree/index.json
index aca6ac8..a3c8a81 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.json
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.json
@@ -7,6 +7,7 @@
"t-collapse-panel": "tdesign-miniprogram/collapse-panel/collapse-panel",
"t-button": "tdesign-miniprogram/button/button",
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox",
- "tree": "/packageBookService/pages/bookServices/detail/components/tree/index"
+ "tree": "/packageBookService/pages/bookServices/detail/components/tree/index",
+ "t-empty": "tdesign-miniprogram/empty/empty"
}
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 51494b5..39a38bf 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,16 +1,11 @@
<view class="tree">
- <t-collapse
- default-value="{{openIds}}"
- expandIcon="{{false}}"
- bind:change="handleChange"
- >
+ <t-collapse default-value="{{openIds}}" bind:change="handleChange">
<t-collapse-panel
wx:for="{{treeList}}"
wx:for-item="item"
wx:for-index="index"
wx:key="id"
value="{{item.id}}"
- disabled="{{!item.children.length}}"
>
<view slot="header" class="header-title">
<view>
@@ -22,13 +17,11 @@
wx:if="{{isShowCheck}}"
/>
<!-- <t-checkbox icon="rectangle" checked="{{true}}" data-item="{{item}}" bind:change="checkResourceTitle" /> -->
- <text>{{item.name}}</text>
+ <text>{{item.name}} </text
+ ><text wx:if="{{item.sysType =='CmsFolder'}}"
+ >锛坽{item.children ? item.children.length : 0}}锛�</text
+ >
</view>
- <image
- src="{{item.open ? '/static/images/bookService/detail/up.png' : '/static/images/bookService/detail/down.png'}}"
- class="list-icon"
- wx:if="{{item.children.length}}"
- />
</view>
<view
class="list"
@@ -179,6 +172,10 @@
></tree>
</view>
+ <!-- 鏆傛棤鏁版嵁 -->
+ <view wx:if="{{!item.children || !item.children.length}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="listItems" wx:if="{{children.length <= 0 && !loading}}">
鏆傛棤鏁版嵁
</view>
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index cd738e0..6d5226d 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -76,6 +76,45 @@
buyResourceData: {
productLinkPath: '',
refCode: '',
+ },
+ briefIcon: {
+ name: "/static/images/bookService/detail/tushujianjie-g.png"
+ },
+ briefIconClick: {
+ name: '/static/images/bookService/detail/tushujianjie-click.png'
+ },
+ eBookIcon: {
+ name: '/static/images/bookService/detail/ebook-g.png'
+ },
+ eBookClickIcon: {
+ name: '/static/images/bookService/detail/ebook-click.png'
+ },
+ teachResourcesIcon: {
+ name: '/static/images/bookService/detail/jiaoxueziyuan.png'
+ },
+ teachResourcesClickIcon: {
+ name: '/static/images/bookService/detail/jiaoxueziyuan-click.png'
+ },
+ learnResourceIcon: {
+ name: '/static/images/bookService/detail/yunxuexi.png'
+ },
+ learnResourceClickIcon: {
+ name: '/static/images/bookService/detail/yunxuexi-click.png'
+ },
+ testResourceIocn: {
+ name: '/static/images/bookService/detail/test-icon-g.png'
+ },
+ testResourceClickIocn: {
+ name: '/static/images/bookService/detail/test-click-icon.png'
+ },
+ noteIcon: {
+ name: '/static/images/bookService/detail/biji-icon-g.png'
+ },
+ noteClickIcon: {
+ name: '/static/images/bookService/detail/biji-click-icon.png'
+ },
+ icon1: {
+ name: "/static/images/bookService/detail/dangdang.png"
}
},
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index d1aebb2..8e0da9c 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -165,7 +165,12 @@
t-class-content="custom-panel"
class="tab-class"
>
- <t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="鍥句功绠�浠�"
+ icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
+ value="brief"
+ style="{{tabPanelstyle}}"
+ >
<book-brief
content="{{bookDetail.content}}"
authorIntroduction="{{bookDetail.authorIntroduction}}"
@@ -180,6 +185,7 @@
</t-tab-panel>
<t-tab-panel
label="鐢靛瓙涔�"
+ icon="{{tabValue == 'jsek_eBook' ? eBookClickIcon : eBookIcon}}"
value="jsek_eBook"
style="{{tabPanelstyle}}"
>
@@ -191,6 +197,7 @@
</t-tab-panel>
<t-tab-panel
label="鏁欏璧勬簮"
+ icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
value="jsek_teachingResources"
class="{{loading ? 'loading': ''}}"
>
@@ -229,6 +236,7 @@
</t-tab-panel>
<t-tab-panel
label="浜戝涔�"
+ icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
value="jsek_cloudLearning"
style="{{tabPanelstyle}}"
>
@@ -256,6 +264,7 @@
</t-tab-panel>
<t-tab-panel
label="浜戞祴璇�"
+ icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
value="questionBank"
style="{{tabPanelstyle}}"
>
@@ -270,7 +279,12 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel label="浜戠瑪璁�" value="jsek_note" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戠瑪璁�"
+ icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
+ value="jsek_note"
+ style="{{tabPanelstyle}}"
+ >
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
</t-tabs>
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index a3024c3..cba567c 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -358,4 +358,17 @@
.webView {
height: 500rpx;
+}
+
+.t-tabs__item-inner {
+ flex-direction: column;
+}
+
+.t-tabs .t-tabs__item--active {
+ /* color: #ff6d00;
+ font-size: 30rpx; */
+ background-repeat: no-repeat;
+ background-size: 40% 64%;
+ background-position: right;
+ background-image: url(http://jsysf.bnuic.com/website/image/click-icon.png);
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.json b/packageBookService/pages/bookServices/examination/examination.json
index d99d423..3d3a9e7 100644
--- a/packageBookService/pages/bookServices/examination/examination.json
+++ b/packageBookService/pages/bookServices/examination/examination.json
@@ -8,5 +8,6 @@
"t-button": "tdesign-miniprogram/button/button",
"t-loading": "tdesign-miniprogram/loading/loading"
},
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "navigationBarBackgroundColor": "#010101"
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 2f050dc..3d3051b 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -5,7 +5,7 @@
></view>
<view
class="nacigationBar"
- style="width: 75%; height: {{navBarHeight}}px; background-color: {{isNight ? '#191919' : '#fff'}}"
+ style="width: 100%; height: {{navBarHeight}}px; background-color: {{isNight ? '#191919' : '#fff'}}"
>
<view>
<t-icon
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 7d4b93f..de4ffce 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -15,7 +15,11 @@
>
</view>
<!-- 棰樼洰鍒楄〃 -->
- <swiper class="swiper" bind:change="changeSwiper" current="{{currentIndex}}">
+ <swiper
+ class="swiper"
+ bindanimationfinish="changeSwiper"
+ current="{{currentIndex}}"
+ >
<swiper-item wx:for="{{questionList}}" wx:key="id" style="overflow-y: auto">
<!-- 棰樺共 -->
<view
@@ -161,17 +165,18 @@
<t-checkbox
block="{{false}}"
value="{{contentItem.value}}"
- style="background-color:{{isNight ? '#000' :'#fff'}}; "
+ style="background-color:{{isNight ? '#222' :'#fff'}}; "
>
<!-- 浠呮枃瀛� -->
<text
wx:if="{{item.optionStyle == 'Txt'}}"
- style="color:{{ isNight ? '#fff' : '#000'}}"
+ style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
>{{contentItem.value}}銆亄{contentItem.txt}}</text
>
<!-- 浠呭浘鐗� -->
<view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
- <text style="color:{{ isNight ? '#fff' : '#000'}}"
+ <text
+ style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
>{{contentItem.value}}銆�</text
>
<t-image src="{{contentItem.img}}" />
@@ -181,10 +186,12 @@
wx:if="{{item.optionStyle == 'TxtAndImage'}}"
class="fl-center"
>
- <text style="color:{{ isNight ? '#fff' : '#000'}}"
+ <text
+ style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
>{{contentItem.value}}銆�</text
>
- <text style="color:{{ isNight ? '#fff' : '#000'}}"
+ <text
+ style="color:{{ isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 32}}rpx;"
>{{contentItem.txt}}</text
>
<t-image src="{{contentItem.img}}" />
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 15acec1..e627970 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.js
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -167,6 +167,7 @@
// 婊戝潡鍙樺寲
onChangeSlider(e) {
const value = e.detail.value
+ console.log(value);
this.triggerEvent('onChangeSlider', { value })
},
// 璁剧疆閬僵灞傜偣鍑�
@@ -181,6 +182,11 @@
radioItem: e.detail.value
})
const value = e.detail.value == 'night' ? true : false
+ wx.setNavigationBarColor({
+ backgroundColor: '#222',
+ frontColor: '#222',
+ })
+
this.triggerEvent('changeBGColor', { value })
},
// 閲嶅仛鎸夐挳
@@ -285,6 +291,6 @@
}
})
this.submitPaper()
- }
+ },
}
})
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 206ab56..804220a 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -129,7 +129,7 @@
max="{{48}}"
step="{{7}}"
activeColor="#ff6c00"
- bind:changing="onChangeSlider"
+ bind:change="onChangeSlider"
/>
</view>
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 69e252c..9dd160f 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -27,7 +27,6 @@
options="{{stairList.options}}"
value="{{stairList.value}}"
bindchange="onChangeStair"
- style="background-color: #f6f6f6"
/>
<t-dropdown-item
label="浜岀骇"
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 97516a0..89598cf 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -11,6 +11,7 @@
}
.list-header {
+ overflow: hidden;
display: flex;
height: 96rpx;
}
@@ -37,23 +38,35 @@
}
.header-sort {
+ box-sizing: border-box;
position: relative;
background-color: #fff;
- line-height: 90rpx;
- height: 100%;
+ line-height: 48px;
+ height: 48px;
width: 15vw;
font-size: 28rpx;
color: #999;
display: flex;
- border-bottom: 1px solid #ededed;
+}
+
+.header-sort::after {
+ content: '';
+ height: 1rpx;
+ display: block;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ transform: scaleY(0.5);
+ background-color: var(--td-component-border, var(--td-gray-color-4, #dcdcdc));
}
.sort-name {
- padding: 4rpx 0 0 10rpx;
+ padding: 0 0 0 10rpx;
}
.header-scroll {
- height: 96rpx;
+ height: 100%;
width: 85vw;
}
diff --git a/pages/bookServices/assort/index.js b/pages/bookServices/assort/index.js
index f86fa21..3891add 100644
--- a/pages/bookServices/assort/index.js
+++ b/pages/bookServices/assort/index.js
@@ -166,9 +166,6 @@
field: 'state'
}
],
- coverSize: {
- width: 76
- },
queryType: '\\',
searchList: [],
size: '30',
diff --git a/static/images/bookService/detail/biji-click-icon.png b/static/images/bookService/detail/biji-click-icon.png
new file mode 100644
index 0000000..3096a1e
--- /dev/null
+++ b/static/images/bookService/detail/biji-click-icon.png
Binary files differ
diff --git a/static/images/bookService/detail/biji-icon-g.png b/static/images/bookService/detail/biji-icon-g.png
new file mode 100644
index 0000000..af55223
--- /dev/null
+++ b/static/images/bookService/detail/biji-icon-g.png
Binary files differ
diff --git a/static/images/bookService/detail/ebook-click.png b/static/images/bookService/detail/ebook-click.png
new file mode 100644
index 0000000..95be9be
--- /dev/null
+++ b/static/images/bookService/detail/ebook-click.png
Binary files differ
diff --git a/static/images/bookService/detail/ebook-g.png b/static/images/bookService/detail/ebook-g.png
new file mode 100644
index 0000000..09ce211
--- /dev/null
+++ b/static/images/bookService/detail/ebook-g.png
Binary files differ
diff --git a/static/images/bookService/detail/jiaoxueziyuan-click.png b/static/images/bookService/detail/jiaoxueziyuan-click.png
new file mode 100644
index 0000000..4a59435
--- /dev/null
+++ b/static/images/bookService/detail/jiaoxueziyuan-click.png
Binary files differ
diff --git a/static/images/bookService/detail/jiaoxueziyuan.png b/static/images/bookService/detail/jiaoxueziyuan.png
new file mode 100644
index 0000000..c9a38ae
--- /dev/null
+++ b/static/images/bookService/detail/jiaoxueziyuan.png
Binary files differ
diff --git a/static/images/bookService/detail/test-click-icon.png b/static/images/bookService/detail/test-click-icon.png
new file mode 100644
index 0000000..2e41a97
--- /dev/null
+++ b/static/images/bookService/detail/test-click-icon.png
Binary files differ
diff --git a/static/images/bookService/detail/test-icon-g.png b/static/images/bookService/detail/test-icon-g.png
new file mode 100644
index 0000000..7ffce54
--- /dev/null
+++ b/static/images/bookService/detail/test-icon-g.png
Binary files differ
diff --git a/static/images/bookService/detail/tushujianjie-click.png b/static/images/bookService/detail/tushujianjie-click.png
new file mode 100644
index 0000000..9adbaf1
--- /dev/null
+++ b/static/images/bookService/detail/tushujianjie-click.png
Binary files differ
diff --git a/static/images/bookService/detail/tushujianjie-g.png b/static/images/bookService/detail/tushujianjie-g.png
new file mode 100644
index 0000000..535402f
--- /dev/null
+++ b/static/images/bookService/detail/tushujianjie-g.png
Binary files differ
diff --git a/static/images/bookService/detail/yunxuexi-click.png b/static/images/bookService/detail/yunxuexi-click.png
new file mode 100644
index 0000000..89b9e28
--- /dev/null
+++ b/static/images/bookService/detail/yunxuexi-click.png
Binary files differ
diff --git a/static/images/bookService/detail/yunxuexi.png b/static/images/bookService/detail/yunxuexi.png
new file mode 100644
index 0000000..f69a677
--- /dev/null
+++ b/static/images/bookService/detail/yunxuexi.png
Binary files differ
--
Gitblit v1.9.1