From bbba5d26e9e26c910ed337dcb65f462752ee6dce Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 12 九月 2024 09:11:47 +0800
Subject: [PATCH] fenxiang
---
pages/home/home.js | 6
packageBookService/pages/bookServices/detail/buyResource/index.js | 1
pages/home/digitalRead/index.js | 5
pages/bookExhibitionList/index.js | 2
pages/bookExhibitionDetails/index.js | 5
pages/bookServices/assort/index.js | 2
packageBookService/pages/components/webView/index.js | 5
pages/digitalTextbooks/index.js | 1
pages/digitalCourses/digitalCoursesDetails/index.wxss | 2
pages/personalCenter/certificate/index.wxss | 162 ++++++++++++++++++++++
packageBookService/pages/bookServices/examination/examination.js | 1
pages/personalCenter/certificate/index.wxml | 34 ++++
packageBookService/pages/bookServices/list/index.js | 1
packageDomain/pages/sampleBookList/index.js | 5
packageBookService/pages/bookServices/detail/index.js | 1
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 14 +
pages/personalCenter/index.js | 10 +
pages/retrievalPage/index.js | 5
packageBookService/pages/bookServices/linkPage/index.js | 5
packageBookService/pages/bookServices/webpage/index.js | 5
pages/digitalCourses/digitalCoursesDetails/index.js | 46 +++--
pages/personalCenter/certificate/index.js | 64 ++++++++
packageDomain/pages/resourceDetails/myVideo/index.js | 5
packageDomain/pages/resourceDetails/myAudio/index.js | 5
pages/digitalCourses/index.wxss | 2
packageDomain/pages/resourceDetails/document/index.js | 5
pages/specialDiscussion/index.js | 5
pages/specialDiscussion/webView/index.js | 9
pages/bibliographyList/index.js | 5
29 files changed, 340 insertions(+), 78 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index 62d3e99..dfee441 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -77,6 +77,7 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
+ onShareTimeline() {},
changeCheckAll(e) {
this.setData({
checkAllState: e.detail.value,
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 7dc1abf..3cd8b44 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -318,6 +318,7 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
+ onShareTimeline() {},
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) {
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index b75af1a..ae2e375 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -203,6 +203,7 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
+ onShareTimeline() {},
// 鐩戝惉watch
watch(context, variableName, callback) {
diff --git a/packageBookService/pages/bookServices/linkPage/index.js b/packageBookService/pages/bookServices/linkPage/index.js
index 138f131..279af9f 100644
--- a/packageBookService/pages/bookServices/linkPage/index.js
+++ b/packageBookService/pages/bookServices/linkPage/index.js
@@ -78,9 +78,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
copyPath() {
wx.setClipboardData({
data: this.data.path,
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index f5a8654..1c76ef9 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -200,6 +200,7 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
+ onShareTimeline() {},
goBack() {
wx.navigateBack();
},
diff --git a/packageBookService/pages/bookServices/webpage/index.js b/packageBookService/pages/bookServices/webpage/index.js
index eb6ec08..9760f54 100644
--- a/packageBookService/pages/bookServices/webpage/index.js
+++ b/packageBookService/pages/bookServices/webpage/index.js
@@ -63,7 +63,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
index d10a2b0..4ea58e4 100644
--- a/packageBookService/pages/components/webView/index.js
+++ b/packageBookService/pages/components/webView/index.js
@@ -256,4 +256,9 @@
onReachBottom() {
},
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 84a9d8e..7247648 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -159,9 +159,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
goBack() {
wx.navigateBack()
},
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 17d20f0..afd12cd 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -222,9 +222,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
onTabsChange(event) {},
onTabsClick(event) {},
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 1549707..2e91b05 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -186,9 +186,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
onTabsChange(event) {
console.log(event, 234)
let tabValue = event.detail.value
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 66fd827..07ef61a 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -953,7 +953,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index e870312..29c8f65 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -128,9 +128,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
diff --git a/pages/bookExhibitionDetails/index.js b/pages/bookExhibitionDetails/index.js
index 11f9121..ba8105a 100644
--- a/pages/bookExhibitionDetails/index.js
+++ b/pages/bookExhibitionDetails/index.js
@@ -108,9 +108,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
bookExhibitionGet(passId) {
this.setData({
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 29e5a9a..a3ce605 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -172,6 +172,8 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
+ onShareTimeline() {},
+
// 鍥剧墖鏁版嵁鐨勬帴鍙�
bookExhibitionGet(newValue) {
this.setData({
diff --git a/pages/bookServices/assort/index.js b/pages/bookServices/assort/index.js
index fd62f84..527c769 100644
--- a/pages/bookServices/assort/index.js
+++ b/pages/bookServices/assort/index.js
@@ -113,7 +113,7 @@
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
onShareAppMessage() {},
-
+ onShareTimeline() {},
// 鑾峰彇渚ц竟鏍忓垪琛�
getAssortList() {
this.setData({
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 8b78e3a..ffd34c1 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -224,9 +224,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
//鑾峰彇瑙嗛瀛︿範
getPlayerList() {
app.MG.identity
@@ -1056,22 +1055,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: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
@@ -1163,6 +1162,10 @@
},
confirmM() {
+ let currentDate = new Date()
+ let year = currentDate.getFullYear()
+ let month = currentDate.getMonth() + 1
+ let today = currentDate.getDate()
if (this.data.userInfo.fullName) {
if (this.data.pictureMd5 == '') {
wx.showToast({
@@ -1180,12 +1183,15 @@
name: this.data.digitalsData.name,
ISBN: this.data.digitalsData.isbn,
affiliatedUnit: this.data.digitalsData.affiliatedUnit,
+ publishingUnit: this.data.publishingUnit,
publicationDate: this.data.digitalsData.publicationDate,
classHours: this.data.digitalsData.classHours,
lecturerList: this.data.lecturerList.length > 0 ?
this.data.lecturerList[0].name : this.data.digitalsData.courseLeader,
+ userName: this.data.userInfo.fullName,
userPicture: this.data.pictureMd5,
- certificate: this.data.rzzsImg
+ studyTime: this.data.digitalsData.beginDate + '-' + year + '-' + month + '-' + today,
+ website: this.data.website
}
data = {
topicIdOrRefCode: 'applyCourseCertificate',
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index 6a78d69..f0a265a 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -499,7 +499,7 @@
width: 595px;
height: 845px;
position: relative;
- background-image: url('https://jsek.bnuic.com/home/certificate/kczs.jpg');
+ /* background-image: url('https://jsek.bnuic.com/home/certificate/kczs.jpg'); */
}
#textCertificate .userIcon {
diff --git a/pages/digitalCourses/index.wxss b/pages/digitalCourses/index.wxss
index bddeedb..d1b5649 100644
--- a/pages/digitalCourses/index.wxss
+++ b/pages/digitalCourses/index.wxss
@@ -211,4 +211,4 @@
/* width: calc(100vw - 60rpx); */
-}
\ No newline at end of file
+}
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index f664efa..0215786 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -200,9 +200,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
digitalTextbooksDetailsGet(digitalId) {
@@ -838,6 +837,10 @@
},
confirmM() {
+ let currentDate = new Date()
+ let year = currentDate.getFullYear()
+ let month = currentDate.getMonth() + 1
+ let day = currentDate.getDate()
if (this.data.userInfo.fullName) {
if (this.data.pictureMd5 == '') {
wx.showToast({
@@ -855,8 +858,11 @@
author: this.data.digitalsData.author,
ISBN: this.data.digitalsData.isbn,
publicationDate: this.data.digitalsData.publicationDate,
+ publicationDate: this.data.digitalsData.publicationDate,
+ userName: this.data.userInfo.fullName,
userPicture: this.data.pictureMd5,
- certificate: this.data.rzzsImg
+ studyTime: this.data.digitalsData.beginDate + '-' + year + '-' + month + '-' + day,
+ website: this.data.website
}
data = {
topicIdOrRefCode: 'applyTextbookCertificate',
diff --git a/pages/digitalTextbooks/index.js b/pages/digitalTextbooks/index.js
index 7b348e6..d5bb7c2 100644
--- a/pages/digitalTextbooks/index.js
+++ b/pages/digitalTextbooks/index.js
@@ -116,6 +116,7 @@
onShareAppMessage() {
},
+ onShareTimeline() {},
//鏂板姞鐨勫嚱鏁�
getCourseTypeListList() {
diff --git a/pages/home/digitalRead/index.js b/pages/home/digitalRead/index.js
index 0d7c5a9..b00ca4c 100644
--- a/pages/home/digitalRead/index.js
+++ b/pages/home/digitalRead/index.js
@@ -76,7 +76,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 3f7f267..9bfbbab 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -686,4 +686,10 @@
},
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {},
+ onShareTimeline() {}
});
\ No newline at end of file
diff --git a/pages/personalCenter/certificate/index.js b/pages/personalCenter/certificate/index.js
index 46d090b..fc8bae3 100644
--- a/pages/personalCenter/certificate/index.js
+++ b/pages/personalCenter/certificate/index.js
@@ -1,4 +1,9 @@
const app = getApp();
+import Wxml2Canvas from 'wxml2canvas';
+import moment from 'moment'
+import {
+ getPublicImage
+} from "../../../assets/js/middleGround/tool.js";
Page({
/**
@@ -34,6 +39,9 @@
closeBtn: false,
deleteBtn: false,
images: [],
+ pubCertificateHide: false,
+ contentData: {},
+ rzzsImg: ''
},
/**
@@ -88,9 +96,10 @@
.then((res) => {
if (res.datas.length > 0) {
res.datas.forEach((item) => {
- item.updateDate = item.updateDate.split('T')[0]
if (item.content) {
item.productList = JSON.parse(item.content)
+ item.productList.updateDate = moment(item.updateDate).format('YYYY骞碝M鏈�')
+ item.productList.userPicture = getPublicImage(item.productList.userPicture, '', '')
}
})
let dataList = res.datas;
@@ -119,18 +128,63 @@
goBookDetails(e) {
let productList = e.currentTarget.dataset.book.productList
this.setData({
- images: productList.certificate ? [productList.certificate] : this.data.active === 0 ? ['/static/images/certificate/kczs.jpg'] : ['/static/images/certificate/jczs.jpg'],
- showIndex: true,
- visible: true,
+ contentData: productList,
+ pubCertificateHide: true,
})
-
+ this.drawImage1()
},
+ drawImage1() {
+ let that = this;
+ let drawMyImage1 = new Wxml2Canvas({
+ width: that.data.imageWidth,
+ height: that.data.imageHeight,
+ element: 'myCanvas1',
+ progress(percent) {},
+ finish(url) {
+ wx.getFileSystemManager().readFile({
+ filePath: url,
+ encoding: 'base64',
+ success: (res) => {
+ let MyImageBase641 = 'data:image/jpg;base64,' + res.data
+ if (MyImageBase641) {
+ that.setData({
+ rzzsImg: MyImageBase641,
+ })
+ }
+ setTimeout(() => {
+ that.setData({
+ pubCertificateHide: false,
+ images: [that.data.rzzsImg],
+ showIndex: true,
+ visible: true,
+ })
+ }, 1000)
+ },
+ })
+ },
+ error(res) {
+ console.log("鐢熸垚鐨勫浘鐗囧け璐�", res)
+ }
+ }, this);
+ let data = {
+ list: [{
+ type: 'wxml',
+ class: '.my_canvas1 .my_draw_canvas1', //.my_draw_canvas姣忎釜瑕佺粯鍒跺厓绱犵殑绫诲悕
+ limit: '.my_canvas1', //my_canvas鏍瑰厓绱犵被鍚�
+ x: 0,
+ y: 0
+ }]
+ }
+ drawMyImage1.draw(data, that);
+ },
+
onClose(e) {
const {
trigger
} = e.detail;
this.setData({
visible: false,
+ images: [],
});
},
/**
diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml
index bb4d8ca..7dc57db 100644
--- a/pages/personalCenter/certificate/index.wxml
+++ b/pages/personalCenter/certificate/index.wxml
@@ -13,9 +13,11 @@
<view class="listBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="icon" data-book="{{item}}" bindtap="goBookDetails">
- <image src="{{item.productList.certificate}}" mode="aspectFit" class="img" wx:if="{{item.productList.certificate}}" />
- <image src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="aspectFit" class="img" wx:if="{{!item.productList.certificate && active == 0}}" />
- <image src="https://jsek.bnuic.com/home/certificate/jczs.jpg" mode="aspectFit" class="img" wx:if="{{!item.productList.certificate && active == 1}}" />
+ <image src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="aspectFit" class="img" wx:if="{{active == 0}}" />
+ <image src="https://jsek.bnuic.com/home/certificate/jczs.jpg" mode="aspectFit" class="img" wx:if="{{active == 1}}" />
+ <view class="currentBtn hover">
+ <text class="{{item.state == 'Normal' ? 'yes' : item.state == 'WaitAudit' ? 'wait' : item.state == 'Reject' ? 'no' : '-' }} ">{{item.state == 'Normal' ? '宸查�氳繃' : item.state == 'WaitAudit' ? '瀹℃牳涓�' : item.state == 'Reject' ? '鏈�氳繃' : '-' }}</text>
+ </view>
</view>
<view class="body-info">
<view class="name">{{item.productList.name}}</view>
@@ -37,4 +39,28 @@
</view>
<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
<t-image-viewer deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:close="onClose"></t-image-viewer>
-</view>
\ No newline at end of file
+</view>
+<canvas canvas-id="myCanvas1" style="height:845px;width:595px" wx:if="{{pubCertificateHide && contentData}}"></canvas>
+ <view id="textCertificate" class="my_canvas1" wx:if="{{pubCertificateHide && contentData}}">
+ <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/kczs.jpg" src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" class="bgImg my_draw_canvas1" wx:if="{{active == 0}}"/>
+ <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/jczs.jpg" src="https://jsek.bnuic.com/home/certificate/jczs.jpg" mode="" class="bgImg my_draw_canvas1" wx:if="{{active == 1}}"/>
+ <view class="certificateInfo my_draw_canvas1">
+ <view class="userIcon my_draw_canvas1">
+ <view class="hexagon my_draw_canvas1">
+ <image src="{{contentData.userPicture}}" class="img my_draw_canvas1" />
+ </view>
+ </view>
+ <view class="userName my_draw_canvas1" data-type="text" data-text="{{contentData.userName}}">{{contentData.userName}}</view>
+ <view class="bookName my_draw_canvas1" data-type="text" data-text="{{contentData.name}}">{{contentData.name}}</view>
+ <view class="textAuthor my_draw_canvas1" data-type="text" data-text="{{contentData.author}}" wx:if="{{active == 1}}">{{contentData.author || '-' }}</view>
+ <view class="author my_draw_canvas1" data-type="text" data-text="{{contentData.courseLeader}}" wx:if="{{active == 0}}">{{contentData.courseLeader || '-' }}</view>
+ <view class="classHours my_draw_canvas1" data-type="text" data-text="{{contentData.classHours}}" wx:if="{{active == 0}}">{{contentData.classHours || '-' }}</view>
+ <view class="{{active == 0 ? 'affiliatedUnit my_draw_canvas1' : 'publishingUnit my_draw_canvas1'}}" data-type="text" data-text="{{contentData.publishingUnit}}">{{contentData.publishingUnit || '-'}}</view>
+ <view class="studyTime my_draw_canvas1" data-type="text" data-text="{{contentData.studyTime}}">{{contentData.studyTime}}</view>
+ <view class="website my_draw_canvas1" data-type="text" data-text="{{contentData.website}}">{{contentData.website}}</view>
+ <view class="codeBox my_draw_canvas1"></view>
+ <view class="updateDate my_draw_canvas1">
+ {{ contentData.updateDate }}
+ </view>
+ </view>
+ </view>
\ No newline at end of file
diff --git a/pages/personalCenter/certificate/index.wxss b/pages/personalCenter/certificate/index.wxss
index d3c33a0..3dd25a6 100644
--- a/pages/personalCenter/certificate/index.wxss
+++ b/pages/personalCenter/certificate/index.wxss
@@ -81,7 +81,7 @@
.listBox {
display: flex;
flex-flow: row wrap;
- padding: 30rpx 0;
+ padding: 30rpx;
}
@@ -90,13 +90,16 @@
margin-bottom: 30rpx;
margin: 0 20rpx;
align-self: stretch;
+ text-align: center;
}
.content-item .icon {
- height: 470rpx;
- width: 100%;
+ height: 400rpx;
+ width: 280rpx;
+ margin: auto;
box-shadow: 0px 0px 20rpx 2px rgba(0, 0, 0, 0.16);
+ position: relative;
}
.content-item .icon .img,
@@ -131,4 +134,157 @@
.body-loading {
padding: 200rpx 0;
text-align: center;
+}
+
+.currentBtn {
+ width: 50px;
+ height: 26px;
+ text-align: center;
+ font-size: 12px;
+ line-height: 24px;
+ position: absolute;
+ left: 1px;
+ bottom: 1px;
+ background-color: rgba(255, 108, 0, 0.1);
+ border-radius: 0px 5px 0px 0px;
+
+}
+
+.yes {
+ color: #1FBC1F
+}
+
+.wait {
+ color: #ff6d00;
+}
+
+.no {
+ color: #ee1818;
+}
+
+#textCertificate {
+ width: 595px;
+ height: 845px;
+ position: relative;
+ /* background-image: url('https://jsek.bnuic.com/home/certificate/kczs.jpg'); */
+}
+
+#textCertificate .certificateInfo {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+}
+
+#textCertificate .userIcon {
+ padding-top: 233px;
+}
+
+#textCertificate .hexagon {
+ width: 103px;
+ height: 117px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%);
+ margin: 0 auto;
+ overflow: hidden;
+
+
+}
+
+#textCertificate .img {
+ width: 103px;
+ height: 117px;
+}
+
+#textCertificate .bgImg {
+ width: 100%;
+ height: 100%;
+}
+
+#textCertificate .userName {
+ height: 74rpx;
+ font-size: 70rpx;
+ padding-top: 26px;
+ text-align: center;
+ font-family: 'FZXBSJW';
+}
+
+#textCertificate .bookName {
+ padding-top: 30px;
+ margin-left: 460rpx;
+ font-size: 20px;
+ color: #000;
+ font-family: 'FZXBSJW';
+}
+
+#textCertificate .author {
+ font-size: 28rpx;
+ margin-top: 84rpx;
+ margin-left: 52%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .textAuthor {
+ font-size: 28rpx;
+ margin-top: 134rpx;
+ margin-left: 52%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .classHours {
+ font-size: 28rpx;
+ margin-top: 20rpx;
+ margin-left: 52%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .affiliatedUnit {
+ font-size: 28rpx;
+ margin-top: 24rpx;
+ margin-left: 40%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .publishingUnit {
+ font-size: 28rpx;
+ margin-top: 24rpx;
+ margin-left: 28%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .studyTime {
+ font-size: 28rpx;
+ margin-top: 23rpx;
+ margin-left: 33%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .website {
+ font-size: 28rpx;
+ margin-top: 40rpx;
+ margin-left: 27%;
+ color: #000;
+ font-family: 'SimHei', sans-serif;
+}
+
+#textCertificate .codeBox {
+ height: 140rpx;
+ margin-top: 34rpx;
+ text-align: center;
+}
+
+#textCertificate .updateDate {
+ margin-top: 80rpx;
+ text-align: center;
+ font-size: 12px;
+ color: #000;
}
\ No newline at end of file
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 45fbc34..6199b78 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -392,7 +392,15 @@
isWhite: data
})
},
-
+ // delectBtn() {
+ // app.MG.ugc
+ // .delTopicMessage({
+ // messageIds: [2986, 1302, 1301, 3074, 1305, 1304]
+ // })
+ // .then((res) => {
+ // console.log('鍒犻櫎鎴愬姛')
+ // })
+ // },
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 231881f..2dd384d 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -178,9 +178,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
goBack() {
wx.navigateBack();
},
diff --git a/pages/specialDiscussion/index.js b/pages/specialDiscussion/index.js
index b357128..c46036b 100644
--- a/pages/specialDiscussion/index.js
+++ b/pages/specialDiscussion/index.js
@@ -88,9 +88,8 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- },
+ onShareAppMessage() {},
+ onShareTimeline() {},
goBack() {
wx.navigateBack();
},
diff --git a/pages/specialDiscussion/webView/index.js b/pages/specialDiscussion/webView/index.js
index 5315a56..0275028 100644
--- a/pages/specialDiscussion/webView/index.js
+++ b/pages/specialDiscussion/webView/index.js
@@ -5,7 +5,7 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
- link:''
+ link: ''
},
/**
@@ -14,7 +14,7 @@
onLoad(options) {
console.log(options);
this.setData({
- link:options.link
+ link: options.link
})
},
@@ -63,7 +63,6 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
- }
+ onShareAppMessage() {},
+ onShareTimeline() {},
})
\ No newline at end of file
--
Gitblit v1.9.1