From c6c73b7d709322052b9cd6777b3d6657e0d43d30 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期六, 07 九月 2024 14:37:32 +0800
Subject: [PATCH] bug
---
packageBookService/pages/bookServices/list/index.wxml | 117 ++
pages/digitalTextbooks/index.wxml | 72 +
packageBookService/pages/bookServices/list/index.wxss | 10
packageDomain/pages/sampleBookList/index.wxml | 159 ++
packageDomain/pages/sampleBookList/index.wxss | 10
pages/digitalTextbooks/index.wxss | 19
packageBookService/pages/bookServices/detail/index.wxml | 391 +++++++-
packagePersonal/pages/myOrder/index.js | 1
packageBookService/pages/bookServices/examination/questionOptions/index.wxss | 7
pages/digitalTextbooks/index.js | 37
pages/digitalCourses/index.js | 29
pages/digitalCourses/digitalCoursesDetails/index.wxml | 349 ++++++-
packageBookService/pages/bookServices/examination/examination.js | 4
packageBookService/pages/bookServices/detail/components/tree/index.js | 23
pages/digitalTextbooks/digitalTextbooksDetails/index.js | 2
pages/home/home.wxml | 324 +++++-
pages/retrievalPage/index.js | 27
packageBookService/pages/bookServices/linkPage/index.js | 18
packageBookService/pages/bookServices/examination/questionList/index.js | 7
packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml | 33
pages/digitalCourses/digitalCoursesDetails/index.js | 1
packageBookService/pages/bookServices/detail/components/brief/index.wxml | 8
packageBookService/pages/bookServices/detail/components/teachResource/index.wxss | 44
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 65 +
pages/bookExhibitionList/index.wxss | 10
pages/bookExhibitionList/index.wxml | 82 +
pages/retrievalPage/index.wxml | 305 +++++-
pages/retrievalPage/index.wxss | 13
pages/digitalCourses/index.wxml | 77 +
pages/digitalCourses/index.wxss | 17
pages/digitalTextbooks/digitalTextbooksDetails/index.wxml | 224 +++-
pages/digitalTextbooks/digitalTextbooksDetails/index.wxss | 4
static/images/digitalTextbooks/chevron-left.png | 0
pages/bibliographyList/index.wxml | 237 ++++
pages/bibliographyList/index.wxss | 10
35 files changed, 2,236 insertions(+), 500 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/brief/index.wxml b/packageBookService/pages/bookServices/detail/components/brief/index.wxml
index 31dcd38..6150cc6 100644
--- a/packageBookService/pages/bookServices/detail/components/brief/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/brief/index.wxml
@@ -4,11 +4,11 @@
<view>
<image src="/static/images/bookService/detail/label.png" />
</view>
- <view class="title-name">鍩烘湰淇℃伅</view>
+ <view class="title-name">鍐呭绠�浠�</view>
</view>
- <rich-text nodes="{{content}}" style="{{richStyle}}"></rich-text>
+ <rich-text nodes="{{content}}" style="{{richStyle}}"></rich-text>
</view>
- <view class="basic" wx:if="{{content}}">
+ <view class="basic" wx:if="{{catalogue}}">
<view class="basic-title">
<view>
<image src="/static/images/bookService/detail/label.png" />
@@ -26,4 +26,4 @@
</view>
</view>
<rich-text nodes="{{authorIntroduction}}" style="{{richStyle}}" />
-</view>
\ No newline at end of file
+</view>
diff --git a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
index 4fe987f..0bb0cd2 100644
--- a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
@@ -1,21 +1,44 @@
<!--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>
\ No newline at end of file
+</view>
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index c101bbe..51c1ff3 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -1,35 +1,74 @@
<view class="teach-btn">
- <t-button theme="primary" style="width: 120px; height: 36px" class="btn-upload" bind:tap="uploadBtn">
- <t-image src="/static/images/bookService/detail/upload.png" style="margin-top: 20rpx"></t-image>
- <text>涓婁紶璧勬簮</text>
+ <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-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>
+ <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>
\ No newline at end of file
+</t-dialog>
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
index 3e73b54..d7b5ca2 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
@@ -4,23 +4,7 @@
align-items: center;
padding: 0 40rpx;
height: 134rpx;
- --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;
-}
-.btn-content {
- display: flex;
- align-items: center;
-}
-
-.teach-btn image {
- width: 32rpx;
- height: 32rpx;
- margin-right: 6rpx;
- margin-top: 20rpx;
}
.copy-text {
@@ -100,4 +84,32 @@
--td-button-primary-border-color: #ff6c00;
--td-button-primary-active-bg-color: #ff984d;
--td-button-primary-active-border-color: #ff984d;
+}
+
+.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/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 73c2b7a..332d2d4 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -146,7 +146,18 @@
wx.getStorageSync("teachResourcesPath");
const parentName = parent ? parent.name : "鏁欏璧勬簮";
let url;
- if (item.selectType == 'zip') {
+ if (item.selectType == "webpage") {
+ // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+ let urlData = ''
+ const flags = item.jsek_link.indexOf("?")
+ if (flags > -1) {
+ urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
+ }
+ url = '/packageBookService/pages/bookServices/linkPage/index'
+ return wx.navigateTo({
+ url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
+ })
+ } else if (item.selectType == 'zip') {
if (this.properties.applyState == 'Normal') {
return wx.showToast({
icon: 'error',
@@ -263,11 +274,11 @@
// },
// });
// }
- if (item.selectType == "webpage") {
- this.setData({
- webpageSrc: item.jsek_link,
- });
- }
+ // if (item.selectType == "webpage") {
+ // this.setData({
+ // webpageSrc: item.jsek_link,
+ // });
+ // }
}
},
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index a30c730..da17adf 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,7 +4,12 @@
<!-- pageLoading -->
<!--瀵艰埅鍖哄煙 -->
-<suggest-dialog class="suggest-dialog" showIndex="{{showIndex}}" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest-dialog>
+<suggest-dialog
+ class="suggest-dialog"
+ showIndex="{{showIndex}}"
+ bookIcon="{{bookDetail.icon}}"
+ bookName="{{bookDetail.name}}"
+></suggest-dialog>
<!-- <popup showIndex="{{showIndex}}"></popup> -->
<view class="page-bookService" wx:if="{{!pageLoading}}">
<!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
@@ -23,25 +28,45 @@
</view> -->
<t-toast id="t-toast" />
<movable-area class="movable-area">
- <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="book"
+ bindscrolltolower="onReachBottom"
+ >
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail" id="book-detail">
<view class="detail-left">
<view class="book-img">
- <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" />
+ <image
+ loading=""
+ src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFit"
+ aria-label="{{bookDetail.name}}"
+ />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
- <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collect.png"
+ wx:if="{{!bookDetail.isFavourite}}"
+ />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collecting.png"
+ wx:if="{{bookDetail.isFavourite}}"
+ />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image loading="" src="/static/images/bookService/detail/suggest.png" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/suggest.png"
+ />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -66,12 +91,19 @@
<view class="li-title">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx">
+ <view
+ class="message-li"
+ wx:if="{{bookClass.length}}"
+ style="height: 80rpx"
+ >
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookClass}}</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>
<!-- 閿�鍞俊鎭� -->
@@ -80,12 +112,19 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
- <image src="/static/images/bookService/detail/electon-price.png" />
+ <image
+ src="/static/images/bookService/detail/electon-price.png"
+ />
</view>
<view class="price">
- <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view>
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
+ <view class="price-text"
+ >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view
+ >
+ <view
+ class="price-old"
+ wx:if="{{bookDetail.oldPrice != '0.00'}}"
+ >楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -93,27 +132,72 @@
<!-- 绾歌川涔﹀敭浠� -->
<view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
<view>
- <image src="/static/images/bookService/detail/paper-price.png" />
+ <image
+ src="/static/images/bookService/detail/paper-price.png"
+ />
</view>
- <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view>
+ <view class="price"
+ >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view
+ >
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
- <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
- <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
- <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
+ <image
+ src="/static/images/bookService/detail/jd.png"
+ wx:if="{{bookDetail.JDLink}}"
+ bind:tap="goShop"
+ data-link="{{bookDetail.JDLink}}"
+ data-type="jd"
+ />
+ <image
+ class="tmall-image"
+ src="/static/images/bookService/detail/tmall.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.tmallLink}}"
+ wx:if="{{bookDetail.tmallLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/dangdang.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.dangdangLink}}"
+ wx:if="{{bookDetail.dangdangLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/weidian.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.weidianLink}}"
+ wx:if="{{bookDetail.weidianLink}}"
+ />
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
- <t-tab-panel label="鍥句功淇℃伅" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
- <book-brief content="{{bookDetail.content}}" catalogue="{{bookDetail.catalogue}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief>
- <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}" class="noData">
+ <t-tabs
+ value="{{tabValue}}"
+ bind:change="onTabsChange"
+ t-class="custom-tabs"
+ t-class-content="custom-panel"
+ class="tab-class"
+ >
+ <t-tab-panel
+ label="鍥句功淇℃伅"
+ icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
+ value="brief"
+ style="{{tabPanelstyle}}"
+ >
+ <book-brief
+ content="{{bookDetail.content}}"
+ catalogue="{{bookDetail.catalogue}}"
+ authorIntroduction="{{bookDetail.authorIntroduction}}"
+ wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
+ ></book-brief>
+ <view
+ wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}"
+ class="noData"
+ >
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
@@ -125,10 +209,38 @@
style="{{tabPanelstyle}}"
>
</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>
- <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>
+ <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>
+ <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
theme="circular"
@@ -137,34 +249,93 @@
loading="{{loading }}"
/> -->
<view wx:if="{{loading}}" style="width: 100%; height: min-content">
- <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
+ <t-skeleton
+ row-col="{{rowCol}}"
+ theme="paragraph"
+ animation="gradient"
+ loading="{{loading}}"
+ ></t-skeleton>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
- <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戝涔�"
+ icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
+ value="jsek_cloudLearning"
+ style="{{tabPanelstyle}}"
+ >
<view wx:if="{{!loading && learn.length}}">
- <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}" successOrderNumber="{{successOrderNumber}}" isGoBuyResource="{{isGoBuyResource}}"></learn-resource>
+ <learn-resource
+ bind:getFreeResource="getFreeResource"
+ bind:allAddShoppiingCar="allAddShoppiingCar"
+ id="learn-resource"
+ buyResourceData="{{buyResourceData}}"
+ bookId="{{bookDetail.id}}"
+ isshowDrawBtn="{{isshowDrawBtn}}"
+ successOrderNumber="{{successOrderNumber}}"
+ isGoBuyResource="{{isGoBuyResource}}"
+ ></learn-resource>
- <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
+ <tree
+ id="tree"
+ openIds="{{openLearnids}}"
+ bookInfo="{{bookDetail}}"
+ tab="{{tabValue}}"
+ treeList="{{learn}}"
+ buyIds="{{buyIdList}}"
+ openLearnids="{{openLearnids}}"
+ bind:updateShoppingCartHidden="updateShoppingCartHidden"
+ bind:updateCloudLearning="updateCloudLearning"
+ ></tree>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
- <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戞祴璇�"
+ icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
+ value="questionBank"
+ style="{{tabPanelstyle}}"
+ >
<view wx:if="{{!loading}}">
- <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" openIds="{{openLearnids}}" mockData="{{mockData}}" tab="{{tabValue}}" storeInfo="{{options.storeInfo}}" jslx="{{jslx}}" bind:buyMock="buyMock"></test-resource>
+ <test-resource
+ id="test-resource"
+ list="{{test}}"
+ bookInfo="{{bookDetail}}"
+ openIds="{{openLearnids}}"
+ mockData="{{mockData}}"
+ tab="{{tabValue}}"
+ storeInfo="{{options.storeInfo}}"
+ jslx="{{jslx}}"
+ bind:buyMock="buyMock"
+ ></test-resource>
</view>
</t-tab-panel>
- <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戠瑪璁�"
+ icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
+ value="jsek_note"
+ style="{{tabPanelstyle}}"
+ >
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
- <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
- <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
+ <t-tab-panel
+ label="鐩稿叧鍥句功"
+ icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
+ value="related_books"
+ style="{{tabPanelstyle}}"
+ >
+ <related-books
+ relatedBookData="{{relatedBookData}}"
+ relatedBookLoading="{{relatedBookLoading}}"
+ noRelatedBookData="{{noRelatedBookData}}"
+ bind:goBookDetails="goBookDetails"
+ ></related-books>
</t-tab-panel>
</t-tabs>
</view>
@@ -172,41 +343,86 @@
<movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <t-image
+ src="/static/images/home/yangshuForm1.png"
+ mode="heightFix"
+ class="img"
+ />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
</movable-view>
</movable-area>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
+ <suggest
+ class="suggest-component"
+ id="suggest-component"
+ bookIcon="{{bookDetail.icon}}"
+ bookName="{{bookDetail.name}}"
+ ></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
+ <t-dialog
+ class="teachDownloadDialog"
+ visible="{{isShowTeachDownload}}"
+ title="鎻愮ず"
+ content="璇峰墠寰�PC绔笅杞�"
+ confirm-btn="{{ confirmBtn }}"
+ bind:confirm="closeTeachDownload"
+ />
<!-- 璐拱鎸夐挳 -->
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
+ <t-image
+ loading=""
+ src="/static/images/bookService/detail/ebook.png"
+ ></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/paper-book.png"
+ ></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy || applicationState == 'overdue'}}">
+ <view
+ class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
+ bind:tap="goRead"
+ wx:if="{{!bookBuy || applicationState == 'overdue'}}"
+ >
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
</view>
<view class="btn-text">璇曡</view>
</view>
- <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view>
- <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view>
- <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">鍏嶈垂棰嗗彇</view>
- <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy || applicationState == 'Normal'}}">绔嬪嵆鏌ョ湅</view>
+ <view
+ class="shopCar shopCarColor"
+ bind:tap="addBookShopcCar"
+ wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
+ >鍔犲叆璐墿杞�</view
+ >
+ <view
+ class="buy buyColor"
+ bind:tap="buyBtn"
+ wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
+ >绔嬪嵆璐拱</view
+ >
+ <view
+ class="buy receiveColor"
+ bind:tap="buyBtn"
+ wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
+ >鍏嶈垂棰嗗彇</view
+ >
+ <view
+ class="buy read"
+ bind:tap="goRead"
+ wx:if="{{bookBuy || applicationState == 'Normal'}}"
+ >绔嬪嵆鏌ョ湅</view
+ >
</view>
</view>
<view wx:if="{{dialogBox}}">
@@ -216,24 +432,32 @@
<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="from-item">
- <view class="label">
- <text class="icon">*</text>璧勬簮鍚嶇О:
- </view>
+ <view class="label"> <text class="icon">*</text>璧勬簮鍚嶇О: </view>
<view class="item-content">
<view class="inputBox1">
- <t-input placeholder="杈撳叆璧勬簮鍚嶇О" borderless value="{{resourceInfo.resourceName}}" bindchange="onNameInput" />
+ <t-input
+ placeholder="杈撳叆璧勬簮鍚嶇О"
+ borderless
+ value="{{resourceInfo.resourceName}}"
+ bindchange="onNameInput"
+ />
</view>
</view>
</view>
<view class="from-item">
- <view class="label">
- <text class="icon">*</text>璧勬簮绫诲瀷:
- </view>
+ <view class="label"> <text class="icon">*</text>璧勬簮绫诲瀷: </view>
<view class="item-content">
<view class="inputBox1">
- <t-input placeholder="杈撳叆璧勬簮绫诲瀷" borderless value="{{resourceInfo.fileType}}" bindchange="onFileTypeInput" />
+ <t-input
+ placeholder="杈撳叆璧勬簮绫诲瀷"
+ borderless
+ value="{{resourceInfo.fileType}}"
+ bindchange="onFileTypeInput"
+ />
</view>
</view>
</view>
@@ -241,26 +465,51 @@
<view class="label">鏂囦欢鎻忚堪:</view>
<view class="item-content">
<view class="inputBox1">
- <t-textarea placeholder="璇疯緭鍏ユ枃浠舵弿杩�" value="{{resourceInfo.description}}" disableDefaultPadding="{{true}}" autosize="{{true}}" maxlength="300" indicator bind:change="textareaChange" />
+ <t-textarea
+ placeholder="璇疯緭鍏ユ枃浠舵弿杩�"
+ value="{{resourceInfo.description}}"
+ disableDefaultPadding="{{true}}"
+ autosize="{{true}}"
+ maxlength="300"
+ indicator
+ bind:change="textareaChange"
+ />
</view>
</view>
</view>
<view class="from-item">
- <view class="label">
- <text class="icon">*</text>涓婁紶鏂囦欢:
- </view>
+ <view class="label"> <text class="icon">*</text>涓婁紶鏂囦欢: </view>
<view class="item-content">
- <t-button size="small" class="right-btn" bind:tap="uploadPicture" wx:if="{{isShowUp}}">鐐瑰嚮涓婁紶</t-button>
- <view wx:if="{{!isShowUp && fileList.length > 0}}" class="fileList">
+ <t-button
+ size="small"
+ class="right-btn"
+ bind:tap="uploadPicture"
+ wx:if="{{isShowUp}}"
+ >鐐瑰嚮涓婁紶</t-button
+ >
+ <view
+ wx:if="{{!isShowUp && fileList.length > 0}}"
+ class="fileList"
+ >
<text>{{fileList[0].name}}</text>
- <image src="/static/images/bookService/detail/deleteHover.png" class="deleteBtn" data-md5="{{fileList[0].md5}}" bind:tap="handleRemove" />
+ <image
+ src="/static/images/bookService/detail/deleteHover.png"
+ class="deleteBtn"
+ data-md5="{{fileList[0].md5}}"
+ bind:tap="handleRemove"
+ />
</view>
</view>
<view class="tip">娉細鏂囦欢澶у皬涓嶅緱瓒呰繃50MB</view>
</view>
<view class="from-item">
<view class="protocolBox">
- <t-checkbox label="鍚屾剰" icon="rectangle" checked="{{resourceInfo.agree}}" bind:change="onChange" />
+ <t-checkbox
+ label="鍚屾剰"
+ icon="rectangle"
+ checked="{{resourceInfo.agree}}"
+ bind:change="onChange"
+ />
<text class="wait" bind:tap="getAgreement">銆婃巿鏉冨悓鎰忎功銆�</text>
</view>
</view>
@@ -274,15 +523,25 @@
</view>
</view>
<view class="popupBox">
- <t-popup visible="{{protocolShow}}" bind:visible-change="onVisibleChange" placement="center">
+ <t-popup
+ visible="{{protocolShow}}"
+ bind:visible-change="onVisibleChange"
+ placement="center"
+ >
<view class="block">
<view class="protocol">
<rich-text space="emsp" nodes="{{protocolTxt}}" class="content" />
</view>
- <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="onCloseProtocol" />
+ <t-icon
+ t-class="close-btn"
+ name="close-circle"
+ size="32"
+ color="#fff"
+ bind:tap="onCloseProtocol"
+ />
</view>
</t-popup>
</view>
<!-- <view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view> -->
\ No newline at end of file
+</view> -->
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 1fcfa73..2c9ab29 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -85,7 +85,9 @@
mockid: options.mockid,
});
}
+
const token = wx.getStorageSync(app.config.tokenKey)
+
if (!token) {
loginInfo(app, (data) => {
if (data) {
@@ -94,6 +96,8 @@
this.init();
}
})
+ } else {
+ this.init()
}
},
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.js b/packageBookService/pages/bookServices/examination/questionList/index.js
index c881818..17e96ec 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.js
+++ b/packageBookService/pages/bookServices/examination/questionList/index.js
@@ -36,8 +36,11 @@
},
observers: {},
detached() {
- innerAudioContext.stop();
- innerAudioContext.destroy();
+ if (innerAudioContext) {
+ innerAudioContext.stop();
+ innerAudioContext.destroy();
+ }
+
},
/**
* 缁勪欢鐨勫垵濮嬫暟鎹�
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
index 218491b..3ed28b3 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxss
@@ -113,9 +113,12 @@
margin-left: 10rpx;
}
+.card-box {
+ margin-bottom: 50rpx;
+}
.card-box:last-child {
- margin-bottom: 200rpx;
+ margin-bottom: 100rpx;
}
.question-list {
@@ -128,7 +131,7 @@
display: flex;
justify-content: center;
align-items: center;
- margin: 38rpx 20rpx 0 0;
+ margin: 20rpx 20rpx 0 0;
width: 120rpx;
height: 62rpx;
font-size: 34rpx;
diff --git a/packageBookService/pages/bookServices/linkPage/index.js b/packageBookService/pages/bookServices/linkPage/index.js
index 7f35294..472c583 100644
--- a/packageBookService/pages/bookServices/linkPage/index.js
+++ b/packageBookService/pages/bookServices/linkPage/index.js
@@ -12,9 +12,21 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
- this.setData({
- path: options.path
- })
+ const flags = Object.keys(options).length
+ if (flags == 1) {
+ this.setData({
+ path: options.path
+ })
+ } else {
+ let path = options.path + '?'
+ for (let key in options) {
+ if (key != 'path')
+ path = path + key + '=' + options[key] + '&'
+ }
+ this.setData({
+ path
+ })
+ }
},
/**
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 63d120f..74f893d 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -3,24 +3,78 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-<page-meta page-style="{{showDropdown ? 'overflow: hidden;' : ''}}" wx:if="{{!loading}}">
+<page-meta
+ page-style="{{showDropdown ? 'overflow: hidden;' : ''}}"
+ wx:if="{{!loading}}"
+>
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="nacigationBar" style="width: 72%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view class="back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
- <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
+ <t-search
+ model:value="{{searchValue}}"
+ shape="round"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�"
+ class="navBar-search"
+ style="width: 464rpx"
+ bind:submit="searchBook"
+ />
</view>
<view class="bookServices-list">
<view class="list-header">
<view class="header-scroll">
<t-dropdown-menu style="width: 1200rpx">
- <t-dropdown-item disabled="{{disabledStair}}" optionsColumns="2" options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
- <t-dropdown-item disabled="{{disabledSecondList}}" label="浜岀骇" bind:open="openDropdown" bind:close="closeDropdown" options="{{secondList.options}}" optionsColumns="2" multiple defaultValue="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:reset="resetSecond" />
- <t-dropdown-item label="閲嶇偣椤圭洰" disabled="{{disabledProject}}" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
- <t-dropdown-item label="鏂板舰鎬佹暀鏉�" disabled="{{disabledNewForms}}" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
- <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" />
+ <t-dropdown-item
+ disabled="{{disabledStair}}"
+ optionsColumns="2"
+ options="{{stairList.options}}"
+ value="{{stairList.value}}"
+ bindchange="onChangeStair"
+ />
+ <t-dropdown-item
+ disabled="{{disabledSecondList}}"
+ label="浜岀骇"
+ bind:open="openDropdown"
+ bind:close="closeDropdown"
+ options="{{secondList.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{secondList.value}}"
+ bind:confirm="onConfirmSecond"
+ bind:reset="resetSecond"
+ />
+ <t-dropdown-item
+ label="閲嶇偣椤圭洰"
+ disabled="{{disabledProject}}"
+ options="{{majorProjectList.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{majorProjectList.value}}"
+ bind:confirm="changeMajorProject"
+ bind:reset="resetMajorProject"
+ />
+ <t-dropdown-item
+ label="鏂板舰鎬佹暀鏉�"
+ disabled="{{disabledNewForms}}"
+ options="{{newTextBook.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{newTextBook.value}}"
+ bind:confirm="changeNewText"
+ bind:reset="resetNewText"
+ />
+ <t-dropdown-item
+ options="{{sortList.options}}"
+ value="{{sortList.value}}"
+ bindchange="onSortChange"
+ />
</t-dropdown-menu>
</view>
<!-- <view class="header-sort">
@@ -29,10 +83,27 @@
</t-dropdown-menu>
</view> -->
</view>
- <scroll-view scroll-y="{{true}}" scroll-into-view="{{backTop}}" refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherrefresh="onPullDownRefresh" bindrefresherpulling="{{refresh.onPulling}}" class="list-container" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ scroll-into-view="{{backTop}}"
+ refresher-enabled="{{true}}"
+ lower-threshold="{{200}}"
+ refresher-threshold="{{80}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindrefresherpulling="{{refresh.onPulling}}"
+ class="list-container"
+ bindscrolltolower="onReachBottom"
+ >
<view slot="refresher" class="refresh-container">
<view class="loading">
- <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ text="姝ｅ湪鍒锋柊..."
+ class="wrapper"
+ />
</view>
</view>
<view class="assort-title" id="assort-title">
@@ -41,9 +112,19 @@
</view>
<view class="page-content">
<view class="book-list" wx:if="{{!loaidng}}">
- <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}">
+ <view
+ class="book-box"
+ wx:for="{{bookList}}"
+ wx:key="id"
+ bind:tap="goDetail"
+ data-book="{{item}}"
+ >
<view class="book-img">
- <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="aspectFit" />
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ aria-label="{item.name{}}"
+ mode="aspectFit"
+ />
</view>
<view class="book-name book-color">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
@@ -55,9 +136,15 @@
</view>
</view>
<view class="bottom-box" wx:if="{{bookList.length}}">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" loading="{{isMore}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ loading="{{isMore}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
</view>
-</page-meta>
\ No newline at end of file
+</page-meta>
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index bf0deb6..bef4590 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -5,6 +5,16 @@
background-color: #f7f7f7;
}
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
+
+.back-icon image {
+ width: 100%;
+ height: 100%;
+}
+
.nacigationBar {
display: flex;
align-items: center;
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 4ed97d8..91f1fa4 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -2,20 +2,59 @@
<view clas="container">
<view class="page-header" wx:if="{{!skeletonLoding}}">
<view style="width: 100%; height: {{barHeight}}px;"></view>
- <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
- <view class="backBtn">
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view
+ class="nacigationBar"
+ style="width: 100%; height: {{navBarHeight}}px;"
+ >
+ <view class="backBtn back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
- <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
+ <t-search
+ model:value="{{searchValue}}"
+ shape="round"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ class="navBar-search"
+ style="width: 464rpx"
+ bind:submit="searchBook"
+ />
</view>
<view class="list-header">
<view class="header-scroll">
<view class="srcolbox">
<t-dropdown-menu>
- <t-dropdown-item options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
- <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" disabled="{{assortCheck.code == '' || stairList.options.length == 0}}" />
- <t-dropdown-item label=" 浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple defaultValue="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:reset="onResetSecond" disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" />
- <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" />
+ <t-dropdown-item
+ options="{{iconList.options}}"
+ value="{{iconList.value}}"
+ optionsColumns="2"
+ bindchange="onChangeIcon"
+ />
+ <t-dropdown-item
+ options="{{stairList.options}}"
+ value="{{stairList.value}}"
+ optionsColumns="2"
+ bindchange="onChangeStair"
+ disabled="{{assortCheck.code == '' || stairList.options.length == 0}}"
+ />
+ <t-dropdown-item
+ label=" 浜岀骇"
+ options="{{secondList.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{secondList.value}}"
+ bind:confirm="onConfirmSecond"
+ bind:reset="onResetSecond"
+ disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}"
+ />
+ <t-dropdown-item
+ options="{{sortList.options}}"
+ value="{{sortList.value}}"
+ bindchange="onSortChange"
+ />
</t-dropdown-menu>
</view>
</view>
@@ -32,29 +71,82 @@
<view class="list-body">
<movable-area class="movable-area">
<!-- model:scroll-top="{{setScrollValue}}" -->
- <scroll-view class="scroll content" bind:scroll="onPageScroll" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{180}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
+ <scroll-view
+ class="scroll content"
+ bind:scroll="onPageScroll"
+ scroll-y
+ refresher-enabled="{{true}}"
+ lower-threshold="{{200}}"
+ refresher-threshold="{{180}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindrefresherpulling="{{refresh.onPulling}}"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindscrolltolower="onReachBottom"
+ >
<view slot="refresher" class="refresh-container">
<view class="loading">
- <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ text="姝ｅ湪鍒锋柊..."
+ class="wrapper"
+ />
</view>
</view>
<view class="title">
<view class="line"></view>
<view class="icon">
- <image src="/static/images/home/yangshuliebiao.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/yangshuliebiao.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
</view>
<view class="book-list" wx:if="{{bookList.length > 0}}">
<view class="book-box" wx:for="{{bookList}}" wx:key="id">
<view class="book-img" bind:tap="goDetail" data-book="{{item}}">
- <image src="{{item.icon}}" aria-label="{{item.name}}" mode="aspectFit" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" aria-label="{{item.name}}" mode="aspectFit" wx:else />
+ <image
+ src="{{item.icon}}"
+ aria-label="{{item.name}}"
+ mode="aspectFit"
+ wx:if="{{item.icon}}"
+ />
+ <image
+ src="/static/images/default-book-img.png"
+ aria-label="{{item.name}}"
+ mode="aspectFit"
+ wx:else
+ />
</view>
- <view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view>
+ <view
+ class="book-name book-color"
+ bind:tap="goDetail"
+ data-book="{{item}}"
+ >{{ item.name}}</view
+ >
<view class="book-author book-color">{{item.author}}</view>
<view class="checkbox">
- <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless="true" checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
- <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless="true" class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
+ <t-checkbox
+ label="绾歌川鏍蜂功"
+ icon="rectangle"
+ borderless="true"
+ checked="{{item.paperChecked}}"
+ disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}"
+ data-book="{{item}}"
+ bind:change="onChangePaper"
+ />
+ <t-checkbox
+ label="鐢靛瓙鏍蜂功"
+ icon="rectangle"
+ borderless="true"
+ class="eBook"
+ checked="{{item.electronChecked}}"
+ disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}"
+ data-book="{{item}}"
+ bind:change="onChangeElectron"
+ />
</view>
</view>
</view>
@@ -63,16 +155,34 @@
<empty />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
- <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ text="鍔犺浇涓�..."
+ class="wrapper"
+ />
</view>
- <view class="bottom-loading" style="color: #ccc; font-size: 28rpx" wx:if="{{isMoreData}}">
+ <view
+ class="bottom-loading"
+ style="color: #ccc; font-size: 28rpx"
+ wx:if="{{isMoreData}}"
+ >
<text>娌℃湁鏇村浜�</text>
</view>
</scroll-view>
- <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
+ <movable-view
+ class="movable-view"
+ :x="{{x}}"
+ :y="{{y}}"
+ direction="all"
+ >
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <t-image
+ src="/static/images/home/yangshuForm1.png"
+ mode="heightFix"
+ class="img"
+ />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
@@ -80,7 +190,12 @@
</movable-area>
</view>
</view>
- <t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
+ <t-back-top
+ theme="round"
+ wx:if="{{isBackTop}}"
+ text="椤堕儴"
+ bind:to-top="onToTop"
+ ></t-back-top>
</view>
<import src="index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{skeletonLoding}}" />
\ No newline at end of file
+<template is="skeleton" wx:if="{{skeletonLoding}}" />
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index f2a7dce..9d217bc 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -1,5 +1,15 @@
@import "./index.skeleton.wxss";
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
+
+.back-icon image {
+ width: 100%;
+ height: 100%;
+}
+
.container {
width: 100vw;
height: 100vh;
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 1ad1223..c23d093 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -172,7 +172,6 @@
this.getDataList(false);
},
async goBookDetails(e) {
-
console.log(e.currentTarget.dataset);
const {
book,
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index d22fd62..d17cd26 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -6,41 +6,95 @@
<t-loading class="colors" theme="circular" size="70rpx" class="wrapper" />
</view>
<view class="titleBox">
- <view style="width: 100%; height: {{barHeight}}px; background-color: #fff;"></view>
- <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view
+ style="width: 100%; height: {{barHeight}}px; background-color: #fff;"
+ ></view>
+ <view
+ class="nacigationBar"
+ style="width: 100%; height: {{navBarHeight}}px;"
+ >
+ <view class="back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
<view class="example-search">
- <t-search model:value="{{value}}" placeholder="璇疯緭鍏ヤ功鐩悕绉�" bind:submit="onSearchSubmit">
+ <t-search
+ model:value="{{value}}"
+ placeholder="璇疯緭鍏ヤ功鐩悕绉�"
+ bind:submit="onSearchSubmit"
+ >
</t-search>
</view>
</view>
</view>
<view class="page-content">
-
-
-
- <t-tabs class="contentBox" defaultValue="{{0}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel">
-
-
-
-
+ <t-tabs
+ class="contentBox"
+ defaultValue="{{0}}"
+ bind:change="onTabsChange"
+ t-class="custom-tabs"
+ t-class-content="custom-panel"
+ >
<t-tab-panel label="楂樼瓑鏁欒偛({{higherTotal}})" value="0">
<view wx:if="{{higherList.length <= 0}}" class="noDataBox">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
- <scroll-view scroll-y="{{true}}" wx:else class="scroll-box" lower-threshold="{{300}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ wx:else
+ class="scroll-box"
+ lower-threshold="{{300}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindscrolltolower="onReachBottom"
+ >
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{higherList}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view
+ class="higherBox"
+ wx:for="{{higherList}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ >
<view class="outsideHigherImageBox">
<view class="higherImageBox">
- <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
- <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
- <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+ <image
+ wx:if="{{item.icon}}"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ src="{{item.icon}}"
+ mode="aspectFill"
+ />
+ <image
+ wx:if="{{!item.icon}}"
+ src="/static/images/default-book-img.png"
+ mode="aspectFill"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ />
+ <view
+ class="downloadIcon"
+ data-item="{{item}}"
+ data-key="showWithInput"
+ bind:tap="mailbox"
+ >
+ <image
+ wx:if="{{determine}}"
+ class="download"
+ src="/static/images/bibliographyList/email-click.png"
+ mode="aspectFit"
+ />
+ <image
+ wx:else=""
+ class="downloadshiftin"
+ src="/static/images/bibliographyList/email.png"
+ mode="aspectFit"
+ />
</view>
</view>
</view>
@@ -48,7 +102,12 @@
</view>
</view>
<view wx:if="{{higherList.length}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
@@ -58,16 +117,58 @@
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
- <scroll-view scroll-y="{{true}}" wx:else class="scroll-box" lower-threshold="{{200}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ wx:else
+ class="scroll-box"
+ lower-threshold="{{200}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindscrolltolower="onReachBottom"
+ >
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}">
+ <view
+ class="higherBox"
+ wx:for="{{vocationalList}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ >
<view class="outsideHigherImageBox">
<view class="higherImageBox">
- <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
- <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
- <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+ <image
+ wx:if="{{item.icon}}"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ src="{{item.icon}}"
+ mode="aspectFill"
+ />
+ <image
+ wx:if="{{!item.icon}}"
+ src="/static/images/default-book-img.png"
+ mode="aspectFill"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ />
+ <view
+ class="downloadIcon"
+ data-item="{{item}}"
+ data-key="showWithInput"
+ bind:tap="mailbox"
+ >
+ <image
+ wx:if="{{determine}}"
+ class="download"
+ src="/static/images/bibliographyList/email-click.png"
+ mode="aspectFit"
+ />
+ <image
+ wx:else=""
+ class="downloadshiftin"
+ src="/static/images/bibliographyList/email.png"
+ mode="aspectFit"
+ />
</view>
</view>
</view>
@@ -75,7 +176,12 @@
</view>
</view>
<view wx:if="{{vocationalList.length > 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
@@ -85,16 +191,58 @@
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
- <scroll-view scroll-y="{{true}}" wx:else class="scroll-box" lower-threshold="{{200}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindscrolltolower="onReachBottom">
+ <scroll-view
+ scroll-y="{{true}}"
+ wx:else
+ class="scroll-box"
+ lower-threshold="{{200}}"
+ refresher-default-style="none"
+ refresher-triggered="{{triggered}}"
+ bindscrolltolower="onReachBottom"
+ >
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}">
+ <view
+ class="higherBox"
+ wx:for="{{teacherList}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ >
<view class="outsideHigherImageBox">
<view class="higherImageBox">
- <image wx:if="{{item.icon}}" data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
- <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="aspectFill" data-item="{{item}}" bind:tap="downloadData" />
- <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+ <image
+ wx:if="{{item.icon}}"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ src="{{item.icon}}"
+ mode="aspectFill"
+ />
+ <image
+ wx:if="{{!item.icon}}"
+ src="/static/images/default-book-img.png"
+ mode="aspectFill"
+ data-item="{{item}}"
+ bind:tap="downloadData"
+ />
+ <view
+ class="downloadIcon"
+ data-item="{{item}}"
+ data-key="showWithInput"
+ bind:tap="mailbox"
+ >
+ <image
+ wx:if="{{determine}}"
+ class="download"
+ src="/static/images/bibliographyList/email-click.png"
+ mode="aspectFit"
+ />
+ <image
+ wx:else=""
+ class="downloadshiftin"
+ src="/static/images/bibliographyList/email.png"
+ mode="aspectFit"
+ />
</view>
</view>
</view>
@@ -102,7 +250,12 @@
</view>
</view>
<view wx:if="{{teacherList.length > 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
@@ -121,7 +274,13 @@
<view class="body">
<view class="dialog-title">璇疯緭鍏ラ偖绠�</view>
<view class="input-box">
- <t-input style="{{inputStyle}}" class="input" placeholder="璇疯緭鍏ラ偖绠卞彿" value="{{input}}" bind:change="inputChange"></t-input>
+ <t-input
+ style="{{inputStyle}}"
+ class="input"
+ placeholder="璇疯緭鍏ラ偖绠卞彿"
+ value="{{input}}"
+ bind:change="inputChange"
+ ></t-input>
</view>
</view>
<view class="row-btn">
@@ -131,4 +290,4 @@
</view>
</view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index e34742e..f633966 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -1,5 +1,15 @@
@import "./index.skeleton.wxss";
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
+
+.back-icon image {
+ width: 100%;
+ height: 100%;
+}
+
.nacigationBar {
background-color: #fff;
display: flex;
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 11390fa..0f8a42f 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -10,12 +10,26 @@
<view class="outsideBigTitleBox">
<view class="bigTitleBox">
<view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view class="titleIconBox">
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view
+ class="nacigationBar"
+ style="width: 70%; height: {{navBarHeight}}px;"
+ >
+ <view class="titleIconBox" class="back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
<view class="example-search">
- <t-search class="navBar-search" shape="round" model:value="{{value}}" placeholder="璇疯緭鍏ヤ功灞曞悕绉�" bind:submit="onSearchSubmit" />
+ <t-search
+ class="navBar-search"
+ shape="round"
+ model:value="{{value}}"
+ placeholder="璇疯緭鍏ヤ功灞曞悕绉�"
+ bind:submit="onSearchSubmit"
+ />
</view>
</view>
</view>
@@ -23,11 +37,29 @@
<view class="outsideMenuBox">
<view class="menuBox">
<t-dropdown-menu>
- <t-dropdown-item options="{{product.options}}" default-value="{{product.value}}" bindchange="onChange" />
+ <t-dropdown-item
+ options="{{product.options}}"
+ default-value="{{product.value}}"
+ bindchange="onChange"
+ />
<!-- disabled="{{keynoteDisabled}}" -->
- <t-dropdown-item label=" 閲嶇偣椤圭洰" disabled="{{disbaleProject}}" options="{{multipleSelect.options}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" value="{{multipleSelect.value}}">
+ <t-dropdown-item
+ label=" 閲嶇偣椤圭洰"
+ disabled="{{disbaleProject}}"
+ options="{{multipleSelect.options}}"
+ bindchange="handleMultipleSelect"
+ multiple
+ bind:confirm="handleConfirm"
+ bind:reset="handleReset"
+ value="{{multipleSelect.value}}"
+ >
</t-dropdown-item>
- <t-dropdown-item disabled="{{disabledSort}}" options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
+ <t-dropdown-item
+ disabled="{{disabledSort}}"
+ options="{{sorter.options}}"
+ default-value="{{sorter.value}}"
+ bindchange="onSort"
+ />
</t-dropdown-menu>
</view>
</view>
@@ -36,21 +68,40 @@
<view class="titleBox">
<view class="frameBox"></view>
<view class="titleTextBox">
- <image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="aspectFit" />
+ <image
+ src="/static/images/bookExhibitionList/zhuantitaolun.png"
+ mode="aspectFit"
+ />
</view>
</view>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="outside">
<view wx:if="{{!bookExhibitionList.length }}" class="noData">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
- <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookExhibitionDetails">
+ <view
+ class="contentBox"
+ wx:for="{{bookExhibitionList}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ bind:tap="onBookExhibitionDetails"
+ >
<view class="imageBox">
<view></view>
<image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
- <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" />
+ <image
+ wx:else
+ src="/static/images/bookExhibitionList/banner.png"
+ mode="aspectFit"
+ />
</view>
<view class="textBox" title="{{item.subtitleName}}">
<text>{{item.subtitleName}}</text>
@@ -58,10 +109,15 @@
</view>
</view>
<view class="bottom-box" wx:if="{{bookExhibitionList.length }}">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<!-- <Select prop-array='{{selectArray}}'></Select> -->
</scroll-view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 82ef507..720e64c 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -9,6 +9,16 @@
padding-left: 10rpx;
}
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
+
+.back-icon image {
+ width: 100%;
+ height: 100%;
+}
+
.navbar-title {
white-space: nowrap;
text-overflow: ellipsis;
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index dcf8343..670801c 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -165,7 +165,6 @@
this.digitalCoursesDetailsGet(options.id)
this.getPlayerList()
this.getType()
-
},
/**
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 4db6f31..53d4817 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -11,51 +11,84 @@
<view class="nameBox">{{digitalsData.name}}</view>
<view>
<viwe class="styleCssBox">
- <view style="width: 200rpx;"> ISBN锛� </view>
+ <view style="width: 200rpx"> ISBN锛� </view>
<view wx:if="{{digitalsData.isbn}}"> {{digitalsData.isbn}} </view>
<view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 200rpx;">璇剧▼璐熻矗浜猴細</view>
- <view wx:if="{{digitalsData.courseLeader}}"> {{digitalsData.courseLeader }}</view>
+ <view style="width: 200rpx">璇剧▼璐熻矗浜猴細</view>
+ <view wx:if="{{digitalsData.courseLeader}}">
+ {{digitalsData.courseLeader }}</view
+ >
<view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 200rpx;">璇剧▼璐熻矗浜哄崟浣嶏細</view>
- <view wx:if="{{digitalsData.affiliatedUnit}}"> {{ digitalsData.affiliatedUnit}}</view>
+ <view style="width: 200rpx">璇剧▼璐熻矗浜哄崟浣嶏細</view>
+ <view wx:if="{{digitalsData.affiliatedUnit}}">
+ {{ digitalsData.affiliatedUnit}}</view
+ >
<view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 200rpx;">鍑虹増鍗曚綅锛�</view>
- <view wx:if="{{digitalsData.publishingUnit}}"> {{publishingUnit}} </view>
+ <view style="width: 200rpx">鍑虹増鍗曚綅锛�</view>
+ <view wx:if="{{digitalsData.publishingUnit}}">
+ {{publishingUnit}}
+ </view>
<view wx:else>-</view>
</viwe>
<viwe class="styleCssBox">
- <view style="width: 200rpx;">鍑虹増鏃堕棿锛�</view>
- <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}} </view>
+ <view style="width: 200rpx">鍑虹増鏃堕棿锛�</view>
+ <view wx:if="{{digitalsData.publicationDate}}"
+ >{{digitalsData.publicationDate}}
+ </view>
<view wx:else>-</view>
</viwe>
- <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 style="margin-left: 30rpx;">浠锋牸锛� <text>锟{digitalsData.price}}</text></view>
- <view style="margin-right: 30rpx;">鍏�<text>{{ digitalsData.classHours ? digitalsData.classHours : '0'}}</text>璇炬椂</view>
+ <view style="margin-left: 30rpx"
+ >浠锋牸锛� <text>锟{digitalsData.price}}</text></view
+ >
+ <view style="margin-right: 30rpx"
+ >鍏�<text
+ >{{ digitalsData.classHours ? digitalsData.classHours :
+ '0'}}</text
+ >璇炬椂</view
+ >
</view>
</view>
</view>
<view class="tabBox">
- <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel">
- <t-tab-panel icon="{{ tabValue == '0' ? briefIconClick : briefIcon}}" label="鍩烘湰淇℃伅" value="0">
+ <t-tabs
+ defaultValue="{{tabValue}}"
+ bind:change="onTabsChange"
+ t-class="custom-tabs"
+ t-class-content="custom-panel"
+ >
+ <t-tab-panel
+ icon="{{ tabValue == '0' ? briefIconClick : briefIcon}}"
+ label="鍩烘湰淇℃伅"
+ value="0"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/bookService/detail/label.png" mode="" />
+ <image
+ src="/static/images/bookService/detail/label.png"
+ mode=""
+ />
</view>
<view class="basic"> 璇剧▼浠嬬粛</view>
</view>
<view class="course-content">
- <rich-text wx:if="{{digitalsData.content}}" nodes="{{digitalsData.content}}"></rich-text>
+ <rich-text
+ wx:if="{{digitalsData.content}}"
+ nodes="{{digitalsData.content}}"
+ ></rich-text>
<view wx:else="" class="noDataBox">
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
<empty />
@@ -63,20 +96,26 @@
</view>
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/bookService/detail/label.png" mode="" />
+ <image
+ src="/static/images/bookService/detail/label.png"
+ mode=""
+ />
</view>
<view class="basic"> 涓昏鑰佸笀</view>
</view>
<view class="course-content">
- <view class="lecturer" wx:for="{{lecturerList}}" wx:key="index" wx:for-item="item">
+ <view
+ class="lecturer"
+ wx:for="{{lecturerList}}"
+ wx:key="index"
+ wx:for-item="item"
+ >
<view class="lecturerImangBox">
<image src="{{item.icon}}" mode="aspectFit" />
</view>
<view class="lecturerInformation">
<view class="lecturerName">
- <view class="name">
- {{item.name}}
- </view>
+ <view class="name"> {{item.name}} </view>
<view class="title">{{item.title}}</view>
</view>
<view class="lecturerContent">{{item.description}}</view>
@@ -84,10 +123,17 @@
</view>
</view>
</t-tab-panel>
- <t-tab-panel icon="{{ tabValue == '1' ? learnResourceClickIcon : learnResourceIcon}}" label="璇佷功淇℃伅" value="1">
+ <t-tab-panel
+ icon="{{ tabValue == '1' ? learnResourceClickIcon : learnResourceIcon}}"
+ label="璇佷功淇℃伅"
+ value="1"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="" />
+ <image
+ src="/static/images/digitalTextbooks/zhengshu@2x.png"
+ mode=""
+ />
</view>
<view class="basic"> 璇佷功淇℃伅</view>
</view>
@@ -97,21 +143,74 @@
<image src="{{cbzsImg}}" mode="" />
</view>
<view class="chart" bind:tap="onClick2">
- <image src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" />
+ <image
+ src="https://jsek.bnuic.com/home/certificate/kczs.jpg"
+ 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" />
+ <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"
+ />
<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>
- <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.affiliatedUnit}}">{{digitalsData.affiliatedUnit || '-'}}</view>
- <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.isbn}}"> {{ digitalsData.isbn || '-'}}</view>
- <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}}</view>
- <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit}}</view>
- <view class="website my_draw_canvas" data-type="text" data-text="{{website}}">{{website}}</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="affiliatedUnit my_draw_canvas"
+ data-type="text"
+ data-text="{{digitalsData.affiliatedUnit}}"
+ >{{digitalsData.affiliatedUnit || '-'}}</view
+ >
+ <view
+ class="affiliatedUnit my_draw_canvas"
+ data-type="text"
+ data-text="{{digitalsData.isbn}}"
+ >
+ {{ digitalsData.isbn || '-'}}</view
+ >
+ <view
+ class="affiliatedUnit my_draw_canvas"
+ data-type="text"
+ data-text="{{digitalsData.publicationDate}}"
+ >{{digitalsData.publicationDate}}</view
+ >
+ <view
+ class="affiliatedUnit my_draw_canvas"
+ data-type="text"
+ data-text="{{publishingUnit}}"
+ >{{publishingUnit}}</view
+ >
+ <view
+ class="website my_draw_canvas"
+ data-type="text"
+ data-text="{{website}}"
+ >{{website}}</view
+ >
<view class="codeBox"></view>
</view>
</view>
@@ -139,26 +238,52 @@
</view>
</view>
</t-tab-panel>
- <t-tab-panel icon="{{ tabValue == '2' ? courseLearningClick : courseLearning}}" label="璇剧▼瀛︿範" value="2">
+ <t-tab-panel
+ icon="{{ tabValue == '2' ? courseLearningClick : courseLearning}}"
+ label="璇剧▼瀛︿範"
+ value="2"
+ >
<view class="course-content">
<view class="tabsSelect">
- <view class="{{selectActive == 'learn' ? 'tabs-item selectActive' : 'tabs-item'}}" bind:tap="selectChange" data-value="{{'learn'}}">瀛︿範鍐呭</view>
- <view class="{{selectActive == 'test' ? 'tabs-item selectActive' : 'tabs-item'}}" bind:tap="selectChange" data-value="{{'test'}}">鍦ㄧ嚎娴嬭瘯</view>
+ <view
+ class="{{selectActive == 'learn' ? 'tabs-item selectActive' : 'tabs-item'}}"
+ bind:tap="selectChange"
+ data-value="{{'learn'}}"
+ >瀛︿範鍐呭</view
+ >
+ <view
+ class="{{selectActive == 'test' ? 'tabs-item selectActive' : 'tabs-item'}}"
+ bind:tap="selectChange"
+ data-value="{{'test'}}"
+ >鍦ㄧ嚎娴嬭瘯</view
+ >
</view>
<view class="list-box">
<view wx:if="{{selectActive == 'learn'}}">
<view wx:if="{{relationTextBook}}" class="textBook">
<view class="textTile">
- <image src="/static/images/bookService/detail/shuzijiaocai.png" mode="" class="leftImg" />
+ <image
+ src="/static/images/bookService/detail/shuzijiaocai.png"
+ mode=""
+ class="leftImg"
+ />
<view>鏁板瓧鏁欐潗</view>
</view>
<view class="reabtn" bind:tap="readTextBook">
- <image src="/static/images/digitalCourses/shidu@2x.png" class="readImage"></image>
+ <image
+ src="/static/images/digitalCourses/shidu@2x.png"
+ class="readImage"
+ ></image>
<view>{{isTextBookBuy ? '闃呰' : '璇曠湅'}}</view>
</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}}"
+ >
</tree>
</view>
<view wx:if="{{learnList.length == 0}}" class="noData">
@@ -169,22 +294,43 @@
<view class="testBtnBox">
<view class="textTile">鍏眥{testCount}}涓�</view>
<view class="note-btn">
- <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="errorQuestion" style="width: 220rpx">
+ <t-button
+ theme="primary"
+ class="make-note"
+ bind:tap="goMycollect"
+ data-answerType="errorQuestion"
+ style="width: 220rpx"
+ >
<view slot="content" class="btn-content">
- <image src="/static/images/bookService/detail/cuoti.png" />
+ <image
+ src="/static/images/bookService/detail/cuoti.png"
+ />
<text class="note-btn-text">鎴戠殑閿欓</text>
</view>
</t-button>
- <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="collectQuestion" style="width: 220rpx;margin-left:10rpx;">
+ <t-button
+ theme="primary"
+ class="make-note"
+ bind:tap="goMycollect"
+ data-answerType="collectQuestion"
+ style="width: 220rpx; margin-left: 10rpx"
+ >
<view slot="content" class="btn-content">
- <image src="/static/images/bookService/detail/wodeshoucang.png" />
+ <image
+ src="/static/images/bookService/detail/wodeshoucang.png"
+ />
<text class="note-btn-text">鎴戠殑鏀惰棌</text>
</view>
</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}}"
+ ></testTree>
<view wx:if="{{testList.length == 0}}" class="noData">
<empty />
</view>
@@ -192,9 +338,17 @@
</view>
</view>
</t-tab-panel>
- <t-tab-panel icon="{{ tabValue == '3' ? learningNotesClick : learningNotes}}" label="瀛︿範绗旇" value="3">
+ <t-tab-panel
+ icon="{{ tabValue == '3' ? learningNotesClick : learningNotes}}"
+ label="瀛︿範绗旇"
+ value="3"
+ >
<view class="course-content">
- <note bookInfo="{{digitalsData}}" id="note" class="note-list"></note>
+ <note
+ bookInfo="{{digitalsData}}"
+ id="note"
+ class="note-list"
+ ></note>
<!-- <view class="topBox">
<view></view>
<view class="note-btn">
@@ -208,9 +362,17 @@
</view> -->
</view>
</t-tab-panel>
- <t-tab-panel icon="{{ tabValue == '4' ? onlineQuestioningClick : onlineQuestioning}}" label="鍦ㄧ嚎鎻愰棶" value="4">
+ <t-tab-panel
+ icon="{{ tabValue == '4' ? onlineQuestioningClick : onlineQuestioning}}"
+ label="鍦ㄧ嚎鎻愰棶"
+ value="4"
+ >
<view class="course-content">
- <question bookInfo="{{digitalsData}}" id="question" class="note-list"></question>
+ <question
+ bookInfo="{{digitalsData}}"
+ id="question"
+ class="note-list"
+ ></question>
<!-- <view class="topBox">
<view>鍏眥{questionTotalCount}}涓�</view>
<view class="note-btn">
@@ -240,10 +402,18 @@
</view> -->
</view>
</t-tab-panel>
- <t-tab-panel icon="{{tabValue == '5' ? testResourceClickIocn : testResourceIocn}}" value="5" label="鐩稿叧璇剧▼" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ icon="{{tabValue == '5' ? testResourceClickIocn : testResourceIocn}}"
+ value="5"
+ label="鐩稿叧璇剧▼"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/digitalTextbooks/Link@3x.png" mode="" />
+ <image
+ src="/static/images/digitalTextbooks/Link@3x.png"
+ mode=""
+ />
</view>
<view class="basic"> 鐩稿叧璇剧▼</view>
</view>
@@ -251,10 +421,22 @@
<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="" mode="aspectFit" />
- <img wx:if="{{item.icon == ''}}" src="/static/images/default-book-img.png" alt="" />
+ <img
+ wx:if="{{item.icon == ''}}"
+ src="/static/images/default-book-img.png"
+ alt=""
+ />
</view>
<view class="correlationName">{{item.name}}</view>
<view class="correlationAuthor">{{digitalsData.author}}</view>
@@ -266,21 +448,37 @@
<view class="box-bottom">
<view class="bottom-btn" 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=""
+ />
+ <image
+ wx:else
+ src="/static/images/bookService/detail/collecting.png"
+ mode=""
+ />
</view>
- <view class="btn-text">
- 鏀惰棌
- </view>
+ <view class="btn-text"> 鏀惰棌 </view>
</view>
<view class="bottom-btn" bind:tap="onCertificate">
<view class="applicationImageBox">
- <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" mode="" />
+ <image
+ src="/static/images/digitalCourses/zhengshushenqing@2x.png"
+ mode=""
+ />
</view>
<view>璇佷功鐢宠</view>
</view>
- <view class="bottom-btn shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy}}">鍔犲叆璐墿杞�</view>
- <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy}}">绔嬪嵆璐拱</view>
+ <view
+ class="bottom-btn shopCarColor"
+ bind:tap="addBookShopcCar"
+ wx:if="{{!isBuy}}"
+ >鍔犲叆璐墿杞�</view
+ >
+ <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy}}"
+ >绔嬪嵆璐拱</view
+ >
</view>
<t-toast id="t-toast" />
</scroll-view>
@@ -293,15 +491,25 @@
<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" />
</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">
@@ -313,4 +521,13 @@
</view>
</view>
-<t-image-viewer usingCustomNavbar deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:change="onChange" bind:close="onClose"></t-image-viewer>
\ No newline at end of file
+<t-image-viewer
+ usingCustomNavbar
+ deleteBtn="{{deleteBtn}}"
+ closeBtn="{{closeBtn}}"
+ showIndex="{{showIndex}}"
+ visible="{{visible}}"
+ images="{{images}}"
+ bind:change="onChange"
+ bind:close="onClose"
+></t-image-viewer>
diff --git a/pages/digitalCourses/index.js b/pages/digitalCourses/index.js
index 4abba99..27075df 100644
--- a/pages/digitalCourses/index.js
+++ b/pages/digitalCourses/index.js
@@ -45,7 +45,8 @@
},
],
},
- sortActive: ''
+ sortActive: '',
+ otherType: null
},
/**
@@ -132,10 +133,10 @@
})
const data = {
path: '*',
- filterList: [{
- value: 'Normal',
- field: 'state'
- }],
+ // filterList: [{
+ // value: 'Normal',
+ // field: 'state'
+ // }],
queryType: '\\',
searchList: [],
size: '20',
@@ -148,7 +149,15 @@
}
app.MG.store.getStoreChannelList(data).then((res) => {
// 鍘婚櫎鏁扮粍鏈�鍚庝竴涓厓绱�
+ // 鎵惧嚭鍏朵粬鍒嗙被鐨刾ath锛岀敤浜庢帓闄ゅ叾浠栧垎绫婚噷鐨勬暟鎹�
+ this.data.otherType = res.datas.find(item => item.refCode == "jsek_dCOther")
+ res.datas = res.datas.filter(item => item.state == 'Normal')
const newData = res.datas.slice(0, res.datas.length - 1)
+ newData.unshift({
+ name: "鍏ㄩ儴",
+ pathList: newData[0].pathList[0],
+ id: ""
+ })
this.setData({
tabList: newData,
loading: false
@@ -197,7 +206,9 @@
// // 缁勫悎鐨勫啓娉� 瑕佹煡璇㈢殑瀛楁:鍗囧簭鍜岄檷搴�
const obj = {
storeInfo: app.config.goodsStore,
- path: item.pathList + '\\' + item.id,
+ // path: item.pathList + '\\' + item.id,
+ path: item.id ? item.pathList + '\\' + item.id : item.pathList,
+ queryType: "*",
coverSize: {
width: 260
},
@@ -222,12 +233,12 @@
app.MG.store.getProductList(obj).then((res) => {
res.datas.forEach(item => {
item.price = item.price.toFixed(2)
+ item.productLinkInfo = JSON.parse(item.productLinkInfo)
})
-
+ // 鎺掗櫎鍏朵粬鍒嗙被閲岀殑鏁版嵁
this.setData({
- courseList: res.datas
+ courseList: res.datas.filter(item => item.productLinkInfo[0].LinkPath != this.data.otherType.pathList[0] + '\\' + this.data.otherType.id)
})
-
})
},
searchBook() {
diff --git a/pages/digitalCourses/index.wxml b/pages/digitalCourses/index.wxml
index c8e87c7..e66145d 100644
--- a/pages/digitalCourses/index.wxml
+++ b/pages/digitalCourses/index.wxml
@@ -3,21 +3,47 @@
<view wx:else="">
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view class="back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
- <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ヨ绋嬪悕绉�/ISBN/璇剧▼璐熻矗浜�" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
+ <t-search
+ model:value="{{searchValue}}"
+ shape="round"
+ placeholder="璇疯緭鍏ヨ绋嬪悕绉�/ISBN/璇剧▼璐熻矗浜�"
+ class="navBar-search"
+ style="width: 464rpx"
+ bind:submit="searchBook"
+ />
</view>
<view class="heardTab">
<view class="tabBox">
- <t-tabs defaultValue="{{active}}" bind:change="onTabsChange" t-class="custom-tabs">
- <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}">
+ <t-tabs
+ defaultValue="{{active}}"
+ bind:change="onTabsChange"
+ t-class="custom-tabs"
+ >
+ <t-tab-panel
+ wx:for="{{tabList}}"
+ wx:key="index"
+ wx:for-item="item"
+ label="{{item.name}}"
+ value="{{index}}"
+ >
</t-tab-panel>
</t-tabs>
</view>
<view class="dropdown">
<t-dropdown-menu>
- <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
+ <t-dropdown-item
+ options="{{sorter.options}}"
+ default-value="{{sorter.value}}"
+ bindchange="onSort"
+ />
</t-dropdown-menu>
</view>
</view>
@@ -25,29 +51,40 @@
<view class="titleBox">
<view class="frameBox"></view>
<view class="titleTextBox">
- <image src="/static/images/digitalCourses/zhuantitaolun@2x.png" mode="aspectFit" />
+ <image
+ src="/static/images/digitalCourses/zhuantitaolun@2x.png"
+ mode="aspectFit"
+ />
</view>
</view>
- <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="outsideContentBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="ExternalInformationBox">
- <view class="informationBox" wx:for="{{courseList}}" wx:key="index" wx:for-item="item" data-item="{{item}}">
+ <view
+ class="informationBox"
+ wx:for="{{courseList}}"
+ wx:key="index"
+ wx:for-item="item"
+ data-item="{{item}}"
+ >
<view class="book-img" bind:tap="courseDetail" data-item="{{item}}">
<image src="{{item.icon}}" mode="aspectFit" />
</view>
<view class="book-Info">
- <view class="book-name" bind:tap="courseDetail" data-item="{{item}}">
+ <view
+ class="book-name"
+ bind:tap="courseDetail"
+ data-item="{{item}}"
+ >
{{item.name}}
</view>
- <view class="viewCount">
- {{item.viewCount }}娆＄偣鍑�
- </view>
+ <view class="viewCount"> {{item.viewCount }}娆＄偣鍑� </view>
<view class="author">
- <view>
- {{ item.courseLeader}}
- </view>
- <view>
- {{ item.classHours}}璇炬椂
- </view>
+ <view> {{ item.courseLeader}} </view>
+ <view> {{ item.classHours}}璇炬椂 </view>
</view>
<view class="money">
<view wx:if="{{item.price != 0}}">锟{item.price }}</view>
@@ -64,4 +101,4 @@
</view>
</scroll-view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/digitalCourses/index.wxss b/pages/digitalCourses/index.wxss
index 9795663..884363b 100644
--- a/pages/digitalCourses/index.wxss
+++ b/pages/digitalCourses/index.wxss
@@ -6,6 +6,15 @@
height: 100%;
}
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
+
+.back-icon image {
+ width: 100%;
+ height: 100%;
+}
.nacigationBar {
display: flex;
@@ -35,13 +44,18 @@
.dropdown {
z-index: 1;
width: 29vw;
- box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1);
+ /* box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1); */
+ box-shadow: -2px 2px 7px -4px rgba(0, 0, 0, 0.1);
}
.t-dropdown-menu__item--active,
.t-radio__icon--checked,
.t-checkbox__icon--checked {
color: #FF6C00 !important
+}
+
+.t-dropdown-menu:after {
+ height: 0 !important;
}
.t-tabs .t-tabs__track {
@@ -121,6 +135,7 @@
}
.book-name {
+ height: 76rpx;
color: #333;
font-size: 28rpx;
font-weight: 700;
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.js b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
index dee28fb..d787b87 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.js
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.js
@@ -244,7 +244,7 @@
isBuy: false
})
}
- res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈圖D鏃�')
+ res.datas.publicationDate = moment(res.datas.publicationDate).format('YYYY骞碝M鏈�')
if (res.datas.icon == '') {
res.datas.icon = '/static/images/default-book-img.png'
}
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index 47d486e..78e1c2f 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -3,7 +3,11 @@
<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">
@@ -17,38 +21,44 @@
</view> -->
</view>
<view class="bookContent">
- <view class="headerText">
- {{digitalsData.name}}
- </view>
+ <view class="headerText"> {{digitalsData.name}} </view>
<view class="content">
<view class="styleCssBox">
- <view style="width: 150rpx;"> 涓荤紪锛� </view>
+ <view style="width: 150rpx"> 涓荤紪锛� </view>
<view class="authorBox">{{ digitalsData.author}}</view>
</view>
<view class="styleCssBox">
- <view style="width: 150rpx;"> 缂栬�呭崟浣嶏細 </view>
- <view class="authorBox">{{ digitalsData.editorUnit || '-'}}</view>
+ <view style="width: 150rpx"> 缂栬�呭崟浣嶏細 </view>
+ <view class="authorBox"
+ >{{ digitalsData.editorUnit || '-'}}</view
+ >
</view>
<view class="styleCssBox">
- <view style="width: 150rpx;">ISBN锛�</view>
+ <view style="width: 150rpx">ISBN锛�</view>
<view>{{ digitalsData.isbn}}</view>
</view>
<view class="styleCssBox">
- <view style="width: 150rpx;"> 鍑虹増鏃堕棿锛� </view>
+ <view style="width: 150rpx"> 鍑虹増鏃堕棿锛� </view>
<view>{{ digitalsData.publicationDate}}</view>
</view>
<view class="styleCssBox">
- <view style="width: 150rpx;"> 鍑虹増鍗曚綅锛� </view>
+ <view style="width: 150rpx"> 鍑虹増鍗曚綅锛� </view>
<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=""
+ />
</view>
<view class="proposalText">鎴戣寤鸿</view>
</view>
@@ -56,7 +66,10 @@
<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=""
+ />
</view>
<view class="proposalText">璇佷功鐢宠</view>
</view>
@@ -72,11 +85,26 @@
</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="鍩烘湰淇℃伅" style="{{tabPanelstyle}}">
+ <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="鍩烘湰淇℃伅"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/bookService/detail/label.png" mode="" />
+ <image
+ src="/static/images/bookService/detail/label.png"
+ mode=""
+ />
</view>
<view class="basic"> 鍩烘湰淇℃伅</view>
</view>
@@ -88,42 +116,76 @@
<empty />
</view>
</t-tab-panel>
- <t-tab-panel icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" label="璇佷功淇℃伅" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
+ value="jsek_cloudLearning"
+ label="璇佷功淇℃伅"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="" />
+ <image
+ src="/static/images/digitalTextbooks/zhengshu@2x.png"
+ mode=""
+ />
</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=""
+ />
</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=""
+ />
</view>
</view>
</t-tab-panel>
- <t-tab-panel icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" label="浣滆�呬俊鎭�" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
+ value="jsek_teachingResources"
+ label="浣滆�呬俊鎭�"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/bookService/detail/author.png" mode="" />
+ <image
+ src="/static/images/bookService/detail/author.png"
+ mode=""
+ />
</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="鐩綍" style="{{tabPanelstyle}}">
-
+ <t-tab-panel
+ icon="{{tabValue == 'catalogue' ? catalogueClickIcon : catalogue}}"
+ value="catalogue"
+ label="鐩綍"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/digitalTextbooks/mulu@3x.png" mode="" />
+ <image
+ src="/static/images/digitalTextbooks/mulu@3x.png"
+ mode=""
+ />
</view>
<view class="basic"> 鐩綍</view>
</view>
@@ -135,10 +197,18 @@
<empty />
</view>
</t-tab-panel>
- <t-tab-panel icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" label="鐩稿叧鏁欐潗" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
+ value="questionBank"
+ label="鐩稿叧鏁欐潗"
+ style="{{tabPanelstyle}}"
+ >
<view class="rubricBox">
<view class="rubricimgBox">
- <image src="/static/images/digitalTextbooks/Link@3x.png" mode="" />
+ <image
+ src="/static/images/digitalTextbooks/Link@3x.png"
+ mode=""
+ />
</view>
<view class="basic"> 鐩稿叧鏁欐潗</view>
</view>
@@ -146,10 +216,22 @@
<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="" />
+ <img
+ wx:if="{{item.icon == ''}}"
+ src="/static/images/default-book-img.png"
+ alt=""
+ />
</view>
<view class="correlationName">{{item.name}}</view>
<view class="correlationAuthor">{{digitalsData.author}}</view>
@@ -157,20 +239,24 @@
</view>
</t-tab-panel>
</t-tabs>
-
</view>
</scroll-view>
-
<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=""
+ />
+ <image
+ wx:else
+ src="/static/images/bookService/detail/collecting.png"
+ mode=""
+ />
</view>
- <view class="btn-text">
- 鏀惰棌
- </view>
+ <view class="btn-text"> 鏀惰棌 </view>
</view>
<view class="trialReading" bind:tap="goRead" wx:if="{{!isBuy}}">
<view class="collectionImage">
@@ -178,16 +264,41 @@
</view>
<view class="btn-text">璇曡</view>
</view>
- <view class="shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy}}">鍔犲叆璐墿杞�</view>
- <view class="buyColor" bind:tap="buyBtn" wx:if="{{!isBuy && digitalsData.price != 0}}">绔嬪嵆璐拱</view>
- <view class="buyColor" 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>
@@ -196,15 +307,25 @@
<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" />
</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">
@@ -215,6 +336,13 @@
</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" />
\ No newline at end of file
+<t-toast id="t-toast" />
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
index 7c78cad..9b35f1c 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
@@ -242,6 +242,10 @@
align-items: center;
}
+.receive {
+ width: 400rpx;
+}
+
.suggestion {
width: 35rpx;
height: 35rpx;
diff --git a/pages/digitalTextbooks/index.js b/pages/digitalTextbooks/index.js
index 374ff4d..1da0c34 100644
--- a/pages/digitalTextbooks/index.js
+++ b/pages/digitalTextbooks/index.js
@@ -21,7 +21,8 @@
tabList: [],
selectedIndex: 0,
digitalTextbooksData: [],
- path: "jsek_dTHigherEducation",
+ // path: "jsek_dTHigherEducation",
+ path: "*",
loading: true,
sorter: {
value: "*",
@@ -142,11 +143,14 @@
newData.forEach((item) => {
item.titleIcon = getPublicImage(item.icon, '', '160')
})
-
+ newData.unshift({
+ name: '鍏ㄩ儴',
+ refCode: '*'
+ })
this.setData({
tabList: newData
})
- console.log(this.data.tabList);
+ console.log(1, this.data.tabList);
})
},
@@ -159,34 +163,13 @@
},
selectTab(e) {
- console.log(e);
let index = e.detail.value
- console.log(index);
this.setData({
selectedIndex: index
})
-
- if (index == 0) {
- this.setData({
- path: this.data.tabList[0].refCode
- })
-
- } else if (index == 1) {
- this.setData({
- path: this.data.tabList[1].refCode
- })
-
- } else if (index == 2) {
- this.setData({
- path: this.data.tabList[2].refCode
- })
-
- } else if (index == 3) {
- this.setData({
- path: this.data.tabList[3].refCode
- })
-
- }
+ this.setData({
+ path: this.data.tabList[index].refCode
+ })
this.bookExhibitionGet()
},
diff --git a/pages/digitalTextbooks/index.wxml b/pages/digitalTextbooks/index.wxml
index ca81055..4ae678c 100644
--- a/pages/digitalTextbooks/index.wxml
+++ b/pages/digitalTextbooks/index.wxml
@@ -4,21 +4,48 @@
<view wx:if="{{!loading}}">
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
- <view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <view class="back-icon">
+ <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+ <image
+ src="/static/images/digitalTextbooks/chevron-left.png"
+ bind:tap="goBack"
+ mode="aspectFit"
+ />
</view>
- <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ユ暀鏉愬悕绉�/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
+ <t-search
+ model:value="{{searchValue}}"
+ shape="round"
+ placeholder="璇疯緭鍏ユ暀鏉愬悕绉�/ISBN/浣滆��"
+ class="navBar-search"
+ style="width: 464rpx"
+ bind:submit="searchBook"
+ />
</view>
<view class="heardTab">
<view class="tabBox">
- <t-tabs defaultValue="{{0}}" bind:change="selectTab" t-class="custom-tabs">
- <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}" style="{{tabPanelstyle}}">
+ <t-tabs
+ defaultValue="{{0}}"
+ bind:change="selectTab"
+ t-class="custom-tabs"
+ >
+ <t-tab-panel
+ wx:for="{{tabList}}"
+ wx:key="index"
+ wx:for-item="item"
+ label="{{item.name}}"
+ value="{{index}}"
+ style="{{tabPanelstyle}}"
+ >
</t-tab-panel>
</t-tabs>
</view>
<view class="dropdown">
<t-dropdown-menu>
- <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
+ <t-dropdown-item
+ options="{{sorter.options}}"
+ default-value="{{sorter.value}}"
+ bindchange="onSort"
+ />
</t-dropdown-menu>
</view>
</view>
@@ -30,15 +57,35 @@
<view>鏁板瓧鏁欐潗鍒楄〃</view>
</view>
</view>
- <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="outsideContentBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="bookContentBox">
- <view class="external" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="jumpDetails">
+ <view
+ class="external"
+ wx:for="{{digitalTextbooksData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ bind:tap="jumpDetails"
+ >
<view class="amountClick">
- <t-icon name="browse" size="15" data-name="{{item}}" bind:click="goBack" />
- <view style="margin-left: 5rpx;">{{item.viewCount}}</view>
+ <t-icon
+ name="browse"
+ size="15"
+ data-name="{{item}}"
+ bind:click="goBack"
+ />
+ <view style="margin-left: 5rpx">{{item.viewCount}}</view>
</view>
<view class="imageBox">
- <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" mode="" />
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ mode=""
+ />
</view>
<view class="bookName">{{item.name}}</view>
<view class="information">
@@ -58,5 +105,4 @@
</view>
</scroll-view>
</view>
-
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/digitalTextbooks/index.wxss b/pages/digitalTextbooks/index.wxss
index bd8a96f..0be4cab 100644
--- a/pages/digitalTextbooks/index.wxss
+++ b/pages/digitalTextbooks/index.wxss
@@ -9,6 +9,10 @@
height: 100%;
}
+.back-icon {
+ width: 48rpx;
+ height: 100%;
+}
.nacigationBar {
display: flex;
@@ -38,7 +42,8 @@
.dropdown {
z-index: 1;
width: 29vw;
- box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1);
+ /* box-shadow: 0px 3px 10px 1px rgba(0, 0, 0, 0.1); */
+ box-shadow: -2px 2px 7px -4px rgba(0, 0, 0, 0.1);
}
.t-dropdown-menu__item--active,
@@ -46,6 +51,11 @@
.t-checkbox__icon--checked {
color: #FF6C00 !important
}
+
+.t-dropdown-menu:after {
+ height: 0 !important;
+}
+
.t-tabs__item--active {
color: #FF6C00 !important;
@@ -90,9 +100,16 @@
margin-left: 15px;
width: 200rpx;
height: 36rpx;
+ font-family: "JDLANGZHENGTI";
/*瀹� 3.7 楂�1 */
}
+
+
+.titleTextBox view {
+ font-size: 32rpx;
+}
+
.titleTextBox image {
width: 100%;
height: 100%;
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index ab41099..f2b827b 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,22 +1,65 @@
<view class="container">
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" wx:if="{{!loading}}" bind:scroll="onScroll">
- <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
+ <t-pull-down-refresh
+ value="{{baseRefresh.value}}"
+ loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
+ bind:refresh="onPullDownRefresh"
+ wx:if="{{!loading}}"
+ bind:scroll="onScroll"
+ >
+ <view
+ class="background {{ isWhite ? 'white':''}}"
+ style="padding-top: {{barHeight}}px"
+ >
<text class="text">浜笀鏅烘暀</text>
</view>
<view class="home-page-header">
<view class="bg">
- <image src="/static/images/home/home-bg.png" mode="heightFix" class="image" />
+ <image
+ src="/static/images/home/home-bg.png"
+ mode="heightFix"
+ class="image"
+ />
</view>
<view class="search">
- <image class="icon" src="/static/images/home/nav_icon_scan.png" bindtap="onIconScanTap" />
- <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}">
- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
+ <image
+ class="icon"
+ src="/static/images/home/nav_icon_scan.png"
+ bindtap="onIconScanTap"
+ />
+ <t-search
+ t-class-input="t-search__input"
+ t-class-input-container="t-search__input-container"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�"
+ leftIcon=""
+ bind:submit="onRetrievalPage"
+ model:value="{{searchVal}}"
+ >
+ <t-icon
+ slot="left-icon"
+ prefix="wr"
+ name="search"
+ size="40rpx"
+ color="#bbb"
+ bind:tap="navToSearchPage"
+ />
</t-search>
</view>
<view class="swiper-wrap">
<!-- <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{ { type: 'dots' } }}" height="380rpx" bind:click="navToActivityDetail" /> -->
- <swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper">
- <swiper-item wx:for="{{bannerList}}" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="navToActivityDetail">
+ <swiper
+ interval="5000"
+ indicator-dots="true"
+ autoplay="true"
+ circular="true"
+ class="swiper"
+ >
+ <swiper-item
+ wx:for="{{bannerList}}"
+ wx:for-index="index"
+ wx:key="index"
+ data-info="{{item}}"
+ bindtap="navToActivityDetail"
+ >
<view class="swiperItem">
<image src="{{item.value}}" mode="widthFix" class="img" />
</view>
@@ -25,36 +68,78 @@
</view>
</view>
<view class="home-page-menu">
- <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
- <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
+ <t-grid
+ class="t-grid-block"
+ theme="card"
+ border="{{border}}"
+ column="{{5}}"
+ >
+ <t-grid-item
+ wx:for="{{tabList}}"
+ wx:for-index="index"
+ wx:key="index"
+ text="{{item.text}}"
+ image="{{item.icon}}"
+ data-info="{{item}}"
+ bindtap="toPages"
+ />
</t-grid>
</view>
<view class="home-page-container">
<view class="home-page-list">
<view class="tabCardPublic iconOne">
<view class="icon">
- <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/zhuantitaolun2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center">
+ <view
+ data-info="{{'zhuantitaolun'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ style="align-items: center"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="listBox">
- <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
- <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
+ <view
+ wx:for="{{specialSubjectList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="listItemBox"
+ >
+ <view
+ class="listItem"
+ bindtap="goSubjectDetail"
+ data-book="{{item}}"
+ >
<view class="specialSubject-img">
<image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
- <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
- <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view>
- <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
+ <view class="time" wx:if="{{item.liveTime}}"
+ >鐩存挱鏃堕棿锛歿{item.liveTime}}</view
+ >
+ <view class="time" wx:if="{{item.startTime}}"
+ >寮�鎾椂闂达細{{ item.startTime }}</view
+ >
+ <view class="time" wx:if="{{!item.liveTime && !item.startTime}}"
+ >寮�鎾椂闂达細<text class="grey">寰呭畾</text></view
+ >
<view class="flex jc-sb">
- <text class="author">{{item.lecturer}} {{item.position}}</text>
+ <text class="author"
+ >{{item.lecturer}} {{item.position}}</text
+ >
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
</view>
</view>
</view>
@@ -62,7 +147,11 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/tushufuwu2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/tushufuwu2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
<view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
<text class="more">鏇村</text>
@@ -70,16 +159,39 @@
</view>
</view>
<view class="home-page-tabs">
- <t-tabs t-class="t-tabs" split="{{false}}" position="{{'home'}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
- <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+ <t-tabs
+ t-class="t-tabs"
+ split="{{false}}"
+ position="{{'home'}}"
+ defaultValue="{{activeItem1}}"
+ bind:change="tabBookClick"
+ >
+ <t-tab-panel
+ wx:for="{{bookTypeList}}"
+ wx:for-index="index"
+ wx:key="index"
+ label="{{item.name}}"
+ value="{{index}}"
+ />
</t-tabs>
</view>
<view class="listBox2">
<view wx:if="{{booksList.length > 0}}" class="flex">
- <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+ <view
+ wx:for="{{booksList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
<view class="listItem" bind:tap="goDetail" data-book="{{item}}">
<view class="specialSubject-img">
- <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" class="img" aria-label="{{item.name}}" />
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFit"
+ class="img"
+ aria-label="{{item.name}}"
+ />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
@@ -95,35 +207,77 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/jingxuankecheng2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/jingxuankecheng2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
+ <view
+ data-info="{{'jingxuankecheng'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="home-page-tabs">
- <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
- <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+ <t-tabs
+ t-class="t-tabs"
+ split="{{false}}"
+ defaultValue="{{activeItem}}"
+ bind:change="tabChangeHandle"
+ >
+ <t-tab-panel
+ wx:for="{{courseTypeList}}"
+ wx:for-index="index"
+ wx:key="index"
+ label="{{item.name}}"
+ value="{{index}}"
+ />
</t-tabs>
</view>
<view class="listBox1">
<view wx:if="{{courseList.length>0}}">
- <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
+ <view
+ wx:for="{{courseList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="listItemBox"
+ >
<view class="listItem flex">
- <view class="specialSubject-img" data-book="{{item}}" bindtap="goCourseDetail">
- <image src="{{item.icon}}" mode="aspectFill" class="img" />
+ <view
+ class="specialSubject-img"
+ data-book="{{item}}"
+ bindtap="goCourseDetail"
+ >
+ <image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="body-info">
- <view class="name" data-book="{{item}}" bindtap="goCourseDetail">{{item.name}}</view>
+ <view
+ class="name"
+ data-book="{{item}}"
+ bindtap="goCourseDetail"
+ >{{item.name}}</view
+ >
<view class="flex jc-sb">
<text class="author">{{item.courseLeader}}</text>
<text class="classHours">{{item.classHours}}璇炬椂</text>
</view>
<view class="priceBox flex jc-sb">
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
+ <image
+ src="/static/images/home/home-cart.png"
+ mode="aspectFit"
+ class="addCartImg"
+ bind:tap="addCart"
+ data-info="{{item}}"
+ />
</view>
</view>
</view>
@@ -137,7 +291,11 @@
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/shuziyuedu2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/shuziyuedu2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
<view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
<text class="more">鏇村</text>
@@ -145,8 +303,18 @@
</view>
</view>
<view class="listBox2 flex">
- <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
- <view class="listItem" bind:tap="goReadBookDetail" data-book="{{item}}">
+ <view
+ wx:for="{{readBookList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
+ <view
+ class="listItem"
+ bind:tap="goReadBookDetail"
+ data-book="{{item}}"
+ >
<view class="specialSubject-img">
<image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
@@ -159,28 +327,64 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/shuzijiaocai2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/shuzijiaocai2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
+ <view
+ data-info="{{'shuzijiaocai'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="listBox3">
<view wx:if="{{textbookList.length > 0}}">
- <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
+ <view
+ wx:for="{{textbookList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="textbooksItemBox"
+ >
<view class="listItem flex">
- <view class="specialSubject-img" bind:tap="goTextBookDetail" data-book="{{item}}">
+ <view
+ class="specialSubject-img"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >
<image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="body-info">
- <view class="name" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.name}}</view>
- <view class="introduction" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.description}}</view>
+ <view
+ class="name"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >{{item.name}}</view
+ >
+ <view
+ class="introduction"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >{{item.description}}</view
+ >
<view class="author">{{item.author}}</view>
<view class="priceBox flex jc-sb">
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
+ <image
+ src="/static/images/home/home-cart.png"
+ mode="aspectFit"
+ class="addCartImg"
+ bind:tap="addCart"
+ data-info="{{item}}"
+ />
</view>
</view>
</view>
@@ -193,17 +397,37 @@
</view>
<view class="tabCardPublic">
<view class="icon">
- <image src="/static/images/home/paihangbang2.png" mode="" class="iconImage" />
+ <image
+ src="/static/images/home/paihangbang2.png"
+ mode=""
+ class="iconImage"
+ />
</view>
</view>
<view class="rankingList">
<scroll-view class="srcolbox" scroll-x scroll-with-animation="true">
<view class="booksListBox">
- <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+ <view
+ wx:for="{{rankingList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
<view class="listItem" bind:tap="goDetail" data-book="{{item}}">
<view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFit" class="img" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
+ <image
+ src="{{item.icon}}"
+ mode="aspectFit"
+ class="img"
+ wx:if="{{item.icon}}"
+ />
+ <image
+ src="/static/images/default-book-img.png"
+ mode="aspectFit"
+ class="img"
+ wx:else
+ />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
@@ -219,4 +443,4 @@
</t-pull-down-refresh>
</view>
<import src="home.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
\ No newline at end of file
+<template is="skeleton" wx:if="{{loading}}" />
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 88055e3..6886b17 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -559,6 +559,33 @@
}
});
},
+ openBookFair(event) {
+ const item = event.currentTarget.dataset.item
+ if (item.fileType == "pdf") {
+ wx.navigateTo({
+ url: "/packageBookService/pages/components/webView/index?md5=" +
+ item.freeFile +
+ "&fileName=" +
+ item.name +
+ "&fileType=" +
+ item.fileType + "&bookBuy=true"
+ // "&freePage=" +
+ // this.data.fileInfo.freePage +
+
+ +
+ "&bookId=" +
+ item.id,
+ });
+ } else {
+ Toast({
+ context: this,
+ selector: '#t-toast',
+ message: '姝や功涓嶈兘鏌ョ湅',
+ theme: 'warning',
+ direction: 'column',
+ });
+ }
+ },
onSearchSubmit() {
this.setData({
loading: true,
diff --git a/pages/retrievalPage/index.wxml b/pages/retrievalPage/index.wxml
index a097d87..4b1976a 100644
--- a/pages/retrievalPage/index.wxml
+++ b/pages/retrievalPage/index.wxml
@@ -4,7 +4,12 @@
<view class="outsideRetrievalPageBox" hidden="{{hidden}}">
<view class="retrievalPageBox">
<view class="example-search">
- <t-search bind:submit="onSearchSubmit" class="searchBox" model:value="{{searchVal}}" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" />
+ <t-search
+ bind:submit="onSearchSubmit"
+ class="searchBox"
+ model:value="{{searchVal}}"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ />
<view class="cancellation" bind:tap="onCancellation">鍙栨秷</view>
</view>
</view>
@@ -12,31 +17,68 @@
<!-- Tab甯冨眬 -->
<scroll-view scroll-x="{{true}}" class="scroll-x">
<view class="navBox">
- <view class="titleBox" wx:for="{{tabList}}" bindtap="tabsOn" data-idx="{{item.index}}">
+ <view
+ class="titleBox"
+ wx:for="{{tabList}}"
+ bindtap="tabsOn"
+ data-idx="{{item.index}}"
+ >
<view class="tabIndexBox">
- <text class="{{item.index == tabsId ? 'fontColorBox' : ''}}">{{item.title}} ({{item.bookTotal}}) </text>
+ <text class="{{item.index == tabsId ? 'fontColorBox' : ''}}"
+ >{{item.title}} ({{item.bookTotal}})
+ </text>
</view>
<hr class="{{item.index == tabsId ? 'lineBox' : ''}}" />
</view>
</view>
</scroll-view>
<!-- 鍐呭甯冨眬 -->
- <swiper class="swiperTtemBox" bindchange="slideOn" current="{{tabsId}}" circular>
+ <swiper
+ class="swiperTtemBox"
+ bindchange="slideOn"
+ current="{{tabsId}}"
+ circular
+ >
<!-- circular 鍚敤寰幆婊戝姩 -->
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="bookDataBox">
- <view class="bookDataForBox" wx:for="{{bookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBook">
+ <view
+ class="bookDataForBox"
+ wx:for="{{bookData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ bind:tap="onBook"
+ >
<view class="imageBox">
- <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
- <image wx:if="{{!item.icon}}" src="/static/images/default-book-img.png" mode="" />
+ <image
+ wx:if="{{item.icon}}"
+ src="{{item.icon}}"
+ mode="aspectFit"
+ />
+ <image
+ wx:if="{{!item.icon}}"
+ src="/static/images/default-book-img.png"
+ mode=""
+ />
</view>
<view class="bookDataNmae"> {{item.name}} </view>
<view class="bookDataAuthor">{{item.author}}</view>
</view>
</view>
<view wx:if="{{bookData.length}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<view wx:if="{{bookData.length <= 0}}" class="noDataBox">
@@ -46,11 +88,27 @@
</scroll-view>
</swiper-item>
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="listBox1">
<view>
- <view wx:for="{{courseData}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="listItemBox">
- <view class="listItem flex" data-item="{{item}}" bind:tap="underConstruction">
+ <view
+ wx:for="{{courseData}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ bindtap="toList"
+ data-info="{{item}}"
+ class="listItemBox"
+ >
+ <view
+ class="listItem flex"
+ data-item="{{item}}"
+ bind:tap="underConstruction"
+ >
<view class="specialSubject-img-box">
<image src="{{item.icon}}" mode="aspectFill" />
</view>
@@ -61,9 +119,17 @@
<text>{{item.classHours}}璇炬椂</text>
</view>
<view class="priceBox flex jc-sb">
- <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" />
+ <text class="price" wx:if="{{item.price == 0}}"
+ >鍏嶈垂</text
+ >
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
+ <image
+ src="/static/images/home/home-cart.png"
+ mode="aspectFill"
+ class="addCartImg"
+ />
</view>
</view>
</view>
@@ -71,7 +137,12 @@
</view>
</view>
<view wx:if="{{courseData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<view wx:if="{{courseData.length <= 0}}" class="noDataBox">
@@ -79,12 +150,23 @@
<empty />
</view>
</scroll-view>
-
</swiper-item>
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="bookDataBox">
- <view class="bookDataForBox" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="underConstruction">
+ <view
+ class="bookDataForBox"
+ wx:for="{{digitalTextbooksData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ data-item="{{item}}"
+ bind:tap="underConstruction"
+ >
<view class="imageBox">
<image src="{{item.icon}}" mode="" />
</view>
@@ -94,7 +176,12 @@
</view>
<view wx:if="{{digitalTextbooksData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<view wx:if="{{digitalTextbooksData.length <= 0}}" class="noDataBox">
@@ -102,32 +189,64 @@
<empty />
</view>
</scroll-view>
-
</swiper-item>
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="listBox">
- <view wx:for="{{seminarData}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox" data-item="{{item}}" bind:tap="underConstruction">
- <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
+ <view
+ wx:for="{{seminarData}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="listItemBox"
+ data-item="{{item}}"
+ bind:tap="underConstruction"
+ >
+ <view
+ class="listItem"
+ bindtap="goSubjectDetail"
+ data-book="{{item}}"
+ >
<view class="specialSubject-img">
<image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
- <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
- <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view>
- <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
+ <view class="time" wx:if="{{item.liveTime}}"
+ >鐩存挱鏃堕棿锛歿{item.liveTime}}</view
+ >
+ <view class="time" wx:if="{{item.startTime}}"
+ >寮�鎾椂闂达細{{ item.startTime }}</view
+ >
+ <view
+ class="time"
+ wx:if="{{!item.liveTime && !item.startTime}}"
+ >寮�鎾椂闂达細<text class="grey">寰呭畾</text></view
+ >
<view class="flex jc-sb">
- <text class="author">{{item.lecturer}} {{item.position}}</text>
+ <text class="author"
+ >{{item.lecturer}} {{item.position}}</text
+ >
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{seminarData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<view wx:if="{{seminarData.length <= 0}}" class="noDataBox">
@@ -135,18 +254,46 @@
<empty />
</view>
</scroll-view>
-
</swiper-item>
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="outsideHigherBox">
- <view class="higherBox" wx:for="{{bookFairData}}" wx:key="index" wx:for-item="item" wx:for-index="index">
+ <view
+ class="higherBox"
+ wx:for="{{bookFairData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ >
<view class="outsideHigherImageBox">
- <view class="higherImageBox" data-item="{{item}}">
- <image bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
- <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
- <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
- <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+ <view
+ class="higherImageBox"
+ bind:tap="openBookFair"
+ data-item="{{item}}"
+ >
+ <image src="{{item.icon}}" mode="aspectFill" />
+ <view
+ class="downloadIcon"
+ data-item="{{item}}"
+ data-key="showWithInput"
+ bind:tap="mailbox"
+ >
+ <image
+ wx:if="{{determine}}"
+ class="download"
+ src="/static/images/bibliographyList/email-click.png"
+ mode="aspectFit"
+ />
+ <image
+ wx:else=""
+ class="downloadshiftin"
+ src="/static/images/bibliographyList/email.png"
+ mode="aspectFit"
+ />
</view>
</view>
</view>
@@ -155,7 +302,12 @@
</view>
<view wx:if="{{bookFairData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
<view wx:if="{{bookFairData.length <= 0 }}" class="noDataBox">
@@ -165,31 +317,80 @@
</scroll-view>
</swiper-item>
<swiper-item>
- <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower">
+ <scroll-view
+ scroll-y="{{true}}"
+ class="scrollViewBox"
+ bindscrolltolower="onScrollToLower"
+ >
<view class="outside">
- <view class="contentBox" wx:for="{{biblioClassificationData}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
- <image class="bookFairImage" wx:if="{{item.icon}}" src="{{item.icon}}" mode="" />
- <image class="bookFairImage" wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
+ <view
+ class="contentBox"
+ wx:for="{{biblioClassificationData}}"
+ wx:key="index"
+ wx:for-item="item"
+ wx:for-index="index"
+ bindtap="onBookExhibitionDetails"
+ data-item="{{item}}"
+ >
+ <image
+ class="bookFairImage"
+ wx:if="{{item.icon}}"
+ src="{{item.icon}}"
+ mode=""
+ />
+ <image
+ class="bookFairImage"
+ wx:else=""
+ src="/static/images/bookExhibitionList/banner.png"
+ mode=""
+ />
<view class="textBox" title="{{item.name}}">
<text>{{item.subtitleName}}</text>
</view>
</view>
</view>
- <view wx:if="{{biblioClassificationData.length != 0}}" class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
+ <view
+ wx:if="{{biblioClassificationData.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 wx:if="{{biblioClassificationData.length <= 0}}" class="noDataBox">
+ <view
+ wx:if="{{biblioClassificationData.length <= 0}}"
+ class="noDataBox"
+ >
<!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</scroll-view>
</swiper-item>
</swiper>
- <view class="dialogBox">
- <t-dialog visible="{{showWithInput}}" title="璇疯緭鍏ラ偖绠�" confirm-btn="纭畾" cancel-btn="鍙栨秷" bind:confirm="onConfirm" bind:cancel="closeDialog">
- <t-input model:value="{{input}}" borderless class="dialog-input" clearable slot="content" placeholder="璇疯緭鍏ラ偖绠卞彿" placeholder-class="placeholder" bindchange="onEmailInput" />
- </t-dialog>
- </view>
</view>
-</view>
\ No newline at end of file
+ <view class="dialogBox" wx:if="{{showWithInput}}">
+ <t-dialog
+ visible="{{showWithInput}}"
+ title="璇疯緭鍏ラ偖绠�"
+ confirm-btn="纭畾"
+ cancel-btn="鍙栨秷"
+ bind:confirm="onConfirm"
+ bind:cancel="closeDialog"
+ >
+ <t-input
+ model:value="{{input}}"
+ borderless
+ class="dialog-input"
+ clearable
+ slot="content"
+ placeholder="璇疯緭鍏ラ偖绠卞彿"
+ placeholder-class="placeholder"
+ bindchange="onEmailInput"
+ />
+ </t-dialog>
+ </view>
+</view>
diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss
index 1a9e515..1483cdc 100644
--- a/pages/retrievalPage/index.wxss
+++ b/pages/retrievalPage/index.wxss
@@ -253,7 +253,7 @@
}
.outsideRetrievalPageBox {
- /* position: relative; */
+ position: relative;
}
.retrievalPageBox {
@@ -350,9 +350,14 @@
color: #ff6d00;
}
-/* .dialogBox .t-input__control {
- min-height: 100rpx;
-} */
+.dialogBox {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+ z-index: 999999;
+}
.t-button--text {
color: #000 !important;
diff --git a/static/images/digitalTextbooks/chevron-left.png b/static/images/digitalTextbooks/chevron-left.png
new file mode 100644
index 0000000..dea77c7
--- /dev/null
+++ b/static/images/digitalTextbooks/chevron-left.png
Binary files differ
--
Gitblit v1.9.1