From 4c29b79d485d68d506e798f4fd381232ebc55a86 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 14 九月 2024 11:27:33 +0800
Subject: [PATCH] bug
---
pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxss | 4
pages/home/home.js | 11
pages/study/index.wxml | 6
packageBookService/pages/bookServices/detail/index.wxml | 10 +
style/theme.wxss | 4
packageBookService/pages/bookServices/detail/index.wxss | 36 +++++
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss | 14 +
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml | 2
pages/digitalCourses/digitalCoursesDetails/index.wxss | 7
pages/digitalCourses/digitalCoursesDetails/index.wxml | 2
packageBookService/pages/bookServices/detail/index.js | 7
pages/retrievalPage/index.js | 48 +-----
pages/digitalCourses/digitalCoursesDetails/index.js | 58 ++++---
pages/cart/paymentPage/index.wxml | 3
packageBookService/pages/bookServices/detail/components/teachResource/index.wxss | 4
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 8
packageDomain/pages/resourceDetails/myVideo/index.js | 30 +++
packageDomain/pages/resourceDetails/myAudio/index.js | 18 ++
pages/retrievalPage/index.wxml | 27 +++
pages/personalCenter/pointsRecord/index.json | 2
pages/retrievalPage/index.wxss | 67 +++++++++
pages/digitalCourses/digitalCoursesDetails/components/question/question.js | 11 +
pages/cart/paymentPage/index.js | 4
pages/bibliographyList/index.wxml | 2
pages/bibliographyList/index.wxss | 8
25 files changed, 288 insertions(+), 105 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index bd9ee13..7c7a4da 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -1,15 +1,15 @@
-<view class="teach-btn">
- <t-button theme="primary" style="width: 120px; height: 36px" class="btn" bind:tap="uploadBtn">
+<!-- <view class="teach-btn"> -->
+ <!-- <t-button theme="primary" style="width: 120px; height: 36px" class="btn" bind:tap="uploadBtn">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/upload.png" mode="aspectFit" ></image>
<text>涓婁紶璧勬簮</text>
</view>
- </t-button>
+ </t-button> -->
<!-- <t-button theme="primary" style="width: 120px; height: 36px">
<t-image src="/static/images/bookService/detail/download.png"></t-image>
鎵归噺涓嬭浇
</t-button> -->
-</view>
+<!-- </view> -->
<view class="applyResult {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}">
<view wx:if="{{applyState == 'WaitAudit'}}">璧勬簮涓嬭浇鐢宠姝ｅ湪瀹℃牳涓紝璇疯�愬績绛夊緟锛�</view>
<view wx:if="{{applyState == 'Normal'}}">
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
index d7b5ca2..5698193 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
@@ -47,8 +47,8 @@
.applyReject,
.applyPass,
.applying {
- margin-top: 40rpx;
- margin-bottom: 40rpx;
+ margin-top: 10rpx;
+ margin-bottom: 20rpx;
}
.btn-box {
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 3cd8b44..86016ed 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -547,7 +547,6 @@
this.setData({
resourceCodeList: res.datas.cmsDatas[0].datas
})
- // console.log('鍥句功璧勬簮', res.datas.cmsDatas[0].datas)
})
},
//璇锋眰瀛愬晢鍝佺殑鏂囦欢
@@ -1037,8 +1036,6 @@
if (type.refCode == "jsek_teachingResources") {
this.findChildIds(list, result);
// const newUSeList = this.deleteTreeData(list, result)
- // console.log('鏍戝墧闄�', result, newUSeList);
- // console.log('鏍戝姞涓�', this.increaseTreeData(list, newUSeList, 16094));
this.setData({
openTeachids: result,
loading: false,
@@ -1422,7 +1419,6 @@
applyState: "Normal",
deadline: "姘镐箙",
});
- console.log("鏈夋晥鏃ユ湡", this.data.deadline);
} else {
let endTime = new Date(endDate + " 23:59:59").getTime();
this.setData({
@@ -2238,7 +2234,6 @@
}
});
const smBook = list.find(item => item.content[0].id == this.data.bookDetail.id)
- console.log('宸茬敵璇�', smBook);
if (smBook && smBook.state == 'Normal') {
const flag = new Date(smBook.feedBack.endDate + ' 23:59:59').getTime() > new Date().getTime()
if (flag) {
@@ -2658,13 +2653,13 @@
},
onNameInput(e) {
- console.log(e.detail.value)
this.setData({
'resourceInfo.resourceName': e.detail.value,
});
},
onResourcePicker(e) {
this.setData({
+ resourceValue: [this.data.resourceInfo.fileType],
resourceVisible: true,
});
},
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index a383338..c81b427 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -127,7 +127,15 @@
</t-tab-panel> -->
<t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
<view wx:if="{{!loading && teach.length && !noResources && applyState}}">
- <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}" bind:uploadFile="uploadFile"></teach-resource>
+ <view class="teach-btn">
+ <t-button theme="primary" style="width: 120px; height: 36px" class="btn" bind:tap="uploadFile">
+ <view slot="content" class="btn-content">
+ <image src="/static/images/bookService/detail/upload.png" mode="aspectFit" ></image>
+ <text>涓婁紶璧勬簮</text>
+ </view>
+ </t-button>
+ </view>
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
<tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" deadline="{{deadline}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<!-- <t-loading
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 9ad1816..94f8a6d 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -631,4 +631,40 @@
.deleteBtn {
width: 30rpx;
height: 30rpx;
+}
+
+.teach-btn {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ padding: 0 40rpx;
+ height: 120rpx;
+}
+
+.btn {
+ width: 220rpx;
+ font-size: 28rpx;
+ --td-button-primary-bg-color: #fff;
+ --td-button-primary-border-color: #FF6C00;
+ --td-button-primary-color: #ff6c00;
+ --td-button-primary-active-bg-color: #fff0e6;
+ --td-button-primary-active-border-color: #ff6c00;
+ padding: 0;
+ display: flex;
+ align-items: center;
+}
+
+.btn-content {
+ display: flex;
+ align-items: center;
+}
+
+.btn image {
+ margin-right: 4rpx;
+ width: 28rpx;
+ height: 32rpx;
+}
+
+.btn text {
+ font-size: 28rpx;
}
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index afd12cd..af8f609 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -289,7 +289,22 @@
}
} else {
if (item.selectType === "audio" || item.learnSelectType === "audio") {
- this.data.threeLeveData.push(item);
+ // this.data.threeLeveData.push(item);
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ } else {
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
+ } else {
+ if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
}
}
@@ -330,7 +345,6 @@
isplay: false
})
const item = e.currentTarget.dataset.item
- console.log(item, 222)
if (this.data.showData != '') {
this.setData({
titleName: item.name,
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 2e91b05..ef8f945 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -25,6 +25,7 @@
parentName: '',
parentProductLinkPath: '',
productLinkPath: '',
+ isBuy: false,
threeLeveData: [],
source: "",
showData: '',
@@ -253,6 +254,15 @@
}
}
app.MG.store.getProductDetail(query).then(res => {
+ if (res.datas.purchasedSaleMethodIdList.includes(res.datas.defaultSaleMethodId)) {
+ this.setData({
+ isBuy: true
+ })
+ } else {
+ this.setData({
+ isBuy: false
+ })
+ }
res.datas.cmsDatas[0].datas.forEach((item) => {
if (this.data.source == 'qrcode') {
if (item.id == this.data.activeId) {
@@ -260,7 +270,21 @@
}
} else {
if (item.selectType === "video" || item.learnSelectType === "video") {
- this.data.threeLeveData.push(item)
+ if (this.data.storeInfo == 'jsek_digitalCourses') {
+ if (this.data.isBuy) {
+ if (item.sysType == 'CmsItem') {
+ this.data.threeLeveData.push(item)
+ }
+ } else {
+ if (item.sysType == 'CmsItem' && item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
+ } else {
+ if (res.datas.purchasedSaleMethodIdList.includes(item.defaultSaleMethodId) || item.freeFile) {
+ this.data.threeLeveData.push(item)
+ }
+ }
this.setData({
threeLeveData: this.data.threeLeveData
})
@@ -308,8 +332,8 @@
})
if (item.selectType == "video" || item.learnSelectType === "video") {
if (this.data.formPath === "jsek_cloudLearning") {
- let file
- item.protectedFile || item.file ? file = item.protectedFile || item.file : file = item.freeFile
+ let file =
+ item.protectedFile || item.file ? file = item.protectedFile || item.file : file = item.freeFile
this.setData({
showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
})
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index adddd18..fff1cc2 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -266,7 +266,7 @@
<t-toast id="t-toast" />
<!-- 寮圭獥 -->
-<view wx:if="{{dialogBox}}">
+<view wx:if="{{dialogBox}}">
<view class="popup-box" bindtap="closeDialog"></view>
<view class="info-center" style="top:{{height*0.4}}px;">
<view>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index 58ed836..1a476ec 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -63,12 +63,12 @@
}
.higherTextBox {
- height: 48rpx;
+ height: 70rpx;
font-weight: bold;
font-size: 25rpx;
color: #333333;
- padding: 15rpx;
- margin-bottom: 20rpx;
+ padding: 0 15rpx;
+ margin-bottom: 15rpx;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
@@ -266,7 +266,7 @@
.info-center {
position: fixed;
- top: 80%;
+ top: 30%;
z-index: 999;
background-color: white;
align-items: center;
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index febb0d2..8bece7c 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -241,7 +241,7 @@
if (res) {
this.setData({
payId: res.payList[0].id,
- payPrice: res.payPrice,
+ payPrice: res.payPrice.toFixed(2),
deduct: (this.data.currentBalance / 100).toFixed(2),
integral: this.data.integral - this.data.currentBalance,
showIntegral: true
@@ -258,7 +258,7 @@
console.log(res, "鍙栨秷鐢ㄧН鍒�")
if (res) {
this.setData({
- payPrice: res.payPrice,
+ payPrice: res.payPrice.toFixed(2),
showIntegral: false
});
this.getIntegral()
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index f52919e..b20109e 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -36,8 +36,7 @@
</view>
</view> -->
</view>
- <view class="textBox" wx:if="{{item.type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
- <view class="textBox" wx:if="{{item.type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
+ <view class="textBox">{{item.productType}}</view>
<view class="priceBox">锟{item.orderSaleMethod.price}}</view>
</view>
</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/question/question.js b/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
index f17fd45..8e505cf 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
+++ b/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
@@ -147,6 +147,7 @@
}
let submitData = {
+ bookId: this.properties.bookInfo.id,
content: this.data.content.replace(/^\s*|\s*$/g, ""),
name: this.data.userName.replace(/^\s*|\s*$/g, ""),
email: "",
@@ -212,7 +213,6 @@
this.setData({
noList: false,
});
- let topicId;
app.MG.ugc
.getTopicMessageList({
appRefCode: app.config.appRefCode,
@@ -231,16 +231,19 @@
noteList: res.datas,
});
}
- // notePage.value.total = res.totalSize
+ let list = []
res.datas.forEach((item) => {
item.title = JSON.parse(item.content).content;
item.createDate = moment(item.createDate).format("YYYY-MM-DD HH:mm:ss");
item.updateDate = moment(item.updateDate).format("YYYY-MM-DD HH:mm:ss");
item.feedBack = item.feedBack ? item.feedBack : '鏆傛湭鍥炲'
+ if (this.properties.bookInfo.id == JSON.parse(item.content).bookId) {
+ list.push(item)
+ }
});
this.setData({
- "pageCount.total": res.totalSize,
- onlineQuestionsList: res.datas,
+ "pageCount.total": list.length,
+ onlineQuestionsList: list,
loading: false,
noList: false,
});
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxss b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxss
index fd8e1e5..c30efa0 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxss
@@ -41,6 +41,10 @@
height: 32rpx;
}
+.t-cell {
+ padding: 20rpx !important;
+}
+
.contentBox {
margin: 0 26rpx;
padding: 0 20rpx;
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
index a584495..fa1bd39 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
@@ -45,9 +45,9 @@
<image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
<!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
<image wx:else src="/static/images/bookService/detail/word.png" mode="" />
+ <text class="name" style="width:400rpx">{{citem.name || '-'}}</text>
</view>
<!-- 鍚嶇О -->
- <text class="name" style="width:410rpx">{{citem.name || '-'}}</text>
<text>{{citem.progress ? citem.progress : 0}}%</text>
</view>
<view class="seeBox" wx:if="{{!isBuy && citem.freeFile ? true : false}}" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}" data-isTry="{{true}}">
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
index 6ddb192..4a94ddf 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
@@ -41,8 +41,12 @@
height: 32rpx;
}
+.t-cell {
+ padding: 20rpx !important;
+}
+
.contentBox {
- margin: 0 26rpx;
+ margin-left: 40rpx;
padding: 0 20rpx;
height: 88rpx;
background-color: #fff6f0;
@@ -51,6 +55,7 @@
align-items: center;
justify-content: space-between;
}
+
.contentBox .checkBox {
--td-checkbox-vertical-padding: 0;
@@ -109,8 +114,13 @@
padding: var(--td-collapse-content-padding, 0rpx) !important;
} */
-.seeBox,
.fl-cn {
display: flex;
align-items: center;
+ flex: 1;
+}
+
+.seeBox {
+ display: flex;
+ align-items: center;
}
\ No newline at end of file
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index ffd34c1..a795cee 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -174,9 +174,9 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
- this.setData({
- userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
- })
+ // this.setData({
+ // userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
+ // })
},
/**
@@ -231,7 +231,7 @@
app.MG.identity
.getUserKey({
domain: 'videoPlayer',
- keys: [this.data.bookId]
+ keys: [this.data.bookId + '']
})
.then((res) => {
if (res.length > 0) {
@@ -311,6 +311,10 @@
}
if (res.datas.datas.speaker && res.datas.datas.speaker.length > 0) {
this.getSpeaker(res.datas.datas.speaker)
+ } else {
+ this.setData({
+ lecturerList: []
+ })
}
if (this.data.bookPath) {
this.getAboutBook(this.data.bookPath)
@@ -330,6 +334,9 @@
},
//鑾峰彇涓昏浜�
getSpeaker(list) {
+ this.setData({
+ lecturerList: []
+ })
let query = {
path: 'jsek_speaker',
fields: {
@@ -414,6 +421,9 @@
this.setData({
tabValue: value
})
+ if (this.data.tabValue == 0) {
+ this.digitalCoursesDetailsGet(this.data.bookId)
+ }
if (this.data.tabValue == 1) {
this.saveAsImage()
}
@@ -733,8 +743,6 @@
onCorrelationBook(e) {
const item = e.currentTarget.dataset.item;
- // this.digitalCoursesDetailsGet(item.id)
- // this.getPlayerList()
this.onLoad({
loading: true,
id: item.id,
@@ -875,7 +883,7 @@
icon: "none",
duration: 1000,
});
- this.getBookInfo(this.data.bookDetail.id);
+ this.digitalCoursesDetailsGet(this.data.bookId);
}
});
} else {
@@ -1044,7 +1052,9 @@
item.content = JSON.parse(item.content)
if (item.content.id == this.data.bookId) {
this.setData({
- isCertificate: item
+ isCertificate: item,
+ userName: item.content.userName,
+ userPicture: app.config.requestCtx + `/file/GetPreViewImage?md5=` + item.content.userPicture
})
}
})
@@ -1055,22 +1065,22 @@
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
- // if (!this.data.isLearn) {
- // wx.showToast({
- // title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
+ if (!this.data.isLearn) {
+ wx.showToast({
+ title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
wx.showToast({
title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 6efdeac..c9f44e8 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -6,7 +6,7 @@
<view class="book-box">
<view class="digitalCoursesDetailsTitle">
<view class="imageBox">
- <image src="{{digitalsData.icon}}" mode="aspectFit" />
+ <image src="{{digitalsData.icon ? digitalsData.icon : 'https://jsek.bnuic.com/home/image/courseIcon.png'}}" mode="aspectFit" />
</view>
<view class="nameBox">{{digitalsData.name}}</view>
<view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index f0a265a..3f70b98 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -263,6 +263,11 @@
height: 40rpx;
}
+.collectionImage image {
+ width: 38rpx;
+ height: 38rpx;
+}
+
.bottom-btn {
background-color: #fff;
width: 25%;
@@ -646,7 +651,7 @@
background-color: #fff6f0;
display: flex;
justify-content: space-between;
- padding: 20rpx 32rpx;
+ padding: 20rpx;
margin-top: 30rpx;
}
diff --git a/pages/home/home.js b/pages/home/home.js
index 9bfbbab..3bce987 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -66,16 +66,17 @@
loginInfo(app, (data) => {
// 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
if (data) {
- // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ this.init();
+ this.registe()
} else {
- // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ this.init();
}
})
} else {
- // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ this.init();
+ this.registe()
}
- this.registe()
- this.init();
+
},
onReachBottom() {},
onPullDownRefresh() {
diff --git a/pages/personalCenter/pointsRecord/index.json b/pages/personalCenter/pointsRecord/index.json
index fb00269..2b31038 100644
--- a/pages/personalCenter/pointsRecord/index.json
+++ b/pages/personalCenter/pointsRecord/index.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "鎴戠殑涓嬭浇",
+ "navigationBarTitleText": "鎴戠殑绉垎",
"usingComponents": {
"t-back-top": "tdesign-miniprogram/back-top/back-top",
"t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh",
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 2dd384d..29f5b3d 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -72,14 +72,14 @@
},
],
tabsId: 0, //榛樿閫夊瀷涓鸿澶�
-
+ height: '',
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding: 0 0 0 16rpx;height:70rpx',
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- console.log(app.config.appId);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -107,6 +107,15 @@
} else {
this.getUserInfo()
}
+ var that = this;
+ // 鍔ㄦ�佽幏鍙栧睆骞曢珮搴�
+ wx.getSystemInfo({
+ success: (result) => {
+ that.setData({
+ height: result.windowHeight
+ });
+ },
+ })
},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
@@ -195,7 +204,6 @@
//鏍囩鐨勫垏鎹�
onTabsChange(event) {
const value = event.detail.value
- console.log(value);
this.setData({
tabValue: value,
isMore: false
@@ -454,7 +462,6 @@
method: 'post',
data: body
}).then((resp) => {
- console.log(resp, 'resp');
//鍥句功 0
const data1 = resp[0]
const datas1 = handleQueryResourceListData({
@@ -466,7 +473,6 @@
bookTotal: data1.totalCount,
[`tabList[${0}].bookTotal`]: data1.totalCount
})
- console.log(this.data.tabList, 7777)
//鏁板瓧璇剧▼ 1
const data2 = resp[1]
const datas2 = handleQueryResourceListData({
@@ -509,7 +515,6 @@
datas5.forEach((items) => {
items.subtitleName = items.subtitle + items.name
})
- // console.log(datas5, 'sadasd');
this.setData({
biblioClassificationData: datas5,
biblioClassificationTotal: data5.totalCount,
@@ -568,7 +573,6 @@
const item = event.currentTarget.dataset.item;
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
@@ -625,19 +629,16 @@
loading: true,
hidden: true,
})
- console.log(this.data.searchVal);
this.retrievalPageGet()
this.bibliographyGet()
},
onBook(e) {
- console.log(e.currentTarget.dataset.item);
const item = e.currentTarget.dataset.item
wx.navigateTo({
url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
})
},
onBookExhibitionDetails(e) {
- console.log(e.currentTarget.dataset.item);
const item = e.currentTarget.dataset.item
wx.navigateTo({
@@ -653,9 +654,7 @@
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
onReachBottom(e) {
- console.log(this.data.tabValue);
if (this.data.tabValue == 0) {
- console.log(0);
if (this.data.bookData.length < this.data.bookTotal) {
this.setData({
isMore: true,
@@ -693,7 +692,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 2) {
if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
@@ -713,7 +711,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 3) {
if (this.data.seminarData.length < this.data.seminarTotal) {
this.setData({
@@ -731,7 +728,6 @@
})
}, 100)
}
- console.log(3);
} else if (this.data.tabValue == 4) {
if (this.data.bookFairData.length < this.data.bookFairTotal) {
this.setData({
@@ -749,7 +745,6 @@
})
}, 100)
}
- console.log(4);
} else if (this.data.tabValue == 5) {
if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
this.setData({
@@ -772,7 +767,6 @@
// 涓嬫媺鍑芥暟
onPullDownRefresh() {
- console.log(456);
if (this.data.tabValue == 4) {
this.setData({
"pageCount.page": 1
@@ -795,7 +789,6 @@
},
// 閭鐐瑰嚮
mailbox(e) {
- console.log(e);
const key = e.currentTarget.dataset.key;
const item = e.currentTarget.dataset.item;
this.setData({
@@ -821,8 +814,6 @@
this.setData({
[dialogKey]: false
});
- console.log(this.data.input);
- console.log(this.data.Md5);
if (this.data.input) {
let query = {
eMail: this.data.input,
@@ -848,11 +839,9 @@
this.setData({
[dialogKey]: false
});
- console.log(111);
},
onScrollToLower() {
if (this.data.tabValue == 0) {
- console.log(0);
if (this.data.bookData.length < this.data.bookTotal) {
this.setData({
isMore: true,
@@ -890,7 +879,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 2) {
if (this.data.digitalTextbooksData.length < this.data.digitalTextbooksTotal && this.data.digitalTextbooksData.length > 9) {
@@ -910,7 +898,6 @@
}, 100)
}
- console.log(2);
} else if (this.data.tabValue == 3) {
if (this.data.seminarData.length < this.data.seminarTotal) {
this.setData({
@@ -928,7 +915,6 @@
})
}, 100)
}
- console.log(3);
} else if (this.data.tabValue == 4) {
if (this.data.bookFairData.length < this.data.bookFairTotal) {
this.setData({
@@ -946,7 +932,6 @@
})
}, 100)
}
- console.log(4);
} else if (this.data.tabValue == 5) {
if (this.data.biblioClassificationData.length < this.data.biblioClassificationTotal) {
this.setData({
@@ -966,16 +951,7 @@
}
}
},
- onTabsClick(event) {
- console.log(`
- Click tab, tab - panel value is $ {
- event.detail.value
- }.
- `);
- },
- tabClick() {
- console.log(2323);
- },
+
// 婊戝姩鏃惰Е鍙戠殑浜嬩欢
slideOn(e) {
// 鎷垮埌褰撳墠绱㈠紩骞跺姩鎬佹敼鍙�
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index 0a5b738..f05e3dc 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -185,9 +185,34 @@
</swiper-item>
</swiper>
</view>
- <view class="dialogBox" wx:if="{{showWithInput}}">
+ <!-- <view class="dialogBox" wx:if="{{showWithInput}}">
<t-dialog visible="{{showWithInput}}" title="璇疯緭鍏ラ偖绠�" confirm-btn="纭畾" cancel-btn="鍙栨秷" bind:confirm="onConfirm" bind:cancel="closeDialog">
<t-input value="{{input}}" borderless class="dialog-input" clearable slot="content" placeholder="璇疯緭鍏ラ偖绠卞彿" placeholder-class="placeholder" bindchange="onEmailInput" />
</t-dialog>
+ </view> -->
+</view>
+<view wx:if="{{showWithInput}}">
+ <view class="popup-box" bindtap="closeDialog"></view>
+ <view class="info-center" style="top:{{height*0.4}}px;">
+ <view>
+ <view class="row-info">
+ <view class="body">
+ <view class="dialog-title">璇疯緭鍏ラ偖绠�</view>
+ <view class="input-box">
+ <t-input
+ style="{{inputStyle}}"
+ class="input"
+ placeholder="璇疯緭鍏ラ偖绠卞彿"
+ value="{{input}}"
+ bind:change="onEmailInput"
+ ></t-input>
+ </view>
+ </view>
+ <view class="row-btn">
+ <view class="left-btn" bindtap="closeDialog">鍙栨秷</view>
+ <view class="right-btn" bindtap="onConfirm">纭</view>
+ </view>
+ </view>
+ </view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index 1483cdc..be1f80c 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -461,4 +461,71 @@
.tabIndexBox {
text-align: center;
+}
+
+/* 钂欏眰 */
+.popup-box {
+ position: absolute;
+ z-index: 99;
+ top: 0;
+ background-color: rgba(0, 0, 0, 0.5);
+ width: 100%;
+ height: 100%;
+}
+
+.info-center {
+ position: fixed;
+ top: 30%;
+ z-index: 999;
+ background-color: white;
+ align-items: center;
+ justify-content: center;
+ border-radius: 10rpx;
+ width: 80%;
+ margin-left: 10%;
+ margin-right: 10%;
+}
+
+.row-btn {
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ border-top: 1rpx solid #f1f1f1;
+}
+
+.row-btn view {
+ flex: 1;
+ text-align: center;
+ margin: 20rpx 10%;
+ padding: 12rpx 0;
+ font-size: 32rpx;
+ border-radius: 10rpx;
+}
+
+.left-btn {
+ background-color: #f1f1f1;
+ color: #5C5C5C;
+}
+
+.right-btn {
+ background-color: #ff6c00;
+ color: white;
+}
+
+.row-info .body {
+ min-height: 120rpx;
+}
+
+.dialog-title {
+ padding: 20rpx 0;
+ text-align: center;
+ font-size: 35rpx;
+ font-weight: 600;
+}
+
+.input-box {
+ padding: 0 20rpx;
+ width: 92%;
+ margin-bottom: 16rpx;
}
\ No newline at end of file
diff --git a/pages/study/index.wxml b/pages/study/index.wxml
index 4212eed..ca85916 100644
--- a/pages/study/index.wxml
+++ b/pages/study/index.wxml
@@ -27,10 +27,12 @@
</view>
<view class="list" wx:if="{{list.length > 0}}">
<view class="listBox">
- <view class="{{active == '1' ? 'class--tem' : 'content-item'}}" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+ <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="book-img" bind:tap="goBookDetails" data-book="{{item}}">
<t-image src="{{item.product.icon}}" width="{{active == '1' ? 150 : 105}}" height="{{active == '1' ? 90 : 145}}" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
- <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else mode="aspectFit" />
+ <t-image src="https://jsek.bnuic.com/home/image/courseIcon.png" width="150" height="90" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '1'}}"/>
+ <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '0'}}"/>
+ <t-image src="https://jsek.bnuic.com/home/image/textBookIcon.png" width="105" height="145" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '2'}}"/>
</view>
<view class="body-info" data-book="{{item}}" bindtap="goBookDetails">
<view class="name">{{item.product.name}}</view>
diff --git a/style/theme.wxss b/style/theme.wxss
index b0f01a6..f742000 100644
--- a/style/theme.wxss
+++ b/style/theme.wxss
@@ -45,4 +45,8 @@
.dialog__button-cancel {
color: #aeb3b7 !important;
+}
+
+.t-picker__confirm {
+ color: #FF6C00 !important;
}
\ No newline at end of file
--
Gitblit v1.9.1