From ac4e010be3eda5da61d9a3e31748b3395ecfe822 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期日, 08 九月 2024 17:47:51 +0800
Subject: [PATCH] bug
---
packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml | 33 ---
pages/digitalCourses/digitalCoursesDetails/index.js | 83 ++++++++-
pages/digitalCourses/digitalCoursesDetails/index.wxml | 44 +++--
packageDomain/pages/resourceDetails/myVideo/index.wxml | 6
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 206 ++++---------------------
pages/digitalTextbooks/digitalTextbooksDetails/index.wxss | 5
static/images/lecturer.png | 0
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 58 +-----
packageDomain/pages/resourceDetails/myVideo/index.js | 11
packageBookService/pages/bookServices/detail/index.js | 7
10 files changed, 167 insertions(+), 286 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
index 0bb0cd2..b8d8177 100644
--- a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
@@ -1,44 +1,21 @@
<!--pages/bookServices/detail/components/learnResource/learnResource.wxml-->
-<view
- class="learnResource"
- theme="primary"
- style="justify-content: {{!isshowDrawBtn ? 'flex-end' : ''}};"
->
- <t-button
- wx:if="{{isshowDrawBtn}}"
- loading="{{receive}}"
- class="btn"
- theme="primary"
- style="height: 72rpx; font-size: 28rpx"
- t-class="external-class"
- bind:tap="getFreeResource"
- >
+<view class="learnResource" theme="primary" style="justify-content: {{!isshowDrawBtn ? 'flex-end' : ''}};">
+ <t-button wx:if="{{isshowDrawBtn}}" loading="{{receive}}" class="btn" theme="primary" style="height: 72rpx; font-size: 28rpx" t-class="external-class" bind:tap="getFreeResource">
<view slot="content" class="btn-content">
<image src=" /static/images/bookService/detail/yijianlingqu.png" />
<text>棰嗗彇鏌ョ湅</text>
</view>
</t-button>
- <t-button
- loading="{{buy}}"
- class="btn"
- theme="primary"
- bind:tap="goBuyResource"
- style="height: 72rpx; font-size: 28rpx;margin: {{!isshowDrawBtn ? '0 20rpx' : ''}}"
- >
+ <t-button loading="{{buy}}" class="btn" theme="primary" bind:tap="goBuyResource" style="height: 72rpx; font-size: 28rpx;margin: {{!isshowDrawBtn ? '0 20rpx' : ''}}">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/yijiangoumai.png" />
<text>璧勬簮璐拱</text>
</view>
</t-button>
- <t-button
- class="btn"
- theme="primary"
- style="height: 72rpx; font-size: 28rpx; margin: 0 20rpx"
- bind:tap="goLearnTask"
- >
+ <t-button class="btn" theme="primary" style="height: 72rpx; font-size: 28rpx; margin: 0 20rpx" bind:tap="goLearnTask">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/renwudan锛廼con.png" />
<text>瀛︿範浠诲姟鍗�</text>
</view>
</t-button>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index 9c11555..06e1026 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -1,74 +1,38 @@
<view class="teach-btn">
- <t-button
- theme="primary"
- style="width: 120px; height: 36px"
- class="btn"
- bind:tap="uploadBtn"
- >
+ <t-button theme="primary" style="width: 120px; height: 36px" class="btn" bind:tap="uploadBtn">
<view slot="content" class="btn-content">
<t-image src="/static/images/bookService/detail/upload.png"></t-image>
<text>涓婁紶璧勬簮</text>
</view>
</t-button>
-<!-- <t-button theme="primary" style="width: 120px; height: 36px">
+ <!-- <t-button theme="primary" style="width: 120px; height: 36px">
<t-image src="/static/images/bookService/detail/download.png"></t-image>
鎵归噺涓嬭浇
</t-button> -->
</view>
-<view
- class="applyResult {{applyState == 'none' ? 'applyNone' : applyState == 'Normal' ? 'applyPass' : applyState == 'WaitAudit' ? 'applying' :applyState == 'Reject' ? 'applyReject' :'' }}"
->
- <view wx:if="{{applyState == 'WaitAudit'}}"
- >璧勬簮涓嬭浇鐢宠姝ｅ湪瀹℃牳涓紝璇疯�愬績绛夊緟锛�</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'}}">
<view>
- 璧勬簮涓嬭浇鐢宠宸查�氳繃<text wx:if="{{deadline}}"
- >锛屾湁鏁堟棩鏈熸埅鑷筹細{{ deadline }}</text
- ></view
- >
+ 璧勬簮涓嬭浇鐢宠宸查�氳繃<text wx:if="{{deadline}}">锛屾湁鏁堟棩鏈熸埅鑷筹細{{ deadline }}</text></view>
<view style="display: flex; align-items: center; margin-top: 10rpx">
<text>涓嬭浇璧勬簮璇峰埌PC绔含甯堟櫤鏁�</text>
<text bind:tap="copy" class="copy-text">澶嶅埗</text>
</view>
</view>
- <view wx:if="{{applyState == 'Reject'}}"
- >璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�</view
- >
+ <view wx:if="{{applyState == 'Reject'}}">璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�</view>
<view wx:if="{{applyState == 'none'}}">
璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�
</view>
<view class="btn-box">
- <t-button
- wx:if="{{applyState == 'Reject'}}"
- bind:tap="checkCause"
- style="height: 50rpx"
- class="rejectBtn"
- bind:tap="showDialog"
- >鏌ョ湅鍘熷洜</t-button
- >
- <t-button
- wx:if="{{applyState == 'none' || applyState == 'Reject'}}"
- theme="primary"
- bind:tap="applyResource"
- class="applyBtn"
- style="height: 50rpx"
- >鐢宠</t-button
- >
+ <t-button wx:if="{{applyState == 'Reject'}}" bind:tap="checkCause" style="height: 50rpx" class="rejectBtn" bind:tap="showDialog">鏌ョ湅鍘熷洜</t-button>
+ <t-button wx:if="{{applyState == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx">鐢宠</t-button>
</view>
</view>
<!-- 鏈�氳繃鍘熷洜 -->
-<t-dialog
- visible="{{showRejectDialog}}"
- title="鎻愮ず"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeDialog"
- class="notPassed"
->
+<t-dialog visible="{{showRejectDialog}}" title="鎻愮ず" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" class="notPassed">
<view slot="content">
- <text class="cause-title"
- >璧勬簮涓嬭浇鐢宠鏈�氳繃锛岃В鍐抽棶棰樺悗鍙偣鍑烩�滅敵璇封�濇寜閽噸鏂版彁浜ょ敵璇�</text
- >
+ <text class="cause-title">璧勬簮涓嬭浇鐢宠鏈�氳繃锛岃В鍐抽棶棰樺悗鍙偣鍑烩�滅敵璇封�濇寜閽噸鏂版彁浜ょ敵璇�</text>
<view class="cause-content">鍘熷洜:{{ rejectCause || '-'}}</view>
</view>
-</t-dialog>
+</t-dialog>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index e8b3f6f..2006165 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -232,7 +232,12 @@
const checkData = this.data.cmsDatas.find(
(item) => item.refCode == options.tabValue
);
- this.getResourceDataList(checkData)
+ if (this.data.tabValue == "questionBank") {
+ this.getResourceData(checkData)
+ } else {
+ this.getResourceDataList(checkData)
+ }
+
}
},
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 67ed12b..6beb84e 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -48,7 +48,7 @@
videoLoading: false,
progress: 0,
playerList: [],
- videoLoaidng: true
+ videoLoading: true
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -223,7 +223,7 @@
},
resourceDetailsData() {
this.setData({
- videoLoaidng: true,
+ videoLoading: true,
loading: true
})
let query = {
@@ -293,7 +293,7 @@
this.setPlayerList()
const item = e.currentTarget.dataset.item
this.setData({
- videoLoaidng: true,
+ videoLoading: true,
selectedId: e.currentTarget.dataset.index,
activeId: item.id,
// showData: '',
@@ -326,16 +326,19 @@
if (res && res.data == '') {
this.setData({
showDataVod: currentVideo,
+ videoLoading: false,
})
} else {
this.setData({
showDataVod: res,
+ videoLoading: false,
})
}
this.setData({})
} else if (currentVideo) {
this.setData({
showDataVod: currentVideo,
+ videoLoading: false,
})
} else {
return ElMessage.error('鏃犳硶鑾峰彇瑙嗛璧勬簮')
@@ -646,7 +649,7 @@
loadedmetadata(e) {
console.log(1);
this.setData({
- videoLoaidng: false
+ videoLoading: false
})
}
})
\ No newline at end of file
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.wxml b/packageDomain/pages/resourceDetails/myVideo/index.wxml
index 41d0ae0..412c005 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.wxml
+++ b/packageDomain/pages/resourceDetails/myVideo/index.wxml
@@ -10,11 +10,11 @@
<view class="videoBox" wx:if="{{videoChange}}">
<!-- autoplay='false' 鏄惁鑷姩鎾斁 -->
<!-- <video binderror="videoErrorCallback" src="{{showData}}" play-btn-position='center' object-fit='fill' controls enable-play-gesture enable-auto-rotation></video> -->
- <view wx:if="{{videoLoaidng}}" class="video-loading">
- <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{videoLoaidng}}" />
+ <view wx:if="{{videoLoading}}" class="video-loading">
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{videoLoading}}" />
</view>
<!-- <video show-center-play-btn="{{false}}" src="{{showData}}" bindloadedmetadata="loadedmetadata" bindtimeupdate="timeUpdate"></video> -->
- <t-video id="tvd" src="{{showDataVod}}" style="width:100%;" bindvideoloaded="loadedmetadata" bindtimeupdate="timeUpdate" wx:if="{{!videoLoaidng}}">
+ <t-video id="tvd" src="{{showDataVod}}" style="width:100%;" bindvideoloaded="loadedmetadata" bindtimeupdate="timeUpdate" wx:if="{{!videoLoading}}">
</t-video>
</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 594d290..23c4db3 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -174,6 +174,9 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
+ this.setData({
+ userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name,
+ })
},
/**
@@ -878,14 +881,31 @@
},
)
.exec()
+ this.drawImage()
+ query
+ .select('#textCertificate')
+ .fields({
+ // 閫夋嫨闇�瑕佺敓鎴恈anvas鐨勮寖鍥�
+ size: true,
+ node: true,
+ scrollOffset: true,
+ },
+ (data) => {
+ let width = data.width
+ let height = data.height
+ console.log(width, height)
+ that.setData({
+ imageWidth: width,
+ imageHeight: height,
+ })
+ },
+ )
+ .exec()
this.drawImage1()
-
},
- drawImage1() {
+ drawImage() {
let that = this;
let drawMyImage = new Wxml2Canvas({
- // width: 230,
- // height: 325,
width: that.data.imageWidth,
height: that.data.imageHeight,
element: 'myCanvas',
@@ -919,6 +939,43 @@
}]
}
drawMyImage.draw(data, that);
+ },
+ drawImage1() {
+ let that = this;
+ let drawMyImage1 = new Wxml2Canvas({
+ width: that.data.imageWidth,
+ height: that.data.imageHeight,
+ element: 'myCanvas1',
+ progress(percent) {},
+ finish(url) {
+ console.log("鐢熸垚鐨勫浘鐗囧湴鍧�", url)
+ wx.getFileSystemManager().readFile({
+ filePath: url,
+ encoding: 'base64',
+ success: (res) => {
+ let MyImageBase641 = 'data:image/jpg;base64,' + res.data
+ console.log('MyImageBase64', MyImageBase641)
+ that.setData({
+ rzzsImg: MyImageBase641,
+ pubCertificateHide: false,
+ })
+ },
+ })
+ },
+ 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);
},
//鑾峰彇瀛楁
getType() {
@@ -958,14 +1015,14 @@
onCertificate() {
- if (!this.data.isBuy) {
- 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: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
@@ -1196,7 +1253,7 @@
},
onClick2() {
this.setData({
- images: ['https://jsek.bnuic.com/home/certificate/kczs.jpg'],
+ images: [this.data.rzzsImg],
showIndex: true,
visible: true,
})
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index d6f44bf..24cbcf2 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -75,10 +75,11 @@
</view>
<view class="basic"> 涓昏鑰佸笀</view>
</view>
- <view class="course-content">
+ <view class="course-content" wx:if="{{lecturerList.length> 0}}">
<view class="lecturer" wx:for="{{lecturerList}}" wx:key="index" wx:for-item="item">
<view class="lecturerImangBox">
- <image src="{{item.icon}}" mode="aspectFit" />
+ <image src="{{item.icon}}" mode="aspectFit" wx:if="{{item.icon}}" />
+ <image src="/static/images/lecturer.png" mode="aspectFit" wx:else />
</view>
<view class="lecturerInformation">
<view class="lecturerName">
@@ -88,6 +89,9 @@
<view class="lecturerContent">{{item.description}}</view>
</view>
</view>
+ </view>
+ <view wx:if="{{lecturerList.length == 0}}" class="noDataBox">
+ <empty />
</view>
</t-tab-panel>
<t-tab-panel icon="{{ tabValue == '1' ? learnResourceClickIcon : learnResourceIcon}}" label="璇佷功淇℃伅" value="1">
@@ -103,13 +107,13 @@
<image src="{{cbzsImg}}" mode="" />
</view>
<view class="chart" bind:tap="onClick2">
- <image src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" />
+ <image src="{{rzzsImg}}" mode="" />
</view>
</view>
</view>
<canvas canvas-id="myCanvas" style="height: 845px; width: 595px" wx:if="{{pubCertificateHide}}"></canvas>
<view id="pubCertificate" class="my_canvas" wx:if="{{pubCertificateHide}}">
- <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="" class="bgImg" />
+ <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="" class="bgImg my_draw_canvas" />
<view class="certificateInfo my_draw_canvas">
<view class="bookName my_draw_canvas" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view>
<view class="author my_draw_canvas" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view>
@@ -123,24 +127,24 @@
<view class="codeBox"></view>
</view>
</view>
- <canvas canvas-id="myCanvas1" style="height:845px;width:595px"></canvas>
- <view id="textCertificate" class="my_canvas">
- <!-- <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" /> -->
- <view class="certificateInfo my_draw_canvas">
- <view class="userIcon my_draw_canvas">
- <view class="hexagon">
- <image src="{{userPicture}}" class="img" />
+ <canvas canvas-id="myCanvas1" style="height:845px;width:595px" wx:if="{{pubCertificateHide}}"></canvas>
+ <view id="textCertificate" class="my_canvas1" wx:if="{{pubCertificateHide}}">
+ <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" />
+ <view class="certificateInfo my_draw_canvas1">
+ <view class="userIcon my_draw_canvas1">
+ <view class="hexagon my_draw_canvas1">
+ <image src="{{userPicture}}" class="img my_draw_canvas1" />
</view>
</view>
- <view class="userName my_draw_canvas" data-type="text" data-text="{{userName}}">{{userName}}</view>
- <view class="bookName my_draw_canvas" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view>
- <view class="author my_draw_canvas" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view>
- <view class="classHours my_draw_canvas" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours || '-' }}</view>
- <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit || '-'}}</view>
- <view class="studyTime my_draw_canvas" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours}}</view>
- <view class="website my_draw_canvas" data-type="text" data-text="{{website}}">{{website}}</view>
- <view class="codeBox"></view>
- <view class="updateDate" wx-if="{{isCertificate}}">
+ <view class="userName my_draw_canvas1" data-type="text" data-text="{{userName}}">{{userName}}</view>
+ <view class="bookName my_draw_canvas1" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view>
+ <view class="author my_draw_canvas1" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view>
+ <view class="classHours my_draw_canvas1" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours || '-' }}</view>
+ <view class="affiliatedUnit my_draw_canvas1" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit || '-'}}</view>
+ <view class="studyTime my_draw_canvas1" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours}}</view>
+ <view class="website my_draw_canvas1" data-type="text" data-text="{{website}}">{{website}}</view>
+ <view class="codeBox my_draw_canvas1"></view>
+ <view class="updateDate my_draw_canvas1" wx-if="{{isCertificate}}">
{{ moment(isCertificate.updateDate).format('YYYY骞碝M鏈�') }}
</view>
</view>
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index 95b0b7d..05dc058 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -3,17 +3,13 @@
<template is="skeleton" wx:if="{{loading}}" />
<view wx:if="{{!loading}}">
<view class="page-bookService">
- <scroll-view
- scroll-y="{{true}}"
- class="book"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<view class="digital">
<view class="book-box">
<view class="textbookDetails">
<view class="book-img">
<view class="imageBox">
- <image src="{{digitalsData.icon}}" mode="" />
+ <image src="{{digitalsData.icon}}" mode="" class="img" />
</view>
<!-- <view class="setCoolect">
<image src="/static/images/bookService/detail/collect.png" style="width: 50rpx;" bind:tap="setCoolect" wx:if="{{isFavourite}}" />
@@ -29,9 +25,7 @@
</view>
<view class="styleCssBox">
<view style="width: 150rpx"> 缂栬�呭崟浣嶏細 </view>
- <view class="authorBox"
- >{{ digitalsData.editorUnit || '-'}}</view
- >
+ <view class="authorBox">{{ digitalsData.editorUnit || '-'}}</view>
</view>
<view class="styleCssBox">
<view style="width: 150rpx">ISBN锛�</view>
@@ -46,19 +40,13 @@
<view>{{ publishingUnit || '-'}}</view>
</view>
</view>
- <image
- src="/static/images/bookService/detail/square.png"
- class="right-background"
- />
+ <image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
</view>
<view class="certificate">
<view class="proposal" bind:tap="suggestBtn">
<view class="suggestion">
- <image
- src="/static/images/digitalTextbooks/Suggestion@2x.png"
- mode=""
- />
+ <image src="/static/images/digitalTextbooks/Suggestion@2x.png" mode="" class="img" />
</view>
<view class="proposalText">鎴戣寤鸿</view>
</view>
@@ -66,10 +54,7 @@
<view class="information">
<view class="proposal" bind:tap="onCertificate">
<view class="suggestion">
- <image
- src="/static/images/digitalTextbooks/shengshu-t@2x.png"
- mode=""
- />
+ <image src="/static/images/digitalTextbooks/shengshu-t@2x.png" mode="" class="img" />
</view>
<view class="proposalText">璇佷功鐢宠</view>
</view>
@@ -85,25 +70,11 @@
</view>
</view>
<view class="book-resource">
- <t-tabs
- defaultValue="{{tabValue}}"
- bind:change="onTabsChange"
- bind:click="onTabsClick"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
- <t-tab-panel
- icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
- value="brief"
- label="鍩烘湰淇℃伅"
- >
+ <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" label="鍩烘湰淇℃伅">
<view class="rubricBox">
<view class="rubricimgBox">
- <image
- src="/static/images/bookService/detail/label.png"
- mode=""
- />
+ <image src="/static/images/bookService/detail/label.png" mode="" class="img" />
</view>
<view class="basic"> 鍩烘湰淇℃伅</view>
</view>
@@ -114,73 +85,41 @@
<empty />
</view>
</t-tab-panel>
- <t-tab-panel
- icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
- value="jsek_cloudLearning"
- label="璇佷功淇℃伅"
- >
+ <t-tab-panel icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" label="璇佷功淇℃伅">
<view class="rubricBox">
<view class="rubricimgBox">
- <image
- src="/static/images/digitalTextbooks/zhengshu@2x.png"
- mode=""
- />
+ <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="" class="img" />
</view>
<view class="basic"> 璇佷功淇℃伅</view>
</view>
<view class="certificateChart">
<view class="chart" bind:tap="onClick1">
- <image
- src="https://jsek.bnuic.com/home/certificate/szjc.jpg"
- mode=""
- />
+ <image src="https://jsek.bnuic.com/home/certificate/szjc.jpg" mode="" class="img" />
</view>
<view class="chart" bind:tap="onClick2">
- <image
- src="https://jsek.bnuic.com/home/certificate/jczs.jpg"
- mode=""
- />
+ <image src="https://jsek.bnuic.com/home/certificate/jczs.jpg" mode="" class="img" />
</view>
</view>
</t-tab-panel>
- <t-tab-panel
- icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
- value="jsek_teachingResources"
- label="浣滆�呬俊鎭�"
- >
+ <t-tab-panel icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" label="浣滆�呬俊鎭�">
<view class="rubricBox">
<view class="rubricimgBox">
- <image
- src="/static/images/bookService/detail/author.png"
- mode=""
- />
+ <image src="/static/images/bookService/detail/author.png" mode="" class="img" />
</view>
<view class="basic"> 浣滆�呬俊鎭�</view>
</view>
- <view
- class="basic-content"
- wx:if="{{digitalsData.authorIntroduction}}"
- >
- <rich-text
- nodes="{{digitalsData.authorIntroduction}}"
- ></rich-text>
+ <view class="basic-content" wx:if="{{digitalsData.authorIntroduction}}">
+ <rich-text nodes="{{digitalsData.authorIntroduction}}"></rich-text>
</view>
<view class="noDataBox" wx:else>
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
<empty />
</view>
</t-tab-panel>
- <t-tab-panel
- icon="{{tabValue == 'catalogue' ? catalogueClickIcon : catalogue}}"
- value="catalogue"
- label="鐩綍"
- >
+ <t-tab-panel icon="{{tabValue == 'catalogue' ? catalogueClickIcon : catalogue}}" value="catalogue" label="鐩綍">
<view class="rubricBox">
<view class="rubricimgBox">
- <image
- src="/static/images/digitalTextbooks/mulu@3x.png"
- mode=""
- />
+ <image src="/static/images/digitalTextbooks/mulu@3x.png" mode="" class="img" />
</view>
<view class="basic"> 鐩綍</view>
</view>
@@ -192,17 +131,10 @@
<empty />
</view>
</t-tab-panel>
- <t-tab-panel
- icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
- value="questionBank"
- label="鐩稿叧鏁欐潗"
- >
+ <t-tab-panel icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" label="鐩稿叧鏁欐潗">
<view class="rubricBox">
<view class="rubricimgBox">
- <image
- src="/static/images/digitalTextbooks/Link@3x.png"
- mode=""
- />
+ <image src="/static/images/digitalTextbooks/Link@3x.png" mode="" class="img" />
</view>
<view class="basic"> 鐩稿叧鏁欐潗</view>
</view>
@@ -210,22 +142,10 @@
<empty />
</view>
<view class="correlation" wx:else>
- <view
- style="margin-bottom: 30rpx"
- wx:for="{{relatedBookData}}"
- wx:key="index"
- wx:for-item="item"
- wx:for-index="index"
- data-item="{{item}}"
- bind:tap="onCorrelationBook"
- >
+ <view style="margin-bottom: 30rpx" wx:for="{{relatedBookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onCorrelationBook">
<view class="correlationImage">
- <image src="{{item.icon}}" mode="" />
- <img
- wx:if="{{item.icon == ''}}"
- src="/static/images/default-book-img.png"
- alt=""
- />
+ <image src="{{item.icon}}" mode="" class="img" />
+ <img wx:if="{{item.icon == ''}}" src="/static/images/default-book-img.png" alt="" class="img" />
</view>
<view class="correlationName">{{item.name}}</view>
<view class="correlationAuthor">{{digitalsData.author}}</view>
@@ -239,60 +159,27 @@
<view class="box-bottom">
<view class="collection" bind:tap="setCoolect">
<view class="collectionImage">
- <image
- wx:if="{{!digitalsData.isFavourite}}"
- src="/static/images/digitalTextbooks/wodeshoucang@2x.png"
- mode=""
- />
- <image
- wx:else
- src="/static/images/bookService/detail/collecting.png"
- mode=""
- />
+ <image wx:if="{{!digitalsData.isFavourite}}" src="/static/images/digitalTextbooks/wodeshoucang@2x.png" mode="" class="img" />
+ <image wx:else src="/static/images/bookService/detail/collecting.png" mode="" class="img" />
</view>
<view class="btn-text"> 鏀惰棌 </view>
</view>
<view class="trialReading" bind:tap="goRead" wx:if="{{!isBuy}}">
<view class="collectionImage">
- <image src="/static/images/digitalTextbooks/shidu@2x.png"></image>
+ <image src="/static/images/digitalTextbooks/shidu@2x.png" class="img"></image>
</view>
<view class="btn-text">璇曡</view>
</view>
- <view
- class="shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{!isBuy &&digitalsData.price != 0 }}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buyColor"
- bind:tap="buyBtn"
- wx:if="{{!isBuy && digitalsData.price != 0}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="buyColor receive"
- bind:tap="buyBtn"
- wx:if="{{!isBuy && digitalsData.price == 0.00}}"
- >鍏嶈垂棰嗗彇</view
- >
- <view
- class="{{!isBuy ? 'buyColor' :'reading'}}"
- bind:tap="goRead"
- wx:if="{{isBuy}}"
- >
+ <view class="shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy &&digitalsData.price != 0 }}">鍔犲叆璐墿杞�</view>
+ <view class="buyColor" bind:tap="buyBtn" wx:if="{{!isBuy && digitalsData.price != 0}}">绔嬪嵆璐拱</view>
+ <view class="buyColor receive" bind:tap="buyBtn" wx:if="{{!isBuy && digitalsData.price == 0.00}}">鍏嶈垂棰嗗彇</view>
+ <view class="{{!isBuy ? 'buyColor' :'reading'}}" bind:tap="goRead" wx:if="{{isBuy}}">
绔嬪嵆闃呰
</view>
</view>
</view>
</view>
-<suggest
- class="suggest-component"
- id="suggest-component1"
- showIndex="{{showIndex1}}"
- bookIcon="{{digitalsData.icon}}"
- bookName="{{digitalsData.name}}"
-></suggest>
+<!-- <suggest class="suggest-component" id="suggest-component1" showIndex="{{showIndex1}}" bookIcon="{{digitalsData.icon}}" bookName="{{digitalsData.name}}"></suggest> -->
<!-- 寮圭獥 -->
<view wx:if="{{dialogBox}}">
<view class="popup-box" bindtap="closeDialog"></view>
@@ -301,25 +188,15 @@
<view class="row-info">
<view class="body">
<view class="dialog-title">瀛︿範璇佷功鐢宠</view>
- <view
- style="width: 100%; height: 2rpx; background-color: #f4f4f4"
- ></view>
+ <view style="width: 100%; height: 2rpx; background-color: #f4f4f4"></view>
<view class="input-box">
- <t-input
- class="input"
- borderless
- placeholder="璇疯緭鍏ョ湡瀹炲鍚�"
- value="{{userInfo.fullName}}"
- bind:change="onFullNameInput"
- ></t-input>
+ <t-input class="input" borderless placeholder="璇疯緭鍏ョ湡瀹炲鍚�" value="{{userInfo.fullName}}" bind:change="onFullNameInput"></t-input>
</view>
<view class="contentImg">
- <image src="{{userInfo.userPicture}}" mode="aspectFill" />
+ <image src="{{userInfo.userPicture}}" mode="aspectFill" class="img" />
</view>
<view class="buttonBox">
- <t-button size="small" class="right-btn" bind:tap="uploadPicture"
- >涓婁紶鐓х墖</t-button
- >
+ <t-button size="small" class="right-btn" bind:tap="uploadPicture">涓婁紶鐓х墖</t-button>
</view>
</view>
<view class="row-btn">
@@ -330,13 +207,6 @@
</view>
</view>
</view>
-<t-image-viewer
- deleteBtn="{{deleteBtn}}"
- closeBtn="{{closeBtn}}"
- showIndex="{{showIndex}}"
- visible="{{visible}}"
- images="{{images}}"
- bind:close="onClose"
-></t-image-viewer>
+<t-image-viewer deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:close="onClose"></t-image-viewer>
-<t-toast id="t-toast" />
+<t-toast id="t-toast" />
\ No newline at end of file
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
index f2c2bc4..f73b654 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
@@ -2,7 +2,7 @@
@import "./index.skeleton.wxss";
-image {
+.img {
width: 100%;
height: 100%;
}
@@ -492,7 +492,8 @@
border-top: 1rpx solid #f1f1f1;
}
-.row-btn view {
+.row-btn .left-btn,
+.row-btn .right-btn {
flex: 1;
text-align: center;
margin: 20rpx 10%;
diff --git a/static/images/lecturer.png b/static/images/lecturer.png
new file mode 100644
index 0000000..24532bf
--- /dev/null
+++ b/static/images/lecturer.png
Binary files differ
--
Gitblit v1.9.1