From fba71ba1ae5030cb1a20f54f29fb06ad97060297 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 20 九月 2024 18:37:19 +0800
Subject: [PATCH] zs
---
pages/digitalCourses/digitalCoursesDetails/index.wxss | 44 ++++++++++++----------
pages/digitalCourses/index.js | 3 -
pages/home/home.js | 13 +++---
pages/personalCenter/certificate/index.wxss | 15 ++++---
pages/digitalCourses/digitalCoursesDetails/index.js | 20 +++++----
pages/specialDiscussion/index.js | 12 ++++-
packageBookService/pages/bookServices/detail/index.js | 7 +++
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 2
8 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 61d49e7..b4f2294 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -2821,5 +2821,10 @@
this.setData({
cloundMenuIsBuy: flag
})
- }
+ },
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {},
+ onShareTimeline() {}
})
\ No newline at end of file
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 21b05e9..6934b6b 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -103,7 +103,7 @@
rzzsImg: '', //璁よ瘉璇佷功base64
imageWidth: '', //鐢诲湪鐢诲竷涓婄殑鍥剧墖鐨勫搴�
imageHeight: '', //鐢诲湪鐢诲竷涓婄殑鍥剧墖鐨勯珮搴�
- website: 'https://jsek.bnuic.com',
+ website: 'https://jsek.bnuic.com/home/#/digitalCourses',
},
formatDate(dateString) {
if (!dateString) {
@@ -174,10 +174,6 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
- this.setData({
- userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
- })
- console.log('1', options.id);
},
/**
@@ -447,7 +443,8 @@
selectChange(event) {
const value = event.target.dataset.value
this.setData({
- selectActive: value
+ selectActive: value,
+ testCount: 0
})
this.getResource()
},
@@ -668,6 +665,7 @@
//鍦ㄧ嚎娴嬭瘯鑾峰彇鏈�鍚庝竴涓妭鐐规暟閲�
countLeafNodes(tree) {
+
tree.forEach(node => {
if (!node.children || node.children.length === 0) {
this.setData({
@@ -834,7 +832,7 @@
Toast({
context: this,
selector: "#t-toast",
- message: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞",
+ message: "璇ヨ绋嬪凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
theme: "warning",
direction: "column",
});
@@ -938,7 +936,9 @@
},
)
.exec()
- this.drawImage()
+ setTimeout(() => {
+ this.drawImage()
+ }, 500)
query
.select('#textCertificate')
.fields({
@@ -957,7 +957,9 @@
},
)
.exec()
- this.drawImage1()
+ setTimeout(() => {
+ this.drawImage1()
+ }, 500)
},
drawImage() {
let that = this;
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index bec086b..c42ccf9 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -465,7 +465,10 @@
}
#pubCertificate .bookName {
- padding-top: 260px;
+ padding-top: 256px;
+ width: 500px;
+ height: 66px;
+ margin: 0 auto;
text-align: center;
font-size: 30px;
color: #000;
@@ -473,26 +476,29 @@
}
#pubCertificate .author {
- margin-top: 30px;
+ height: 80px;
+ width: 290px;
font-size: 24px;
margin-left: 250px;
color: #000;
- margin-bottom: 50px;
font-family: 'FZXBSJW';
}
#pubCertificate .affiliatedUnit {
- margin-top: 13px;
+ height: 29px;
+ width: 250px;
margin-left: 46%;
color: #000;
font-family: 'SimHei', sans-serif;
+ white-space: nowrap;
}
#pubCertificate .website {
- margin-top: 62px;
+ margin-top: 50px;
margin-left: 27%;
color: #000;
font-family: 'SimHei', sans-serif;
+
}
#pubCertificate .codeBox {
@@ -520,8 +526,6 @@
clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%);
margin: 0 auto;
overflow: hidden;
-
-
}
#textCertificate .img {
@@ -530,52 +534,52 @@
}
#textCertificate .userName {
- height: 74rpx;
- font-size: 70rpx;
+ height: 38px;
+ font-size: 38px;
padding-top: 26px;
text-align: center;
font-family: 'FZXBSJW';
}
#textCertificate .bookName {
- padding-top: 30px;
- margin-left: 460rpx;
-
- font-size: 20px;
+ padding-top: 34px;
+ margin-left: 230px;
+ width: 300px;
+ height: 59px;
+ font-size: 18px;
color: #000;
font-family: 'FZXBSJW';
}
#textCertificate .author {
- margin-top: 84rpx;
+ height: 26px;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .classHours {
- margin-top: 20rpx;
+ height: 30px;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .affiliatedUnit {
- margin-top: 26rpx;
+ height: 26px;
margin-left: 33%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .studyTime {
- margin-top: 22rpx;
margin-left: 33%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .website {
- margin-top: 40rpx;
+ margin-top: 20px;
margin-left: 27%;
color: #000;
font-family: 'SimHei', sans-serif;
@@ -587,9 +591,9 @@
}
#textCertificate .updateDate {
- margin-top: 30px;
+ margin-top: 60rpx;
text-align: center;
- font-size: 12px;
+ font-size: 24rpx;
color: #000;
}
diff --git a/pages/digitalCourses/index.js b/pages/digitalCourses/index.js
index b09fa0b..36d80f4 100644
--- a/pages/digitalCourses/index.js
+++ b/pages/digitalCourses/index.js
@@ -236,7 +236,6 @@
app.MG.store.getProductList(obj).then((res) => {
if (!res.datas.length) {
return this.setData({
- courseList: [],
noData: true,
contentLoading: false
})
@@ -310,7 +309,7 @@
)
) {
wx.showToast({
- title: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞绌�",
+ title: "璇ヨ绋嬪凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
icon: 'none',
duration: 1000
})
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index 0215786..d2eb58f 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -414,7 +414,7 @@
Toast({
context: this,
selector: "#t-toast",
- message: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞",
+ message: "璇ユ暀鏉愬凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
theme: "warning",
direction: "column",
});
diff --git a/pages/home/home.js b/pages/home/home.js
index f85bf4e..953b47e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -45,8 +45,11 @@
this.setData({
searchVal: "",
});
- console.log(this.data.searchVal)
this.loadHomePage();
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (token) {
+ this.getShoppingCartList()
+ }
},
onLoad() {
@@ -72,11 +75,8 @@
this.init();
}
})
- } else {
- this.init();
- this.registe()
}
-
+ this.init();
},
onReachBottom() {},
onPullDownRefresh() {
@@ -453,7 +453,6 @@
// duration: 1000
// })
const item = e.currentTarget.dataset.book
- console.log(item);
// 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
let urlData = ''
const flags = item.jsek_link.indexOf("?")
@@ -539,7 +538,7 @@
)
) {
wx.showToast({
- title: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞绌�",
+ title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
icon: 'none',
duration: 1000
})
diff --git a/pages/personalCenter/certificate/index.wxss b/pages/personalCenter/certificate/index.wxss
index 0a1bb96..419e0cb 100644
--- a/pages/personalCenter/certificate/index.wxss
+++ b/pages/personalCenter/certificate/index.wxss
@@ -215,14 +215,16 @@
#textCertificate .bookName {
padding-top: 30px;
margin-left: 460rpx;
+ width: 300px;
+ height: 60px;
font-size: 20px;
color: #000;
font-family: 'FZXBSJW';
}
#textCertificate .author {
- font-size: 28rpx;
- margin-top: 84rpx;
+ height: 26px;
+ font-size: 14px;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
@@ -237,16 +239,16 @@
}
#textCertificate .classHours {
+ height: 30px;
font-size: 28rpx;
- margin-top: 20rpx;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .affiliatedUnit {
+ height: 24px;
font-size: 28rpx;
- margin-top: 24rpx;
margin-left: 33%;
color: #000;
font-family: 'SimHei', sans-serif;
@@ -262,7 +264,6 @@
#textCertificate .studyTime {
font-size: 28rpx;
- margin-top: 23rpx;
margin-left: 33%;
color: #000;
font-family: 'SimHei', sans-serif;
@@ -270,7 +271,7 @@
#textCertificate .website {
font-size: 28rpx;
- margin-top: 40rpx;
+ margin-top: 21px;
margin-left: 27%;
color: #000;
font-family: 'SimHei', sans-serif;
@@ -283,7 +284,7 @@
}
#textCertificate .updateDate {
- margin-top: 80rpx;
+ margin-top: 25px;
text-align: center;
font-size: 12px;
color: #000;
diff --git a/pages/specialDiscussion/index.js b/pages/specialDiscussion/index.js
index c46036b..d7fa91d 100644
--- a/pages/specialDiscussion/index.js
+++ b/pages/specialDiscussion/index.js
@@ -183,10 +183,16 @@
},
onLink(e) {
const item = e.currentTarget.dataset.item
- console.log(item.jsek_link);
+ // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+ let urlData = ''
+ const flags = item.jsek_link.indexOf("?")
+ if (flags > -1) {
+ urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
+ }
+ let url = '/packageBookService/pages/bookServices/linkPage/index'
wx.navigateTo({
- url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
- });
+ url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
+ })
},
async getCourseTypeListList() {
const quer = {
--
Gitblit v1.9.1