From ce3a08b28c16f5cce2185167f8a9030ee16898ed Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 07 九月 2024 14:44:55 +0800
Subject: [PATCH] xiugai
---
pages/digitalCourses/digitalCoursesDetails/index.js | 14 ++
pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxml | 14 +-
pages/digitalCourses/digitalCoursesDetails/components/tree/index.js | 18 +++
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 2
packageDomain/pages/resourceDetails/myVideo/index.js | 4
packageDomain/pages/resourceDetails/myAudio/index.js | 3
pages/specialDiscussion/webView/index.wxml | 5
pages/bookExhibitionDetails/index.js | 50 ++++------
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss | 5
packageBookService/pages/components/webView/index.js | 2
pages/specialDiscussion/webView/index.wxss | 15 ++
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml | 24 ++--
pages/digitalCourses/digitalCoursesDetails/components/testTree/index.js | 18 +++
pages/digitalCourses/digitalCoursesDetails/index.wxss | 20 ++-
packageDomain/pages/resourceDetails/document/index.js | 2
pages/digitalCourses/digitalCoursesDetails/index.wxml | 22 +---
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 8 +
pages/bookExhibitionDetails/index.wxml | 8
pages/bookExhibitionDetails/index.wxss | 8 +
19 files changed, 148 insertions(+), 94 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index 51c1ff3..9c11555 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -10,7 +10,7 @@
<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> -->
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
index fd1827e..d10a2b0 100644
--- a/packageBookService/pages/components/webView/index.js
+++ b/packageBookService/pages/components/webView/index.js
@@ -51,6 +51,8 @@
this.getProgress(options)
}
})
+ } else {
+ this.getProgress(options)
}
},
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index b8950fb..84a9d8e 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -76,6 +76,8 @@
this.resourceDetailsData()
}
})
+ } else {
+ this.resourceDetailsData()
}
},
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index 90dc3f7..d87cef4 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -118,6 +118,9 @@
this.getNoteList()
}
})
+ } else {
+ this.resourceDetailsData()
+ this.getNoteList()
}
},
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 5a5d299..94d8d8d 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -99,9 +99,9 @@
this.resourceDetailsData()
}
})
+ } else {
+ this.resourceDetailsData()
}
-
-
},
/**
diff --git a/pages/bookExhibitionDetails/index.js b/pages/bookExhibitionDetails/index.js
index 8a752fa..a8e7b80 100644
--- a/pages/bookExhibitionDetails/index.js
+++ b/pages/bookExhibitionDetails/index.js
@@ -1,5 +1,8 @@
// pages/bookExhibitionDetails/index.js
const app = getApp()
+import {
+ loginInfo
+} from '../../assets/js/login';
Page({
/**
@@ -27,8 +30,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -36,20 +37,26 @@
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
})
- console.log();
-
-
this.setData({
bookName: options.bookName,
subtitleName: options.subtitleName,
passId: options.id
})
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.bookExhibitionGet(this.data.passId)
+ this.getBookExhibitionDetails()
+ } else {
+ this.bookExhibitionGet(this.data.passId)
+ this.getBookExhibitionDetails()
+ }
+ })
- const passId = options.id
-
- this.bookExhibitionGet(passId)
+ }
+ this.bookExhibitionGet(this.data.passId)
this.getBookExhibitionDetails()
-
wx.setNavigationBarTitle({
title: this.data.subtitleName
});
@@ -109,10 +116,6 @@
loading: true,
hidden: true,
})
- wx.showLoading({
- title: '鍔犺浇涓�...',
- })
- console.log(passId, 8988989);
app.MG.store.getProductDetail({
storeInfo: 'jsek_bookFair', //鍟嗗搧搴�
path: '*', //璺緞
@@ -132,18 +135,15 @@
bookBeginDate: res.datas.beginDate,
bookCreator: res.datas.datas.Creator.Name,
bookContent: res.datas.content,
- bookImage: res.datas.icon
- });
- wx.hideLoading()
- this.setData({
+ bookImage: res.datas.icon,
loading: false,
hidden: false,
- })
+ });
+ console.log(this.data.loading, 123)
})
},
//涔﹀睍璇︽儏鎺ュ彛
getBookExhibitionDetails() {
-
app.MG.store.getProductList({
path: '*',
storeInfo: 'jsek_bookFair',
@@ -161,15 +161,9 @@
Creator: []
}
}).then(res => {
-
this.setData({
bookExhibitionList: res.datas,
- totalSize: res.total
- })
-
- this.setData({
- loading: false,
- hidden: false,
+ totalSize: res.total,
})
})
},
@@ -185,10 +179,7 @@
},
// 瑙﹀簳鍑芥暟
onReachBottom() {
- console.log(this.data.bookExhibitionList.length);
- console.log(this.data.totalSize);
if (this.data.bookExhibitionList.length < this.data.totalSize) {
- console.log(11111);
this.setData({
isMore: true,
start: this.data.start + 1
@@ -202,7 +193,6 @@
this.setData({
isMore: false
})
- console.log('300');
}, 300)
}
},
diff --git a/pages/bookExhibitionDetails/index.wxml b/pages/bookExhibitionDetails/index.wxml
index 0a8231c..ec3a5f7 100644
--- a/pages/bookExhibitionDetails/index.wxml
+++ b/pages/bookExhibitionDetails/index.wxml
@@ -1,9 +1,9 @@
<!--pages/bookExhibitionDetails/index.wxml-->
<import src="index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
+<template is="skeleton" wx:if="{{loading && hidden}}" />
-<view hidden="{{hidden}}" class="centerBox">
+<view hidden="{{!hidden && !loading}}" class="centerBox">
<!-- <view class="tltiBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
@@ -49,11 +49,11 @@
<view class="booksTextBox"> <text>{{item.name}}</text></view>
<view class="boosAuthor">{{item.author}}</view>
</view>
- <view wx:if="{{bookExhibitionList.length > 0}}" class="bottom-box">
+ </view>
+ <view wx:if="{{bookExhibitionList.length > 0}}" class="bottom-box">
<t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
- </view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/bookExhibitionDetails/index.wxss b/pages/bookExhibitionDetails/index.wxss
index 785fb8c..d84885e 100644
--- a/pages/bookExhibitionDetails/index.wxss
+++ b/pages/bookExhibitionDetails/index.wxss
@@ -7,6 +7,7 @@
display: flex;
align-items: center;
width: 100%;
+ height: 100vh;
}
.navbar-title {
@@ -140,10 +141,15 @@
}
.outsideHeadBox {
-
margin-top: 20rpx;
+ margin-bottom: env(safe-area-inset-bottom);
+
}
.bottom-box {
+ height: 100rpx;
+ text-align: center;
margin: 0 auto;
+ padding: 20rpx;
+ color: #949494;
}
\ No newline at end of file
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.js b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.js
index c2bd620..dbc1439 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.js
@@ -17,12 +17,21 @@
type: Array,
value: [],
},
+ isBuy: {
+ type: Boolean,
+ value: false,
+ },
},
- data: {},
+ data: {
+ isBuy: false,
+ },
ready() {},
onLoad() {
console.log(this.properties.openIds, "1111")
+ this.setData({
+ isBuy: this.properties.isBuy
+ });
},
methods: {
@@ -38,6 +47,7 @@
console.log(e, 666)
const value = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
+ const isTry = e.currentTarget.dataset.istry;
const token = wx.getStorageSync("jsek-token");
if (!token) {
return wx.getUserProfile({
@@ -47,6 +57,12 @@
},
});
}
+ if (!isTry && !this.data.isBuy) {
+ return wx.showToast({
+ icon: 'error',
+ title: '璇峰厛璐拱璇ヨ绋�',
+ })
+ }
// 鑾峰彇绔犺妭涓嬫槸鍚︽湁棰樼洰
let idPathList = [];
let query = {
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxml b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxml
index a658307..b519977 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/components/testTree/index.wxml
@@ -3,8 +3,8 @@
<view wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" wx:if="{{!item.children }}">
<view class="listItems" wx:if="{{!item.children}}">
<view class="itemsInfo" data-item="{{item}}" data-index="{{index}}">
- <view class="contentBox" bind:tap="goTest" data-item="{{item}}" data-parent="{{''}}">
- <view class="box-image fl-cn" style="width: 80%">
+ <view class="contentBox" >
+ <view class="box-image fl-cn" style="width: 80%" bind:tap="goTest" data-item="{{item}}" data-parent="{{''}}">
<!-- 娴嬭瘯棰� -->
<view class="teach-icon fl-cn">
<image src="/static/images/bookService/detail/test-icon.png" mode="" />
@@ -12,7 +12,7 @@
<!-- 鍚嶇О -->
<text class="name" style="width: 100%">{{item.name || '-'}}</text>
</view>
- <view>
+ <view wx:if="{{!isBuy && item.istry ? true : false}}" bind:tap="goTest" data-item="{{item}}" data-parent="{{''}}" data-isTry="{{true}}">
<image src="/static/images/bookService/detail/lianxi-icon.png" class="testSee"></image>
</view>
</view>
@@ -32,8 +32,8 @@
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
<view class="listItems" wx:if="{{!citem.children}}">
<view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}">
- <view class="contentBox" bind:tap="goTest" data-item="{{citem}}" data-parent="{{item}}">
- <view class="box-image fl-cn">
+ <view class="contentBox" >
+ <view class="box-image fl-cn" bind:tap="goTest" data-item="{{citem}}" data-parent="{{item}}">
<!-- 浜戞祴璇曞浘鏍� -->
<view class="teach-icon fl-cn">
<image src="/static/images/bookService/detail/test-icon.png" mode="" />
@@ -41,14 +41,14 @@
<!-- 鍚嶇О -->
<text class="name">{{citem.name || '-'}}</text>
</view>
- <view>
+ <view wx:if="{{!isBuy && citem.istry ? true : false}}" bind:tap="goTest" data-item="{{citem}}" data-parent="{{item}}" data-isTry="{{true}}">
<image src="/static/images/bookService/detail/lianxi-icon.png" class="testSee"></image>
</view>
</view>
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree wx:if="{{ citem.children }}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" tab="{{tab}}" openIds="{{openIds}}"></tree>
+ <tree wx:if="{{ citem.children }}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" tab="{{tab}}" openIds="{{openIds}}" isBuy="{{isBuy}}"></tree>
</view>
</t-collapse-panel>
</t-collapse>
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
index 17d9074..eb23e7c 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
@@ -17,6 +17,10 @@
type: Array,
value: [],
},
+ isBuy: {
+ type: Boolean,
+ value: false,
+ },
},
data: {
sonPurchaseSaleMethodId: "",
@@ -28,13 +32,15 @@
shoppingCart: true,
stop: false,
cart: true,
- canExecute: true
+ canExecute: true,
+ isBuy: false,
},
ready() {},
onLoad() {
this.setData({
sonPurchaseSaleMethodId: [],
+ isBuy: this.properties.isBuy
});
},
methods: {
@@ -57,17 +63,23 @@
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
// 妫�鏌ョ櫥褰曠姸鎬�
- console.log(123)
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
+
const item = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
- console.log('item', item);
+ const isTry = e.currentTarget.dataset.istry;
const parentProductLinkPath = parent ?
parent.productLinkPath :
wx.getStorageSync("teachResourcesPath");
const parentName = parent ? parent.name : "鏁欏璧勬簮";
let url;
+ if (!isTry && !this.data.isBuy) {
+ return wx.showToast({
+ icon: 'error',
+ title: '璇峰厛璐拱璇ヨ绋�',
+ })
+ }
if (item.selectType == 'zip') {
if (this.properties.applyState == 'Normal') {
return wx.showToast({
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
index ad705a6..a584495 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
@@ -2,10 +2,10 @@
<t-collapse default-value="{{openIds}}" catchchange="handleChange">
<view wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" wx:if="{{item.sysType== 'CmsItem' }}">
<view class="listItems" wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}">
- <view class="itemsInfo" data-item="{{item}}" data-index="{{index}}">
- <view class="contentBox" bind:tap="goPlayer" data-item="{{item}}" data-parent="{{''}}">
+ <view class="itemsInfo">
+ <view class="contentBox" >
<!-- 浜戝涔� 鍥炬爣 -->
- <view class="box-image fl-cn" style="width: 80%">
+ <view class="box-image fl-cn" style="width: 80%" bind:tap="goPlayer" data-item="{{item}}" data-parent="{{''}}">
<view class="teach-icon fl-cn">
<image wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
<image wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
@@ -16,9 +16,9 @@
<text class="name" style="width: 100%">{{item.name || '-'}}</text>
<text>{{item.progress ? item.progress : 0}}%</text>
</view>
- <view>
+ <view class="seeBox" wx:if="{{!isBuy && citem.freeFile ? true : false}}" bind:tap="goPlayer" data-item="{{citem}}" data-parent="" data-isTry="{{true}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
- <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"></image>
+ <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!isBuy && item.freeFile ? true : false}}"></image>
</view>
</view>
</view>
@@ -36,10 +36,10 @@
<view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
<view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}">
- <view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}">
- <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
+ <view class="itemsInfo">
+ <view class="contentBox" >
<!-- 浜戝涔� 鍥炬爣 -->
- <view class="box-image fl-cn">
+ <view class="box-image fl-cn" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
<view class="teach-icon fl-cn">
<image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
<image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
@@ -47,18 +47,18 @@
<image wx:else src="/static/images/bookService/detail/word.png" mode="" />
</view>
<!-- 鍚嶇О -->
- <text class="name" style="width:440rpx">{{citem.name || '-'}}</text>
+ <text class="name" style="width:410rpx">{{citem.name || '-'}}</text>
<text>{{citem.progress ? citem.progress : 0}}%</text>
</view>
- <view>
+ <view class="seeBox" wx:if="{{!isBuy && citem.freeFile ? true : false}}" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}" data-isTry="{{true}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
- <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image>
+ <image src="/static/images/bookService/detail/shikan.png" class="testSee" ></image>
</view>
</view>
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree wx:if="{{ citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" learnList="{{learnList}}" itemId="{{itemId}}" openIds="{{openIds}}"></tree>
+ <tree wx:if="{{ citem.sysType == 'CmsFolder' }}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" learnList="{{learnList}}" itemId="{{itemId}}" openIds="{{openIds}}" isBuy="{{isBuy}}"></tree>
</view>
<!-- 鏆傛棤鏁版嵁 -->
<view wx:if="{{!item.children || !item.children.length}}" class="noData">
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
index fd8e1e5..e928231 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxss
@@ -42,7 +42,7 @@
}
.contentBox {
- margin: 0 26rpx;
+ margin: 0;
padding: 0 20rpx;
height: 88rpx;
background-color: #fff6f0;
@@ -91,7 +91,7 @@
height: 38rpx;
}
-.testSee,
+
.shopCar {
margin-right: 20rpx;
}
@@ -109,6 +109,7 @@
padding: var(--td-collapse-content-padding, 0rpx) !important;
} */
+.seeBox,
.fl-cn {
display: flex;
align-items: center;
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index 670801c..b9528d1 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -94,6 +94,7 @@
fullName: '', //鍚嶇О
userPicture: '' //鐢宠璇佷功鐢ㄦ埛鍥剧墖
},
+ userName: '',
pictureMd5: '',
publishingUnit: '',
pubCertificateHide: true,
@@ -154,17 +155,25 @@
*/
onLoad(options) {
this.setData({
- bookId: options.id
+ bookId: options.id,
+ userName: wx.getStorageSync(app.config.tokenKey)
})
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
loginInfo(app, (data) => {
- if (data) {} else {}
+ if (data) {
+ this.digitalCoursesDetailsGet(options.id)
+ this.getPlayerList()
+ this.getType()
+ } else {}
})
}
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
+ this.setData({
+ userName: JSON.parse(wx.getStorageSync(app.config.userInfoKey)).name
+ })
},
/**
@@ -512,6 +521,7 @@
i.children = []
this.getTreeList(rootList, pathLength + addNum, i.children, i.productLinkPath, addNum)
if (i.children.length == 0) {
+ newArr[0].istry = true
delete i.children
}
}
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 53d4817..ed1bb6b 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -214,9 +214,9 @@
<view class="codeBox"></view>
</view>
</view>
- <canvas canvas-id="myCanvas1" style="height:845px;width:595px" wx:if="{{pubCertificateHide}}"></canvas>
- <view id="textCertificate" class="my_canvas" 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" />
+ <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">
@@ -228,7 +228,6 @@
<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="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.isbn}}"> {{ digitalsData.isbn || '-'}}</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>
@@ -278,12 +277,7 @@
</view>
</view>
<view wx:if="{{learnList.length > 0}}">
- <tree
- id="test-tree"
- openIds="{{openTeachids}}"
- bookInfo="{{digitalsData}}"
- treeList="{{learnList}}"
- >
+ <tree id="test-tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" treeList="{{learnList}}" isBuy="{{isBuy}}">
</tree>
</view>
<view wx:if="{{learnList.length == 0}}" class="noData">
@@ -324,13 +318,7 @@
</t-button>
</view>
</view>
- <testTree
- id="tree"
- openIds="{{openTeachids}}"
- bookInfo="{{digitalsData}}"
- tab="{{tab}}"
- treeList="{{testList}}"
- ></testTree>
+ <testTree id="tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" tab="{{tab}}" treeList="{{testList}}" isBuy="{{isBuy}}"></testTree>
<view wx:if="{{testList.length == 0}}" class="noData">
<empty />
</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss
index 208d751..13f661c 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxss
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss
@@ -425,11 +425,12 @@
text-align: center;
}
+
#pubCertificate {
width: 595px;
height: 845px;
position: relative;
- /* background-image: url('https://jsek.bnuic.com/home/certificate/szkc.jpg'); */
+ background-image: url('https://jsek.bnuic.com/home/certificate/szkc.jpg');
}
#pubCertificate .bgImg {
@@ -485,6 +486,7 @@
width: 595px;
height: 845px;
position: relative;
+ background-image: url('https://jsek.bnuic.com/home/certificate/kczs.jpg');
}
#textCertificate .userIcon {
@@ -510,8 +512,8 @@
}
#textCertificate .userName {
- height: 120rpx;
- font-size: 38px;
+ height: 74rpx;
+ font-size: 70rpx;
padding-top: 26px;
text-align: center;
font-family: 'FZXBSJW';
@@ -519,7 +521,7 @@
#textCertificate .bookName {
padding-top: 30px;
- margin-left: 215px;
+ margin-left: 460rpx;
font-size: 20px;
color: #000;
@@ -527,35 +529,35 @@
}
#textCertificate .author {
- margin-top: 43px;
+ margin-top: 84rpx;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .classHours {
- margin-top: 12px;
+ margin-top: 20rpx;
margin-left: 52%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .affiliatedUnit {
- margin-top: 13px;
+ margin-top: 24rpx;
margin-left: 40%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .studyTime {
- margin-top: 13px;
+ margin-top: 24rpx;
margin-left: 33%;
color: #000;
font-family: 'SimHei', sans-serif;
}
#textCertificate .website {
- margin-top: 22px;
+ margin-top: 40rpx;
margin-left: 27%;
color: #000;
font-family: 'SimHei', sans-serif;
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index d787b87..acd91b7 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -92,7 +92,13 @@
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
loginInfo(app, (data) => {
- if (data) {} else {}
+ if (data) {
+ this.digitalTextbooksDetailsGet(this.data.digitalTextId)
+ this.getType()
+ this.getCertificateList()
+ } else {
+
+ }
})
}
this.digitalTextbooksDetailsGet(this.data.digitalTextId)
diff --git a/pages/specialDiscussion/webView/index.wxml b/pages/specialDiscussion/webView/index.wxml
index 1c9a973..0b03cca 100644
--- a/pages/specialDiscussion/webView/index.wxml
+++ b/pages/specialDiscussion/webView/index.wxml
@@ -1 +1,4 @@
-<web-view src="{{link}}"></web-view>
\ No newline at end of file
+<!-- <web-view src="{{link}}"></web-view> -->
+
+<view class="tips">璇峰鍒堕摼鎺ュ湪娴忚鍣ㄨ闂�</view>
+<view class="url">{{link}}</view>
\ No newline at end of file
diff --git a/pages/specialDiscussion/webView/index.wxss b/pages/specialDiscussion/webView/index.wxss
index 74240e5..f53988f 100644
--- a/pages/specialDiscussion/webView/index.wxss
+++ b/pages/specialDiscussion/webView/index.wxss
@@ -1 +1,14 @@
-/* pages/specialDiscussion/webView/index.wxss */
\ No newline at end of file
+/* pages/specialDiscussion/webView/index.wxss */
+.tips {
+ font-size: 40rpx;
+ font-weight: bold;
+ margin: 60rpx 40rpx;
+ text-align: center;
+}
+
+.url {
+ margin: 40rpx;
+ font-weight: bold;
+ text-align: center;
+ word-wrap: break-word;
+}
\ No newline at end of file
--
Gitblit v1.9.1