From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/list/index.wxml | 25 +
packageBookService/pages/bookServices/examination/questionList/index.wxss | 15
pages/home/home.js | 3
packageBookService/pages/bookServices/examination/questionList/index.wxml | 10
packageBookService/pages/bookServices/list/index.wxss | 27 +
packageBookService/pages/bookServices/detail/index.wxml | 15
pages/retrievalPage/index.json | 6
packageBookService/pages/bookServices/detail/index.wxss | 26 +
pages/bookExhibitionList/index.js | 7
custom-tab-bar/index.js | 1
pages/bookServices/assort/index.js | 59 ++-
packageBookService/pages/bookServices/examination/examination.wxml | 2
packageBookService/pages/bookServices/examination/questionOptions/index.wxss | 2
services/home/home.js | 2
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 16
packageBookService/pages/bookServices/list/index.json | 3
packageBookService/pages/bookServices/examination/examination.js | 9
packageBookService/pages/bookServices/detail/components/tree/index.js | 110 +++++-
packageBookService/pages/bookServices/list/index.js | 18
pages/bookServices/assort/index.wxml | 67 ++-
packageBookService/pages/bookServices/detail/index.js | 36 +-
pages/bookServices/assort/index.wxss | 60 ++
pages/home/home.wxml | 5
pages/retrievalPage/index.js | 26 +
packageDomain/pages/resourceDetails/myAudio/index.json | 4
pages/cart/index.wxml | 9
custom-tab-bar/index.wxml | 5
static/images/bookService/detail/square.png | 0
packageBookService/pages/bookServices/examination/questionSchedule/index.js | 10
pages/cart/paymentPage/index.wxml | 9
packageBookService/pages/bookServices/examination/questionOptions/index.js | 6
pages/bookExhibitionList/index.wxss | 96 +++++
pages/bookExhibitionList/index.wxml | 16
packageDomain/pages/resourceDetails/myAudio/index.js | 36 ++
pages/retrievalPage/index.wxml | 23 +
pages/retrievalPage/index.wxss | 8
pages/bookExhibitionList/index.json | 3
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 7
pages/cart/index.js | 9
pages/cart/paymentPage/index.js | 82 ----
packageDomain/pages/resourceDetails/myAudio/index.wxss | 33 +
packageDomain/pages/resourceDetails/myAudio/index.wxml | 24 +
42 files changed, 653 insertions(+), 277 deletions(-)
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 90c58df..3783000 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -8,6 +8,7 @@
methods: {
onChange(event) {
this.setData({ active: event.detail.value });
+ console.log(this.data.active);
wx.switchTab({
url: this.data.list[event.detail.value].url.startsWith('/')
? this.data.list[event.detail.value].url
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 01c11e0..90d22b6 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -3,8 +3,9 @@
<view class="custom-tab-bar-wrapper">
<!-- <t-icon prefix="wr" name="{{item.icon}}" size="48rpx" />
<view class="text">{{ item.text }}</view> -->
- <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="heightFix" width="22" height="22" />
- <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="heightFix" width="22" height="22" />
+ <!-- <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="heightFix" width="22" height="22" />
+ <t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="heightFix" width="22" height="22" /> -->
+ <t-image class="tabImg" src="{{active == index ? item.activeIcon : item.icon}}" width="22" height="22"></t-image>
<view class="text">{{ item.text }}</view>
</view>
</t-tab-bar-item>
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 33cc8d7..eed99e1 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -3,6 +3,8 @@
const util = require('./components/util') // 寮曞叆灏佽杩囩殑鍔犺浇鎻愮ず
const app = getApp()
Component({
+ // checked: false,
+
properties: {
treeList: {
type: Array,
@@ -35,7 +37,8 @@
},
data: {
activeValues: [0],
- webpageSrc: ''
+ webpageSrc: '',
+ cloudShoppingCart: []
},
onShow() {
@@ -45,10 +48,11 @@
methods: {
// 鑺傜偣灞曞紑
handleChange(e) {
+ // console.log(this.properties.treeList, 'this.properties.treeList');
this.setData({
activeValues: e.detail.value,
});
- console.log('浼犻��', this.properties.buyIds);
+ // console.log('浼犻��', this.properties.buyIds);
},
handleCheck(data) {
for (let index = 0; index < data.length; index++) {
@@ -83,7 +87,7 @@
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
console.log(e);
- debugger
+ // debugger
const item = e.currentTarget.dataset.item
const parent = e.currentTarget.dataset.parent
let url
@@ -168,7 +172,7 @@
result.push(...item.children);
}
}
- console.log(this.properties.treeList);
+ console.log(this.properties.treeList, 'this.properties.treeList');
this.properties.treeList.forEach(item => {
findChildren(item);
});
@@ -176,20 +180,30 @@
},
// 鎷垮埌褰撳墠椤瑰瓙椤�
flattenTree(tree) {
+
let result = [];
+
function flatten(node) {
+
result.push(node);
+
if (node.children && node.children.length > 0) {
+
node.children.forEach(child => {
flatten(child);
});
}
}
tree.forEach(node => {
+
flatten(node);
});
+ // console.log(result, 'result');
return result
},
+
+
+
findAndUpdateItemById(tree, id) {
function findAndUpdate(node) {
if (node.id === id) {
@@ -214,9 +228,12 @@
},
// 鍙樹负true
findAndUpdateItemsByIds(tree, ids) {
+
function findAndUpdate(node) {
+
if (ids.includes(node.id)) {
- node.checked = true; // 灏嗙洰鏍囬」鐨� check 灞炴�ц缃负 true
+ // console.log(node, 'node');
+ node.checked = !node.checked // 灏嗙洰鏍囬」鐨� check 灞炴�ц缃负 true
}
if (node.children && node.children.length > 0) {
for (let child of node.children) {
@@ -226,30 +243,87 @@
}
for (let node of tree) {
+
findAndUpdate(node); // 瀵规瘡涓《灞傝妭鐐规墽琛屾煡鎵惧拰鏇存柊鎿嶄綔
}
+ // console.log(tree, 'tree345');
return tree; // 杩斿洖淇敼鍚庣殑瀹屾暣鏁扮粍
},
+
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
+ // 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
const item = e.currentTarget.dataset.item
- console.log(item, 'item');
+
let list = this.flattenTree([item])
+
+
let ids = []
list.forEach(item => {
ids.push(item.id)
})
- const tab = this.findAndUpdateItemsByIds([item], ids)
- console.log(ids, tab);
- }
+
+ const updatedTreeList = this.findAndUpdateItemsByIds(this.properties.treeList, ids);
+ // console.log(updatedTreeList, 'updatedTreeList'); //杩欎釜鏃跺�檆hecked鐨勫�煎氨鍙樻垚浜唗rue
+
+ this.setData({
+ treeList: updatedTreeList // 鏇存柊 treeList 鏁版嵁
+ });
+
+ console.log(list, 'list');
+ list.forEach(items => {
+ console.log(items.checked, 'itesasd');
+ if (!items.checked) {
+ this.setData({
+ cloudShoppingCart: items
+ })
+ }
+ })
+
+ this.onCloudShoppingCart()
+ },
+ // 瀛愰」鍕鹃��
+ checkResource(e) {
+ const item = e.currentTarget.dataset.item
+
+
+ // let list = this.flattenTree([item])
+ // console.log(list, 'list121');
+ // let ids = []
+ // list.forEach(items => {
+ // console.log(items.id, 'itemsId');
+ // ids.push(items.id)
+ // })
+ },
+ // 鍔犲叆璐墿杞�
+ async onCloudShoppingCart() {
+ let requests = []
+ const item = this.data.cloudShoppingCart
+ console.log(item, 'item');
+ item.forEach((items) => {
+ if (items.saleMethod.length) {
+ requests.push({
+ saleMethodId: items.saleMethod[0].Id,
+ count: 1
+ })
+ }
+ })
+ let query = {
+ remarks: '浜戝涔�',
+ requests
+ }
+ // 鏌ヨ璁㈠崟
+ let initOrderRes = await app.MG.store.initOrder(query)
+ let parameter = {
+ orderNum: initOrderRes.orderNumber
+ }
+ const confirmOrderRes = await app.MG.store.confirmOrder(parameter)
+ // if (confirmOrderRes.orderNumber) {
+ // wx.navigateTo({
+ // url: `/pages/cart/paymentPage/index?orderNumber=${confirmOrderRes.orderNumber}`,
+ // })
+ // requests = []
+ // }
+ },
},
- onCloudShoppingCart() {
- console.log(this.properties.treeList);
- },
- oncheckbox() {
- console.log(111);
- },
- logdata(e) {
- console.log(e);
- }
})
\ 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 346bd9a..a5e3c7e 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -4,6 +4,8 @@
<view slot="header" class="header-title">
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" />
+ <!-- <t-checkbox icon="rectangle" checked="{{true}}" data-item="{{item}}" bind:change="checkResourceTitle" /> -->
+
</view>
<text>{{item.name}}</text>
</view>
@@ -11,12 +13,13 @@
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
<view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.type == 'productItem'}}">
<view class="itemsInfo" wx:if="{{citem.name}}" data-item="{{citem}}" data-index="{{cindex}}">
- <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}" >
+ <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
<view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
<view class="checkBox" wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- checked="{{citem.checked}}" -->
- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" />
+ <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
+ <t-checkbox icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 77bf47c..faa412f 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -428,11 +428,11 @@
})
this.findChildIds(this.data.teach, this.data.openTeachids = [])
} else if (type.refCode == 'jsek_cloudLearning') {
- // res.datas.cmsDatas[0].datas.forEach(item => {
- // item.checked = false
- // })
- // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- console.log(list, 'currentlist');
+ res.datas.cmsDatas[0].datas.forEach(item => {
+ item.checked = false
+ })
+ const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
+ console.log(list, 'list');
this.setData({
learn: list,
loading: false
@@ -994,14 +994,14 @@
async allAddShoppiingCar() {
const child = this.selectComponent('#learn-resource')
const token = wx.getStorageSync('jsek-token')
- if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
- }
- })
- }
+ // if (!token) {
+ // return wx.getUserProfile({
+ // desc: '鐢ㄦ埛鐧诲綍',
+ // success: (res) => {
+ // console.log(res);
+ // }
+ // })
+ // }
let shopList = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
this.getShoppingCartProductGet()
if (!shopList.length) return wx.showToast({
@@ -1146,7 +1146,6 @@
})
res = await app.MG.store.initOrder(query)
}
-
if (res.orderNumber && this.data.mockData.price) {
wx.navigateTo({
url: `/pages/cart/paymentPage/index?orderNumber=${res.orderNumber}`,
@@ -1197,11 +1196,16 @@
this.buyBook()
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
- console.log('浜戝涔�');
+ const tree = this.selectComponent('#tree')
+
+ tree.onCloudShoppingCart()
+
+
} else if (this.data.tabValue == 'questionBank') {
this.buyMock()
} else {
console.log(this.data.tabValue);
}
- }
+ },
+
})
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index abfcb94..14524ff 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -35,20 +35,20 @@
<view class="detail-right">
<view class="book-name">{{bookDetail.name}}</view>
<view class="book-message">
- <view class="message-li">
+ <view class="message-li" wx:if="{{bookDetail.seriesName}}">
<view class="li-title">涓涗功鍚嶏細</view>
<view class="li-content">{{bookDetail.seriesName}}</view>
</view>
<view class="message-li">
- <view class="li-title">浣滆�咃細</view>
+ <view class="li-title" wx:if="{{bookDetail.author}}">浣滆�咃細</view>
<view class="li-content">{{bookDetail.author}}</view>
</view>
- <view class="message-li">
+ <view class="message-li" wx:if="{{bookDetail.isbn}}">
<view class="li-title">ISBN锛�</view>
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title">鍑虹増鏃堕棿锛�</view>
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
<view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
@@ -56,6 +56,7 @@
<view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
+ <t-image src="/static/images/bookService/detail/square.png" class="right-background"></t-image>
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -109,7 +110,7 @@
<t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
<learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource"></learn-resource>
- <tree bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+ <tree id="tree" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
</view>
</t-tab-panel>
<t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
@@ -136,8 +137,8 @@
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="shopCar" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
- <view class="buy" bind:tap="buyBtn">绔嬪嵆璐拱</view>
+ <view class="shopCar {{tabValue == 'jsek_teachingResources' ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
+ <view class="buy {{tabValue == 'jsek_teachingResources' ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 6c97fc6..f4f9c56 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -32,6 +32,19 @@
margin-right: 36rpx;
}
+.detail-right {
+ position: relative;
+}
+
+.right-background {
+ position: absolute;
+ top: 80rpx;
+ right: -80rpx;
+ z-index: 0;
+ width: 160rpx;
+ height: 160rpx;
+}
+
.detail-right .book-name {
width: 420rpx;
font-weight: bold;
@@ -76,7 +89,7 @@
}
.class-name {
- height: 2.5em;
+ height: 2.8em;
width: 280rpx;
font-size: 28rpx;
}
@@ -249,21 +262,22 @@
color: #fff;
}
-.shopCar {
+.shopCarColor {
background-color: #F1AC37;
}
-.buy {
+.buyColor {
background-color: #F14B3B;
+}
+
+.disabledColor {
+ background-color: #d9d9d9;
}
.tab-box {
min-height: 550rpx;
}
-.note-list {
- /* margin-bottom: 80rpx; */
-}
.tab-class {
--td-loading-color: #ff6c00
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index d948903..6b82781 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -282,13 +282,15 @@
} else {
return false
}
- } else {
+ } else if (typeof data == 'object') {
const answer = data.find((item) => item.length > 0)
if (answer) {
return true
} else {
return false
}
+ } else {
+ return false
}
},
// 鎻愪氦閫昏緫
@@ -712,7 +714,7 @@
loading: false,
})
},
- // 鎵规敼棰樼洰 锛堢粌涔狅紝鎴戠殑閿欓锛屾垜鐨勬敹钘忥級
+ // 鎵规敼棰樼洰 锛堢粌涔狅紝鎴戠殑閿欓锛屾垜鐨勬敹钘�,锛岀粍鍗凤級
handleQuestion(num) {
const questionList = this.data.questionDataList
const index = num - 1 >= 0 ? num - 1 : 0
@@ -1332,7 +1334,6 @@
},
// 鑾峰彇缁勫嵎棰樼洰鍒楄〃
async getMockDataList(questionList, oldList) {
- console.log(questionList, oldList);
const questionDataList = this.data.questionDataList
questionList.forEach(async (pathitem, pathindex) => {
let itemIds = []
@@ -1451,7 +1452,6 @@
})
let questionList = []
const cardUpdatedList = this.data.cardList
- // if (flag == this.data.idPathList.length) {
cardUpdatedList.forEach(aitem => {
aitem.infoList.forEach((bitem, bindex) => {
questionList.push(bitem)
@@ -1462,6 +1462,7 @@
questionDataList: questionList,
cardList: cardUpdatedList
})
+ console.log('缁勫嵎棰樼洰鍒楄〃', this.data.questionDataList);
})
})
})
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 7e55aa7..1f24f93 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -43,7 +43,7 @@
bind:onChangeInput="onChangeInput"
bind:changeSwiper="changeSwiper"
></question-list>
- <view class="lodaing-box">
+ <view class="lodaing-box" wx:if="{{loading}}">
<t-loading
theme="circular"
size="80rpx"
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index d776c40..a62a5f4 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -39,8 +39,8 @@
<!-- 鍗曢�夐 -->
<t-radio-group wx:if="{{item.questionType == 'singleChoice' || item.questionType == 'judge'}}" defaultValue="{{item.userAnswer}}" disabled="{{item.isComplete}}" bind:change="onChangeRadio" class="radio-group" data-value="{{item.option}}" data-id="{{item.id}}">
<view wx:for="{{item.option}}" wx:for-item="contentItem" wx:for-index="contentIndex" wx:key="contentIndex">
- <t-radio value="{{contentItem.value}}" icon="none" placement="right" borderless style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#000' : '#fff'}}">
- <view class="radio-item {{item.answer == contentItem.value && item.answer == item.userAnswer ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :''}}" style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#000' : '#fff'}}">
+ <t-radio value="{{contentItem.value}}" icon="none" placement="right" borderless>
+ <view class="radio-item {{item.answer == contentItem.value && item.answer == item.userAnswer ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :''}}">
<!-- 浠呮枃瀛� -->
<text wx:if="{{item.optionStyle == 'Txt'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
<!-- 浠呭浘鐗� -->
@@ -96,15 +96,15 @@
<!-- 瑙ｆ瀽 -->
<view class="analysis" wx:if="{{item.isComplete}}">
<view class="analysis-answer">
- <view class="answer-correct">
+ <view class="answer-correct answer-center">
<text class="analysis-title-box">姝ｇ‘绛旀锛�</text>
<rich-text nodes="{{item.answer}}" style="font-size: 40rpx"></rich-text>
</view>
- <view class="answer-error">
+ <view class="answer-center marginL {{item.isRight ? 'answer-correct' : 'answer-error'}}" wx:if="{{item.questionType !== 'shortAnswer'}}">
<text class="analysis-title-box">鎮ㄧ殑绛旀锛�</text><text class="answer-text">{{item.userAnswer}}</text>
</view>
</view>
- <view class="analysis-text" wx:if="{{item.analysisCon}}">
+ <view class="analysis-text" wx:if="{{item.analysisCon}}" style="color: {{isNight ? '#fff' : '#000'}};">
绛旀瑙ｆ瀽锛�<rich-text nodes="{{item.analysisCon}}" class="analysis-content"></rich-text>
</view>
</view>
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 03185dd..1bdc74f 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -1,7 +1,7 @@
/* pages/bookServices/examination/questionList/index.wxss */
.question-list {
- width: 100%;
- height: 90%;
+ width: 95%;
+ height: 86%;
padding: 20rpx;
background-color: #ffffff;
border-radius: 20rpx;
@@ -113,7 +113,7 @@
.analysis-answer {
display: flex;
- justify-content: space-between;
+ /* justify-content: space-between; */
}
.answer-correct {
@@ -124,6 +124,15 @@
color: #EE1818;
}
+.marginL {
+ margin-left: 140rpx;
+}
+
+.answer-center {
+ display: flex;
+ align-items: center;
+}
+
.answer-text {
font-size: 40rpx;
}
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.js b/packageBookService/pages/bookServices/examination/questionOptions/index.js
index 49b4ac6..88d1ec6 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.js
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.js
@@ -48,6 +48,10 @@
mockSumTime: {
type: Number,
value: 0,
+ },
+ isNight: {
+ type: Boolean,
+ value: false
}
},
@@ -60,7 +64,7 @@
questionCardState: false,
setUpPopup: false,
testReportState: false,
- sliderValue: 0,
+ sliderValue: 10,
useTime: '',
radioItem: 'daytime'
},
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index ee23b79..7057d37 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -1,19 +1,19 @@
<!--pages/bookServices/examination/questionOptions/index.wxml-->
-<view class="page-bottom">
- <view class="li-option" bind:tap="setCollect">
+<view class="page-bottom" style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#000' : '#fff'}}">
+ <view class="li-option" bind:tap="setCollect" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : '/static/images/bookService/examination/collect.png'}}">
</t-image>
鏀惰棌
</view>
- <view class="li-option" bind:tap="handlePopup">
+ <view class="li-option" bind:tap="handlePopup" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/questionCard.png"></t-image>
绛旈鍗�
</view>
- <view class="li-option" bind:tap="setUpBtn">
+ <view class="li-option" bind:tap="setUpBtn" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/setting.png"></t-image>
璁剧疆
</view>
- <view class="li-option" bind:tap="resterBtn" wx:if="{{answerType == 'option' || answerType == 'mock'}}">
+ <view class="li-option" bind:tap="resterBtn" wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus)}}" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/reset.png"></t-image>
閲嶅仛
</view>
@@ -66,7 +66,7 @@
<view class="brightness">
<text>A-</text>
<view class="brightness-slider">
- <t-slider defaultValue="{{30}}" theme="capsule" />
+ <t-slider value="{{sliderValue}}" theme="capsule" step="{{10}}" bind:change="onChangeSlider" />
</view>
<text>A+</text>
@@ -77,7 +77,7 @@
<view class="card {{radioItem == 'daytime' ? 'card--active' : ''}}">
<t-radio value="daytime" icon="none" borderless>
<view class="radio-content" slot="content">
- <t-image src="{{ radioItem == 'daytime' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
+ <t-image src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
<text style="color: {{radioItem == 'daytime' ? '#fff':''}};">鏃ラ棿妯″紡</text>
</view>
</t-radio>
@@ -85,7 +85,7 @@
<view class="card {{radioItem == 'night' ? 'card--active' : ''}}">
<t-radio value="night" icon="none" borderless>
<view class="radio-content" slot="content">
- <t-image src="{{ radioItem == 'night' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
+ <t-image src="{{ radioItem == 'night' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/examination/yejian.png'}}"></t-image>
<text style="color: {{radioItem == 'night' ? '#fff':''}};">澶滈棿妯″紡</text>
</view>
</t-radio>
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
index 50a6e03..291ce81 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
@@ -195,6 +195,7 @@
.brightness-slider {
width: 80%;
+ --td-slider-active-color: #ff6c00;
}
.test-radio {
@@ -208,6 +209,7 @@
.test-radio image {
width: 34rpx;
height: 34rpx;
+ margin-right: 18rpx;
}
.card {
diff --git a/packageBookService/pages/bookServices/examination/questionSchedule/index.js b/packageBookService/pages/bookServices/examination/questionSchedule/index.js
index 458b052..531b569 100644
--- a/packageBookService/pages/bookServices/examination/questionSchedule/index.js
+++ b/packageBookService/pages/bookServices/examination/questionSchedule/index.js
@@ -25,9 +25,9 @@
type: String,
value: ''
},
- isNight:{
- type:Boolean,
- value:false
+ isNight: {
+ type: Boolean,
+ value: false
}
},
created(
@@ -90,13 +90,15 @@
} else {
return false
}
- } else {
+ } else if (typeof data == 'object') {
const answer = data.find((item) => item.length > 0)
if (answer) {
return true
} else {
return false
}
+ } else {
+ return false
}
},
// // 鏍煎紡鍖栨椂闂�
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 4fa9702..cc50289 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -47,6 +47,8 @@
loadingProps: {
size: '50rpx',
},
+ loading: false,
+ noData: false
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -138,7 +140,6 @@
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom(e) {
- console.log('搴曢儴');
const flag = this.data.bookList.length < this.data.pageCount.total
if (flag) {
this.setData({
@@ -275,6 +276,10 @@
},
// 鑾峰彇鍥句功鍒楄〃
getBookList(path) {
+ this.setData({
+ loading: true,
+ noData: false
+ })
let sort;
let pathObj = {};
if (this.data.pathList.length) {
@@ -336,9 +341,15 @@
this.setData({
bookList: res.datas,
enable: false,
- "pageCount.total": res.total
+ "pageCount.total": res.total,
+ loading: false
});
- console.log('鍥句功鍒楄〃', res, this.data.pageCount);
+ console.log('鍥句功鍒楄〃', res.datas);
+ if (!res.datas.length) {
+ this.setData({
+ noData: true
+ })
+ }
});
},
// 涓�绾у垎绫诲垏鎹�
@@ -371,7 +382,6 @@
pathList: pathList,
'secondList.value': e.detail.value,
});
-
},
//
onConfirmSecond() {
diff --git a/packageBookService/pages/bookServices/list/index.json b/packageBookService/pages/bookServices/list/index.json
index 32e63d7..397f571 100644
--- a/packageBookService/pages/bookServices/list/index.json
+++ b/packageBookService/pages/bookServices/list/index.json
@@ -6,7 +6,8 @@
"t-image": "tdesign-miniprogram/image/image",
"t-search": "tdesign-miniprogram/search/search",
"t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh",
- "t-loading": "tdesign-miniprogram/loading/loading"
+ "t-loading": "tdesign-miniprogram/loading/loading",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index c06275a..81aa827 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -10,8 +10,8 @@
<view class="bookServices-list">
<view class="list-header">
<scroll-view scroll-x="{{true}}" class="header-scroll">
- <t-dropdown-menu>
- <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
+ <t-dropdown-menu style="width: 800rpx;">
+ <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" style="background-color: #F6F6F6;" />
<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" />
@@ -31,13 +31,22 @@
<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 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">
+ <t-image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" 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 class="book-name book-color">{{ item.name}}</view>
- <view class="book-author book-color">{{item.author}}</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">
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index f708171..3a0d134 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -123,4 +123,31 @@
height: 80rpx;
font-size: 28rpx;
--td-loading-color: #ff6c00
+}
+
+.loading-box {
+ width: 100%;
+ height: calc(100vh - 500rpx);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ --td-loading-color: #ff6c00;
+}
+
+.noData {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.t-dropdown-menu {
+ display: flex;
+ align-items: center;
+}
+
+.t-dropdown-menu__item {
+ background-color: #F6F6F6;
+ border-radius: 80rpx;
+ height: 70%;
+ margin-left: 20rpx;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 4a6103d..a15fcb2 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -7,6 +7,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ showDropdown: false,
noteList: [],
navBarHeight: '',
barHeight: '',
@@ -521,7 +522,7 @@
myAudio.onCanplay(() => {
myAudio.duration; //蹇呴』鍐欙紝涓嶇劧鑾峰彇涓嶅埌銆傘�傘��
setTimeout(() => {
- console.log(myAudio.duration);
+ console.log(myAudio.duration, 'myAudio.duration');
this.setData({
myAudioDuration: this.format(myAudio.duration),
myAudioCurrent: this.format(myAudio.currentTime)
@@ -665,7 +666,36 @@
myAudioPos: position,
myAudioCurrent: this.format(currentTime)
})
+ },
+
+
+ toggleDropdown() {
+ this.setData({
+ showDropdown: !this.data.showDropdown
+ });
+ },
+ smallSpeed() {
+ this.setData({
+ speed: 0.5,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ centreSpeed() {
+ this.setData({
+ speed: 1.5,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ bigSpeed() {
+ this.setData({
+ speed: 2,
+ showDropdown: !this.data.showDropdown
+ })
+ },
+ smallSpeeDmultiple() {
+ this.setData({
+ speed: 1,
+ showDropdown: !this.data.showDropdown
+ })
}
-
-
})
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.json b/packageDomain/pages/resourceDetails/myAudio/index.json
index 60b450d..f4a9b39 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.json
+++ b/packageDomain/pages/resourceDetails/myAudio/index.json
@@ -13,7 +13,9 @@
"t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-popup": "tdesign-miniprogram/popup/popup",
- "t-slider": "tdesign-miniprogram/slider/slider"
+ "t-slider": "tdesign-miniprogram/slider/slider",
+ "t-dropdown-menu": "tdesign-miniprogram/dropdown-menu/dropdown-menu",
+ "t-dropdown-item": "tdesign-miniprogram/dropdown-item/dropdown-item"
},
"navigationStyle": "custom"
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 4fe7b87..ac2c8b6 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -9,15 +9,13 @@
+
<view class="audioPlayerBox">
<view class="audioBackground" style="background-image: url('/static/images/resourceDetailsMyAudio/video-bg.png');">
-
<image src="/static/images/resourceDetailsMyAudio/cd.png" alt="" />
</view>
<!-- 瑙嗛鎾斁鐨勬寜閽� -->
<view class="bigFunctionBox">
-
-
<view class="functionBox">
<!-- 宸﹀垏鎹� -->
<!-- <view class="leftSwitchBox color" bind:tap="onLeftSwitch">
@@ -44,19 +42,29 @@
<view class="color" style="margin: 0 10rpx;">/</view>
<view class="duration-time color"> {{myAudioDuration}} </view>
- <view class="publicBtn color" style="margin-left:40rpx ; width: 80rpx;" bind:tap="onSpeed">
- <text class="publicText">{{"x "+speed}}</text>
+ <!-- bind:tap="onSpeed" -->
+ <view class="publicBtn color">
+ <view class="publicText" bind:tap="toggleDropdown">
+ <view>
+ {{"x "+speed}}
+ </view>
+ <t-icon style="margin-top: 10rpx;" wx:if="{{showDropdown}}" name="caret-up-small" size="14" bind:click="onIconTap" />
+ <t-icon style="margin-top: 10rpx;" wx:else name="caret-down-small" size="14" bind:click="onIconTap" />
+ </view>
+ <view class="multipleBox" wx:if="{{showDropdown}}">
+ <view wx:if="{{speed != 0.5}}" style="margin: 5rpx 0;" bind:tap="smallSpeed">x0.5</view>
+ <view wx:if="{{speed != 1}}" style="margin: 5rpx 0;" bind:tap="smallSpeeDmultiple">x1</view>
+ <view wx:if="{{speed != 1.5}}" style="margin: 5rpx 0;" bind:tap="centreSpeed">x1.5</view>
+ <view wx:if="{{speed != 2}}" style="margin: 5rpx 0;" bind:tap="bigSpeed">x2</view>
+ </view>
</view>
</view>
</view>
-
-
</view>
<!-- 鏍囬 -->
<view class="titleBox">{{titleName}}</view>
-
<view class="contentBox">
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<!-- 璧勬簮鍒楄〃 -->
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxss b/packageDomain/pages/resourceDetails/myAudio/index.wxss
index 888d2cf..1e73f88 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxss
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxss
@@ -269,7 +269,10 @@
.audioBackground {
flex: 1;
- background-size: 100% 110%;
+ /* background-image: no-repeat; */
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-size: 100% 100%;
background-color: #f9f9f9;
display: flex;
justify-content: center;
@@ -311,7 +314,6 @@
.t-tabs__item--active {
color: #FF6C00 !important;
-
}
.t-tabs__track {
@@ -320,4 +322,31 @@
.audioIconBox {
/* margin-top: 10rpx; */
+}
+
+.publicBtn {
+ margin-right: 10rpx;
+ /* margin-left: 40rpx; */
+ margin-left: 20rpx;
+ width: 120rpx;
+ position: relative;
+}
+
+.multipleBox {
+ position: absolute;
+ /* top: 0; */
+ bottom: 60rpx;
+ right: 10rpx;
+ background-color: #000;
+ padding: 15rpx;
+ font-size: 25rpx;
+ /* padding-bottom: 100rpx; */
+
+}
+
+
+
+.publicText {
+ display: flex;
+
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index c1e3eaa..032e4a3 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -143,7 +143,10 @@
onPullDownRefresh() {
},
-
+ onPullDownRefresh() {
+ this.data.page.size = 16 //鏇存敼鏄剧ず鐨勫��
+ this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
+ },
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
@@ -169,7 +172,7 @@
'page.size': newSize
});
this.bookExhibitionGet(); // 璋冪敤鏂规硶鍔犺浇鏇村鏁版嵁
- console.log(1111);
+
}
diff --git a/pages/bookExhibitionList/index.json b/pages/bookExhibitionList/index.json
index 0b56ca0..2a46042 100644
--- a/pages/bookExhibitionList/index.json
+++ b/pages/bookExhibitionList/index.json
@@ -9,5 +9,6 @@
"t-icon": "tdesign-miniprogram/icon/icon"
},
"onReachBottomDistance": 200,
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index e58ac3a..77fa0f8 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -23,13 +23,19 @@
</t-dropdown-menu>
- <view class="sortBox" bind:tap="onSwapRight">
- <text>鎺掑簭</text>
- <view class="iconBox">
- <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
- <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
+
+
+
+ <view class="outsideSortBox">
+ <view class="sortBox" bind:tap="onSwapRight">
+ <text>鎺掑簭</text>
+ <view class="iconBox">
+ <t-icon class="swapRight" name="swap-right" size="35rpx" color="{{nameSort == 'Asc' ? '#ff6c00' : ''}}" />
+ <t-icon class="swapLeft" name="swap-right" size="35rpx" color="{{nameSort == 'Desc' ? '#ff6c00' : ''}}" />
+ </view>
</view>
</view>
+
</view>
<view class="assembleContent">
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 4a267d8..7d917bb 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -63,6 +63,7 @@
/* width: 300px; */
background-color: #fff;
/* padding: 16rpx 32rpx; */
+
}
.iconBox {
@@ -81,15 +82,27 @@
.sortBox {
color: #999999;
display: flex;
- /* border-bottom: 1px #ededed solid; */
align-items: center;
height: 86rpx;
width: 195rpx;
margin-top: 8rpx;
- font-size: 30rpx;
+ font-size: 25rpx;
}
+.outsideSortBox {
+ width: 96rpx;
+ height: 95rpx;
+ margin: 0 15rpx;
+ box-shadow: 0px 0px 1px 0px rgba(0, 0, 0, 0.16);
+ padding: 0 10rpx;
+}
+.sortBox text {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 25rpx;
+ color: #999999;
+}
.titleBox {
display: flex;
@@ -104,31 +117,92 @@
height: 54rpx;
background: #FF6C00;
border-radius: 0rpx 9rpx 9rpx 0rpx;
-
}
.titleTextBox {
-
margin-left: 5px;
-
width: 150rpx;
height: 37rpx;
-
-
}
.classification {
width: 550rpx;
- /* margin-bottom: 50rpx; */
-
+ margin: 0 30rpx;
}
.menuBox {
display: flex;
height: 75rpx;
-
}
.assembleContent {
background-color: #F2F3F8;
-}
\ No newline at end of file
+}
+
+/* .t-dropdown-menu__item--active {
+ color: #0F1214;
+} */
+
+.t-dropdown-menu:after,
+.t-dropdown-menu::after {
+ height: 0px;
+}
+
+
+.t-dropdown-item__body,
+.t-dropdown-item__footer,
+.t-radio {
+ background: #F6F6F6 !important;
+}
+
+.t-dropdown-item__body {
+ padding: 40rpx 0;
+}
+
+.t-dropdown-menu__item {
+ margin: 10rpx 10rpx 0 10rpx;
+ border-radius: 40rpx;
+ height: 68rpx;
+ background: #F6F6F6 !important;
+}
+
+.t-dropdown-menu__item--active {
+ height: 68rpx !important;
+ background: #F6F6F6 !important;
+ /* border-radius: 40rpx 40rpx 0 0; */
+}
+
+.t-dropdown-menu__item--active,
+.t-radio__icon--checked,
+.t-checkbox__icon--checked {
+ color: #FF6C00 !important
+}
+
+.t-checkbox__icon--disabled {
+ color: #c0c4cc !important;
+}
+
+.t-radio--block {
+ padding: 20rpx !important;
+}
+
+.t-radio__border {
+ height: 0 !important;
+}
+
+/* .t-button--primary {
+ color: #fff !important;
+ background-color: #FF6C00 !important;
+
+}
+
+.t-button--light {
+ color: #fff !important;
+ /* background-color: #FF6C00 !important; */
+/* } */
+
+/* .menu--t-dropdown-menu::after {
+ background-color: var(--td-component-border, var(--td-gray-color-4, #fff)) !important;
+
+}
+ */
\ No newline at end of file
diff --git a/pages/bookServices/assort/index.js b/pages/bookServices/assort/index.js
index 78224d0..e8f86b1 100644
--- a/pages/bookServices/assort/index.js
+++ b/pages/bookServices/assort/index.js
@@ -6,14 +6,20 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ placeholderstyle: 'font-size:28rpx',
assortList: [],
assortCheck: {
name: '',
code: '',
},
startList: [],
- startCheck: '',
+
+ startCheck: {
+ id: '',
+ code: ''
+ },
bookList: [],
+ loading: false,
listLoding: false,
},
@@ -21,8 +27,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- // this.getAssortList()
- console.log(options);
+ this.getAssortList();
},
/**
@@ -34,7 +39,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- this.getAssortList();
},
/**
@@ -64,6 +68,9 @@
// 鑾峰彇渚ц竟鏍忓垪琛�
getAssortList() {
+ this.setData({
+ loading: true
+ })
const query = {
path: '*',
filterList: [
@@ -83,6 +90,7 @@
const list = res.datas.filter((item) => item.refCode != 'jsek_homepageBookService');
this.setData({
assortList: list,
+ loading: false
});
this.setData({
assortCheck: {
@@ -94,14 +102,14 @@
});
},
// 渚ц竟鏍忓垏鎹�
- changeAssort(data) {
+ changeAssort(e) {
this.setData({
assortCheck: {
- name: data.detail.label,
- code: data.detail.value,
+ name: e.detail.label,
+ code: e.detail.value,
},
});
- this.getStairList(data.detail.value);
+ this.getStairList(e.detail.value);
},
// 鑾峰彇涓�绾у垎绫�
getStairList(path) {
@@ -110,7 +118,12 @@
});
const query = {
path,
- filterList: [],
+ filterList: [
+ {
+ value: 'Normal',
+ field: 'state'
+ }
+ ],
queryType: '\\',
searchList: [],
size: '30',
@@ -119,23 +132,20 @@
sort: { type: 'Asc', field: 'LinkOrder' },
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
- // 涓�绾у垎绫婚�変腑
- // this.setData({
- // startCheck: res.datas[0].refCode,
- // });
// 鑾峰彇浜岀骇鍒嗙被
for (let index = 0; index < res.datas.length; index++) {
const item = res.datas[index];
item.icon ? item.icon = getPublicImage(item.icon, 58, 72) : item.icon = item.icon
item.children = await this.getSecondList(item);
}
+ console.log(res.datas);
// 涓�绾у垎绫昏祴鍊�
this.setData({
startList: res.datas,
+ listLoding: false,
+ 'startCheck.id': res.datas[0].id,
+ 'startCheck..code': ''
});
- });
- this.setData({
- listLoding: false,
});
},
@@ -145,7 +155,12 @@
let datas;
const query = {
path,
- filterList: [],
+ filterList: [
+ {
+ value: 'Normal',
+ field: 'state'
+ }
+ ],
queryType: '\\',
searchList: [],
size: '30',
@@ -167,7 +182,8 @@
tabClick(e) {
const data = e.currentTarget.dataset.tabdata;
this.setData({
- startCheck: data.refCode,
+ 'startCheck.id': data.id,
+ 'startCheck.code': data.refCode,
});
console.log(data);
},
@@ -176,12 +192,13 @@
const tab = e.currentTarget.dataset.tabdata
const stair = e.currentTarget.dataset.stair
this.setData({
- startCheck: tab.refCode
+ 'startCheck.id': tab.id,
+ 'startCheck.code': tab.refCode
})
if (stair) {
const secondCode = `${stair.pathLinks[0].linkPath}\\${stair.id}`;
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/list/index?assorName=${this.data.assortCheck.name}&assortCode=${this.data.assortCheck.code}&stairCode=${this.data.startCheck}&secondCode=${secondCode}`,
+ url: `/packageBookService/pages/bookServices/list/index?assorName=${this.data.assortCheck.name}&assortCode=${this.data.assortCheck.code}&stairCode=${this.data.startCheck.code}&secondCode=${secondCode}`,
});
} else {
wx.navigateTo({
@@ -192,7 +209,7 @@
},
navToSearchPage(e) {
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/list/index?assorName=${this.data.assortCheck.name}&assortCode=${this.data.assortCheck.code}&stairCode=${this.data.startCheck}&searchValue=${e.detail.value}`,
+ url: `/packageBookService/pages/bookServices/list/index?assorName=${this.data.assortCheck.name}&assortCode=${this.data.assortCheck.code}&stairCode=${this.data.startCheck.code}&searchValue=${e.detail.value}`,
});
},
});
diff --git a/pages/bookServices/assort/index.wxml b/pages/bookServices/assort/index.wxml
index aca70a8..59c923d 100644
--- a/pages/bookServices/assort/index.wxml
+++ b/pages/bookServices/assort/index.wxml
@@ -2,45 +2,62 @@
<view class="page-header">
<!-- 鎼滅储妗� -->
<view class="search">
- <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" leftIcon="" bind:submit="navToSearchPage" placeholder-class="placeholder" placeholder-style="font-size:28rpx;">
+ <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" leftIcon="" bind:submit="navToSearchPage" placeholder-style="{{placeholderstyle}}">
<t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" />
</t-search>
</view>
</view>
<view class="page-container">
- <view class="side-bar-wrapper">
+ <view class="side-bar-wrapper" wx:if="{{!loading}}">
<view class="tab-left">
<t-side-bar value="{{assortCheck.code}}" bind:change="changeAssort">
<t-side-bar-item wx:for="{{assortList}}" wx:key="id" value="{{item.refCode}}" label="{{item.name}}" badge-props="{{item.badgeProps}}" />
</t-side-bar>
</view>
- <view class="side-bar-content">
- <!-- 涓�绾у垎绫� -->
- <view class="tab-top">
- <scroll-view scroll-x="{{true}}" class="myScroll">
- <view wx:for="{{startList}}" wx:key="id" class="row {{startCheck == item.refCode ? 'tab-active' : ''}}" bind:tap="tabClick" data-tabData="{{item}}">{{item.name}}</view>
- </scroll-view>
- </view>
- <!-- 鍐呭 -->
- <scroll-view scroll-y="{{true}}" class="class-list" scroll-into-view="{{startCheck}}">
- <view wx:if="{{listLoading}}">
- <t-loading theme="spinner" size="400rpx" loading="{{listLoading}}"></t-loading>
+ <view class="page-right">
+ <!-- 鍙充晶 -->
+ <view class="side-bar-content" wx:if="{{!listLoding}}">
+ <!-- 涓�绾у垎绫� -->
+ <view class="tab-top">
+ <scroll-view scroll-x="{{true}}" class="myScroll" show-scrollbar="{{false}}">
+ <view wx:for="{{startList}}" wx:key="id" class="row {{startCheck.id == item.id ? 'tab-active' : ''}}" bind:tap="tabClick" data-tabData="{{item}}">{{item.name}}</view>
+ </scroll-view>
</view>
- <view wx:for="{{startList}}" wx:for-item="item" wx:key="item.refCode" id="{{item.refCode}}" class="class-box" wx:if="{{!listLoading}}">
- <view class="class-name">{{item.name}}</view>
- <view class="class-content">
- <view wx:for="{{item.children}}" wx:for-item="citem" wx:key="id" class="book-box" bind:tap="goPageList" data-stair="{{citem}}" data-tabData="{{item}}" wx:if="{{item.children.length}}">
- <image src="{{citem.icon ? citem.icon : '/static/images/bookService/assort/book-img.png'}}" mode="heightFix" />
- <view class="classify">{{citem.name}}</view>
- </view>
- <view wx:if="{{!item.children.length}}" class="book-box" bind:tap="goPageList" data-tabData="{{item}}">
- <image src="{{item.icon ? item.icon : '/static/images/bookService/assort/book-img.png'}}" mode="heightFix"></image>
- <text class="classify">鍏ㄩ儴</text>
+ <!-- 鍐呭 -->
+ <scroll-view scroll-y="{{true}}" class="class-list" scroll-into-view="{{ 'list' + startCheck.id}}">
+ <view wx:if="{{listLoading}}">
+ <t-loading theme="spinner" size="400rpx" loading="{{listLoading}}"></t-loading>
+ </view>
+ <view wx:for="{{startList}}" wx:for-item="item" wx:key="item.id" id="{{ 'list' + item.id}}" class="class-box" wx:if="{{!listLoading}}">
+ <view class="class-name">{{item.name}}</view>
+ <view class="class-content">
+ <view wx:for="{{item.children}}" wx:for-item="citem" wx:key="id" class="book-box" bind:tap="goPageList" data-stair="{{citem}}" data-tabData="{{item}}" wx:if="{{item.children.length}}">
+ <view class="assort-img">
+ <image src="{{citem.icon ? citem.icon : '/static/images/bookService/assort/book-img.png'}}" mode="heightFix" />
+ </view>
+ <view class="classify">{{citem.name}}</view>
+ </view>
+ <view wx:if="{{!item.children.length}}" class="book-box" bind:tap="goPageList" data-tabData="{{item}}">
+ <view class="assort-img">
+ <image src="{{item.icon ? item.icon : '/static/images/bookService/assort/book-img.png'}}" mode="heightFix"></image>
+ </view>
+ <text class="classify">鍏ㄩ儴</text>
+ </view>
</view>
</view>
- </view>
- </scroll-view>
+ <view class="bottom-box">
+ </view>
+ </scroll-view>
+ </view>
+ <!-- loading -->
+ <view class="loading-box" wx:if="{{listLoding}}">
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{listLoding}}" wx:if="{{listLoding}}" />
+ </view>
</view>
+
+ </view>
+ <view class="loading-box" wx:if="{{loading}}">
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loading}}" wx:if="{{loading}}" />
</view>
</view>
\ No newline at end of file
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index 184d7ef..f065f59 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -13,14 +13,12 @@
left: 0;
width: 100%;
z-index: 99;
- font-size: 28rpx;
+ --td-search-font-size: 28rpx;
}
-.placeholder {
- font-size: 28rpx;
-}
-.page-header .t-search__input-container {
+.page-header .search .t-search__input-container {
+ font-size: 28rpx !important;
border-radius: 15rpx !important;
margin: 0 24rpx;
height: 64rpx !important;
@@ -29,15 +27,17 @@
.page-container {
padding: 120rpx 0 20rpx 0;
width: 100%;
+ height: 90%;
}
.side-bar-wrapper {
+ height: 100%;
background-color: #f2f3f8;
display: flex;
}
.side-bar-content {
- width: 70%;
+ width: 100%;
padding: 0 20rpx;
}
@@ -88,19 +88,20 @@
.class-list {
/* overflow-y: auto; */
- height: 72.5vh;
- width: 262px;
+ height: calc(100vh - 326rpx);
+ width: calc(100vw - 210rpx);
}
.class-box {
background-color: #fff;
- margin-bottom: 10rpx;
+ margin-bottom: 20rpx;
padding: 10rpx 12rpx;
border-radius: 12rpx;
- /* height: 60rpx; */
}
+
.class-name {
+ padding: 20rpx 0 0 20rpx;
font-size: 32rpx;
font-weight: 700;
}
@@ -113,8 +114,11 @@
}
.book-box {
- width: 48%;
- margin: 0 10rpx 20rpx 0
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 50%;
+ margin-bottom: 26rpx;
}
.book-box:nth-child(2n) {
@@ -123,13 +127,39 @@
.book-box image {
height: 142rpx;
- object-fit: contain;
+ object-fit: contain !important;
}
.classify {
max-width: 90%;
- white-space: nowrap;
+ word-break: break-all;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
overflow: hidden;
- text-overflow: ellipsis;
font-size: 14px;
+}
+
+.assort-img {
+ width: 116rpx;
+ height: 142rpx;
+ box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
+ margin-bottom: 20rpx;
+}
+
+.page-right {
+ width: 100%;
+}
+
+.loading-box {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ --td-loading-color: #ff6c00;
+}
+
+.bottom-box {
+ height: 40rpx;
}
\ No newline at end of file
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 98123d1..16c1922 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -20,7 +20,9 @@
});
this.shoppingCartGet();
},
-
+ onShow() {
+ this.shoppingCartGet();
+ },
onDelete(e) {
const item = e.currentTarget.dataset.item;
app.MG.store.delShoppingCart({
@@ -125,5 +127,10 @@
direction: 'column',
});
}
+ },
+ onLogin() {
+ wx.navigateTo({
+ url: '/pages/testLogin/index'
+ });
}
});
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index ef02555..7642960 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -1,10 +1,14 @@
<view class="outsideContentBox">
<!-- <checkbox-group bindchange="HandelItemChange"> -->
- <view wx:if="{{!shoppingCartData}}" class="noDataBox">
+ <view wx:if="{{shoppingCartData.length <= 0}}" class="noDataBox">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
-
</view>
+ <!-- <button bind:tap="onLogin"> 鍘荤櫥褰�</button> -->
<t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+
+
+
+
<!-- <view class="contentBox"> -->
<!-- <view class="contentCheckbox">
<checkbox value="{{item.id}}" checked="{{item.checked}}"></checkbox>
@@ -42,6 +46,7 @@
</view>
<view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">鍒犻櫎</view>
</t-swipe-cell>
+
</view>
<view class="bottomBox">
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index fcad534..739a4c7 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -15,20 +15,13 @@
purchasedIds: [],
productList: [],
payPrice: '',
- drawQrcodeText: 'https://www.baidu.com/',
orderGoods: '',
-
-
- confirmBtn: { content: '纭畾', variant: 'base' },
- dialogKey: 'false',
-
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -39,44 +32,7 @@
selectedIds: options.selectedIds
})
console.log('鎺ユ敹鍒扮殑璁㈠崟鍙�:', this.data.orderNumber);
-
-
this.getOrderByOrderNum()
-
-
-
-
- drawQrcode({
-
- width: 200, // 蹇呴』锛屼簩缁寸爜瀹藉害锛屼笌canvas鐨剋idth淇濇寔涓�鑷�
-
- height: 200, // 蹇呴』锛屼簩缁寸爜楂樺害锛屼笌canvas鐨刪eight淇濇寔涓�鑷�
-
- canvasId: 'myQrcode',
-
- background: '#ffffff', // 闈炲繀椤伙紝浜岀淮鐮佽儗鏅鑹诧紝榛樿鍊肩櫧鑹�
-
- foreground: '#2bb15e', // 闈炲繀椤伙紝浜岀淮鐮佸墠鏅壊锛岄粯璁ゅ�奸粦鑹� '#000000'
-
- // ctx: wx.createCanvasContext('myQrcode'), // 闈炲繀椤伙紝缁樺浘涓婁笅鏂囷紝鍙�氳繃 wx.createCanvasContext('canvasId') 鑾峰彇锛寁1.0.0+鐗堟湰鏀寔
-
- text: this.data.drawQrcodeText, // 蹇呴』锛屼簩缁寸爜鍐呭
- // v1.0.0+鐗堟湰鏀寔鍦ㄤ簩缁寸爜涓婄粯鍒跺浘鐗�
-
- image: {
- // imageResource: '../../images/icon.png', // 鎸囧畾浜岀淮鐮佸皬鍥炬爣
- dx: 70,
- dy: 70,
- dWidth: 60,
- dHeight: 60
- }
- })
-
-
-
-
-
-
},
/**
@@ -171,32 +127,20 @@
orderNum: this.data.orderGoods
}
app.MG.store.confirmOrder(query).then(res => {
- this.makeWeChatQrPayGet()
+ console.log(res.orderNumber, 'res');
+ if (res.orderNumber) {
+ const resOrderNum = {
+ orderNum: res.orderNumber,
+ };
+
+ // 鐢ㄦ埛鏈粦瀹氬井淇� 鎶�500
+ app.MG.store.makeWeChatPay(resOrderNum).then(payRes => {
+ const payVal = JSON.parse(payRes);
+ console.log(payVal);
+ })
+ }
+ // this.makeWeChatQrPayGet()
})
// 璋冨彇寰俊浜岀淮鐮佹敮浠�
-
},
- // 璋冨彇寰俊浜岀淮鐮佹敮浠�
- makeWeChatQrPayGet() {
- let query = {
- orderNum: this.data.orderGoods
- }
- app.MG.store.makeWeChatQrPay(query).then((res) => {
-
- this.setData({
- drawQrcodeText: res
- })
- this.data.dialogKey = true
- console.log(this.data.drawQrcodeText, 'drawQrcodeText');
- })
- },
- showDialog(e) {
- const { key } = e.currentTarget.dataset;
- this.setData({ [key]: true, dialogKey: key });
- },
- closeDialog() {
- const { dialogKey } = this.data;
- this.setData({ [dialogKey]: false });
- },
-
})
\ No newline at end of file
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index f92e232..2abb441 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -11,14 +11,7 @@
<view class="paymentPageBox">
<view class="content">
- <t-dialog visible="{{showCloseBtn}}" close-btn bind:confirm="closeDialog" bind:cancel="closeDialog">
- <view slot="content" class="slotContent">
- <view class="myQrcodeBox">
- <canvas style="width: 200px; height: 200px;margin:0 auto" canvas-id="myQrcode"></canvas>
- <view class="myQrcodeTextBox">寰俊鎵爜鏀粯</view>
- </view>
- </view>
- </t-dialog>
+
<view class="shoppingCartList">
<view class="cartList" wx:for="{{productList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="imageBox">
diff --git a/pages/home/home.js b/pages/home/home.js
index f534823..2105851 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -533,6 +533,7 @@
})
- }
+ },
+
});
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index baecdb0..ec9da0d 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,3 +1,8 @@
+
+
+
+
+
<view style="text-align: center; color: #b9b9b9" wx:if="{{pageLoading}}">
<t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." inherit-color />
</view>
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index e2ff6dd..e5e7d1c 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -433,7 +433,6 @@
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
-
})
console.log(datas5, 'sadasd');
this.setData({
@@ -490,10 +489,10 @@
downloadData(event) {
console.log(111);
const item = event.currentTarget.dataset.item;
- // console.log(item.datas.freeFile.searchVal);
- const URL = 'http://182.92.203.7:3001/file/api/ApiDownload?md5=' + item.datas.freeFile.searchVal
+ // console.log(item.datas.freeFile.Value);
+ const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
-
+ console.log(URL, 'URL');
setTimeout(() => {
if (URL) {
item.determine = true
@@ -531,6 +530,23 @@
})
- }
+ },
+ onBookExhibitionDetails(e) {
+ console.log(e.currentTarget.dataset.item);
+ const item = e.currentTarget.dataset.item
+
+ wx.navigateTo({
+ url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
+ });
+ },
+ //瑙﹀簳鍑芥暟
+ onReachBottom() {
+ console.log("涓婃媺鍔犺浇....");
+ },
+ //涓婃媺鍑芥暟
+ onPullDownRefresh() {
+ console.log("涓嬫媺鍒锋柊...");
+ },
+
})
\ No newline at end of file
diff --git a/pages/retrievalPage/index.json b/pages/retrievalPage/index.json
index 3c65fd8..fa9fab5 100644
--- a/pages/retrievalPage/index.json
+++ b/pages/retrievalPage/index.json
@@ -4,7 +4,9 @@
"t-icon": "tdesign-miniprogram/icon/icon",
"t-search": "tdesign-miniprogram/search/search",
"t-tabs": "tdesign-miniprogram/tabs/tabs",
- "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel"
+ "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": true
}
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index ab0107a..c36c3f5 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -20,6 +20,9 @@
<t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel">
<t-tab-panel label="鍥句功({{bookTotal}})" value="0">
<view class="bookDataBox">
+ <view wx:if="{{bookData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBook">
@@ -41,6 +44,9 @@
<view class="listBox1">
+ <view wx:if="{{courseData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view wx:if="{{courseData.length>0}}">
<view wx:for="{{courseData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
<view class="listItem flex">
@@ -62,9 +68,7 @@
</view>
</view>
</view>
- <view class="empyt" wx:else>
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
- </view>
+
</view>
@@ -76,7 +80,9 @@
<view class="bookDataBox">
-
+ <view wx:if="{{digitalTextbooksData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="bookDataForBox" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="imageBox">
<image src="{{item.icon}}" mode="" />
@@ -96,6 +102,9 @@
</t-tab-panel>
<t-tab-panel label="涓撻({{seminarTotal}})" value="3">
<view class="listBox">
+ <view wx:if="{{seminarData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
<view class="listItem">
<view class="specialSubject-img">
@@ -125,6 +134,9 @@
<view class="outsideHigherBox">
+ <view wx:if="{{bookFairData.length <= 0 }}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="higherBox" wx:for="{{bookFairData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
<view class="outsideHigherImageBox">
<image class="higherImageBox" src="{{item.icon}}" mode="" />
@@ -150,6 +162,9 @@
</t-tab-panel>
<t-tab-panel label="涔﹀睍({{biblioClassificationTotal}})" value="5">
<view class="outside">
+ <view wx:if="{{biblioClassificationData.length <= 0}}" class="noDataBox">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="contentBox" wx:for="{{biblioClassificationData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
<image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode="" />
<image class="bookFairImage" wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index a893adc..b17fdca 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -293,4 +293,12 @@
.t-tabs__track {
background-color: #FF6C00 !important;
+}
+
+.noDataBox {
+ /* display: flex;
+ justify-content: center;
+ align-items: center */
+ margin: 0 auto;
+ margin-top: 250rpx;
}
\ No newline at end of file
diff --git a/services/home/home.js b/services/home/home.js
index d1d92a2..35d6725 100644
--- a/services/home/home.js
+++ b/services/home/home.js
@@ -45,7 +45,7 @@
text: '涔︾洰涓嬭浇',
key: 6,
icon: '/static/images/home/shumuxiazai@2x.png',
- url: '',
+ url: '/pages/bibliographyList/index',
},
{
text: '鏁欏笀璁よ瘉',
diff --git a/static/images/bookService/detail/square.png b/static/images/bookService/detail/square.png
new file mode 100644
index 0000000..fc6a912
--- /dev/null
+++ b/static/images/bookService/detail/square.png
Binary files differ
--
Gitblit v1.9.1