From 08bcd17001c34265d77b684cfe1bfb1eb1a08113 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 27 三月 2024 16:34:47 +0800
Subject: [PATCH] 电子书，样书
---
/dev/null | 4
packageDomain/pages/sampleBookList/index.wxml | 4
packageDomain/pages/sampleBookList/index.wxss | 2
packageBookService/pages/bookServices/detail/index.json | 1
packageBookService/pages/bookServices/detail/index.wxml | 209 +++++++----------------------------------
packageBookService/pages/bookServices/detail/index.wxss | 1
packageDomain/pages/sampleBookList/index.js | 24 +---
packageBookService/pages/bookServices/detail/index.js | 2
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 2
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 6
10 files changed, 55 insertions(+), 200 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/webView/index.js b/packageBookService/pages/bookServices/detail/components/webView/index.js
deleted file mode 100644
index 6c5577c..0000000
--- a/packageBookService/pages/bookServices/detail/components/webView/index.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// packageBookService/pages/components/webView/index.js
-const app = getApp()
-Component({
- /**
- * 缁勪欢鐨勫睘鎬у垪琛�
- */
- properties: {
- fileInfo: {
- type: Object,
- value: {}
- }
- },
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
- src: "",
- link: false,
- epubObj: null,
- currentPage: '',
- },
-
- methods: {
- onLoadWeb(e) {
- console.log(e, "load")
- },
-
- onError(e) {
- console.log(e, "err")
- },
-
- setWebViewSrc() {
- var url = app.config.epubUrl +
- "?md5=" +
- this.properties.fileInfo.md5 +
- "&bookName=" +
- this.properties.fileInfo.bookName +
- "&url=" + app.config.requestCtx +
- "&token=" +
- wx.getStorageSync(app.config.tokenKey) +
- "&recordLocation=" +
- this.data.currentPage
- this.setData({
- src: url
- })
- },
-
- // 鑾峰彇UserKey
- getProgress() {
- app.MG.identity
- .getUserKey({
- domain: "bookReadProgress",
- keys: [this.properties.fileInfo.md5],
- })
- .then((res) => {
- if (res.length) {
- try {
- this.setData({
- currentPage: JSON.parse(res[0].value).page,
- });
- } catch (error) {
- this.setData({
- currentPage: "",
- });
- }
- if (this.data.currentPage > this.properties.fileInfo.freePage) {
- this.setData({
- currentPage: "",
- });
- }
- }
- this.setWebViewSrc();
- });
- },
- // 璁剧疆userKey
- setProgress(data) {
- if (data.page && data.page != this.data.currentPage) {
- app.MG.identity
- .setUserKey({
- setKeyRequests: [{
- domain: "bookReadProgress",
- key: this.properties.fileInfo.md5,
- value: JSON.stringify(data),
- },],
- })
- .then((res) => { });
- }
- },
-
- drawBack(e) {
- let {
- currentLocation,
- percentage,
- type
- } =
- e.detail.data[0];
- if (type == "progress" && type != "backDetail") {
- this.setProgress({
- page: currentLocation,
- progress: percentage,
- });
- } else if (type == "backDetail") {
- this.setProgress({
- page: 1,
- progress: "0%",
- });
- }
- },
- }
-})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/webView/index.json b/packageBookService/pages/bookServices/detail/components/webView/index.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/packageBookService/pages/bookServices/detail/components/webView/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/webView/index.wxml b/packageBookService/pages/bookServices/detail/components/webView/index.wxml
deleted file mode 100644
index 2cee560..0000000
--- a/packageBookService/pages/bookServices/detail/components/webView/index.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!--packageBookService/pages/components/webView/index.wxml-->
-<view class="page-body">
- <!-- <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}"></web-view> -->
-</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/webView/index.wxss b/packageBookService/pages/bookServices/detail/components/webView/index.wxss
deleted file mode 100644
index 06a98b7..0000000
--- a/packageBookService/pages/bookServices/detail/components/webView/index.wxss
+++ /dev/null
@@ -1,4 +0,0 @@
-.page-body {
- width: 100vw;
- height: 500rpx;
-}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index dfb39a6..88edf9f 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1447,7 +1447,7 @@
},
// 搴曢儴璐拱鎸夐挳
buyBtn() {
- if (this.data.tabValue == 'brief') {
+ if (this.data.tabValue == 'brief' && !this.data.bookBuy) {
this.buyBook()
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
diff --git a/packageBookService/pages/bookServices/detail/index.json b/packageBookService/pages/bookServices/detail/index.json
index 1d821e3..70692f3 100644
--- a/packageBookService/pages/bookServices/detail/index.json
+++ b/packageBookService/pages/bookServices/detail/index.json
@@ -13,7 +13,6 @@
"note": "/packageBookService/pages/bookServices/detail/components/note/note",
"tree": "/packageBookService/pages/bookServices/detail/components/tree/index",
"suggest": "/packageBookService/pages/bookServices/detail/components/suggest/suggest",
- "epub-view": "/packageBookService/pages/bookServices/detail/components/webView/index",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-dialog": "tdesign-miniprogram/dialog/dialog",
"t-toast": "tdesign-miniprogram/toast/toast",
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 8e0da9c..630ae8b 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,55 +4,30 @@
<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"
- />
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
- <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">
<view class="detail-left">
<view class="book-img">
- <image
- loading=""
- src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFill"
- aria-label="{{bookDetail.name}}"
- />
+ <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" 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>
@@ -74,24 +49,15 @@
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
- >鍑虹増鏃堕棿锛�</view
- >
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view
- class="message-li"
- wx:if="{{bookDetail.class}}"
- style="height: 80rpx"
- >
+ <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookDetail.class}}</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>
<!-- 閿�鍞俊鎭� -->
@@ -100,17 +66,12 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-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>
@@ -120,40 +81,16 @@
<view>
<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>
@@ -183,18 +120,13 @@
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
+ <!-- <t-tab-panel
label="鐢靛瓙涔�"
icon="{{tabValue == 'jsek_eBook' ? eBookClickIcon : eBookIcon}}"
value="jsek_eBook"
style="{{tabPanelstyle}}"
>
- <epub-view
- fileInfo="{{fileInfo}}"
- id="eBook"
- class="webView"
- ></epub-view>
- </t-tab-panel>
+ </t-tab-panel> -->
<t-tab-panel
label="鏁欏璧勬簮"
icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
@@ -224,12 +156,7 @@
wx:if="{{teach.length}}"
></tree>
</view>
- <t-loading
- theme="circular"
- size="60rpx"
- class="loading"
- loading="{{loading }}"
- />
+ <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
@@ -241,22 +168,8 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && learn.length}}">
- <learn-resource
- bind:getFreeResource="getFreeResource"
- bind:allAddShoppiingCar="allAddShoppiingCar"
- id="learn-resource"
- buyResourceData="{{buyResourceData}}"
- bookId="{{bookDetail.id}}"
- ></learn-resource>
- <tree
- id="tree"
- openIds="{{openLearnids}}"
- bookInfo="{{bookDetail}}"
- tab="{{tabValue}}"
- treeList="{{learn}}"
- buyIds="{{buyIdList}}"
- openLearnids="{{openLearnids}}"
- ></tree>
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
+ <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -269,11 +182,7 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && test.length}}">
- <test-resource
- list="{{test}}"
- bookInfo="{{bookDetail}}"
- mockData="{{mockData}}"
- ></test-resource>
+ <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -291,29 +200,13 @@
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
- <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="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>
@@ -321,50 +214,20 @@
<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="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
- bind:tap="addBookShopcCar"
- wx:if="{{tabValue != 'jsek_eBook'}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
- bind:tap="buyBtn"
- wx:if="{{tabValue != 'jsek_eBook'}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="shopCar shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy buyColor"
- bind:tap="buyBtn"
- wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="read buyColor"
- bind:tap="goRead"
- wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
- >绔嬪嵆鏌ョ湅</view
- >
+
+ <view class="shopCar {{((tabValue == 'brief' && bookBuy) || tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
+ <view class="buy {{((tabValue == 'brief' && bookBuy) ||tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
+ <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
+ <view class="buy shopCarColor" bind:tap="goRead" wx:if="{{tabValue == 'brief' && !bookBuy}}">鍦ㄧ嚎璇曡</view>
</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index cba567c..8a67355 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -264,6 +264,7 @@
.shopCar,
.buy {
+ font-size: 26rpx;
width: 25%;
display: flex;
align-items: center;
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 7c768b1..9c8dd5f 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -59,19 +59,19 @@
<view class="item">
<text class="label">濮撳悕锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.fullName}}" placeholder="璇疯緭鍏ュ鍚�" bindinput="bindTnputBlur" />
+ <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.fullName}}" placeholder="璇疯緭鍏ュ鍚�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
</view>
</view>
<view class="item">
<text class="label">鑱旂郴鐢佃瘽锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.phone}}" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" bindinput="bindTnputBlur" />
+ <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.phone}}" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
</view>
</view>
<view class="item">
<text class="label">璇︾粏鍦板潃锛�</text>
<view class="item-content">
- <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.detailedAddress}}" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" bindinput="bindTnputBlur" />
+ <input class="weui-input" name="userName" auto-focus="true" adjust-position="true" value="{{contactInfo.detailedAddress}}" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" bindinput="bindTnputBlur" adjust-position="{{false}}" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index e7c8141..b117cc3 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -1,5 +1,5 @@
page {
- background-color: #f0f2f5;
+ background-color: #f0f2f5 !important;
}
.container {
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 4634442..b06b523 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -132,6 +132,7 @@
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
}
+ this.getBookList(false);
},
@@ -159,7 +160,7 @@
this.setData({
num: this.data.paperBookList.length + this.data.electronicBookList.length
})
- this.getBookList(false);
+
},
goBack() {
wx.navigateBack();
@@ -621,6 +622,9 @@
this.setData({
alreadyElectronicBookList: list,
});
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ this.getBookList(false);
+ }
}
})
},
@@ -884,13 +888,6 @@
if (this.data.ebookCount > 0) {
const eBookData = this.data.electronicBookList
if (eBookData.length == 2) {
- if (this.data.bookList.length > 0) {
- this.data.bookList.forEach(i => {
- if (i.id == item.id) {
- i.electronChecked = false;
- }
- })
- }
item.electronChecked = false;
wx.showToast({
title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
@@ -918,6 +915,7 @@
this.setData({
num: this.data.electronicBookList.length + this.data.paperBookList.length
})
+ this.getBookList(false);
} else {
let list = this.data.electronicBookList;
list.forEach((obj, index) => {
@@ -936,6 +934,7 @@
num: list.length + this.data.paperBookList.length
})
wx.setStorageSync("electronicBookList", list);
+ this.getBookList(false);
}
} else {
wx.showToast({
@@ -948,6 +947,7 @@
num: 1 + this.data.paperBookList.length
})
wx.setStorageSync("electronicBookList", [itemAttr]);
+
}
} else {
item.electronChecked = false
@@ -961,13 +961,6 @@
if (this.data.paperBookCount > 0) {
const pBookData = this.data.paperBookList
if (pBookData.length == 2) {
- if (this.data.bookList.length > 0) {
- this.data.bookList.forEach(i => {
- if (i.id == item.id) {
- i.paperChecked = false;
- }
- })
- }
item.paperChecked = false
wx.showToast({
title: "姣忔鏈�澶氬彧鍙敵璇�2鏈牱涔�",
@@ -996,6 +989,7 @@
this.setData({
num: this.data.paperBookList.length + this.data.electronicBookList.length
})
+
} else {
let list = this.data.paperBookList;
list.forEach((obj, index) => {
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index eb74398..2dd041e 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -38,7 +38,7 @@
<view class="title">
<view class="line"></view>
<view class="icon">
- <t-image src="/static/images/home/yangshuliebiao.png" mode="heightFix" class="iconImage" />
+ <t-image src="/static/images/home/yangshuliebiao.png" mode="aspectFit" class="iconImage" />
</view>
</view>
<view class="book-list" wx:if="{{bookList.length > 0 && !skeletonLoding}}">
@@ -51,7 +51,7 @@
<view class="book-author book-color">{{item.author}}</view>
<view class="checkbox">
<t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' default-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" default-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' class="eBook" default-checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
</view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index f34a04f..b294c02 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -153,10 +153,12 @@
.title .icon {
height: 36rpx;
+ width: 160rpx;
line-height: 60rpx;
}
.title .icon .iconImage {
+ width: 100%;
height: 100%;
}
--
Gitblit v1.9.1