From 326467df08eb1af36cce83ac161addaa947e2e82 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 29 三月 2024 19:31:17 +0800
Subject: [PATCH] css
---
packageBookService/pages/components/webView/index.wxml | 2
pages/home/home.js | 27 +++++++++++++
assets/js/config.js | 2 +
packageDomain/pages/sampleBookList/index.js | 1
packageBookService/pages/bookServices/detail/index.js | 2
pages/home/home.wxml | 2
pages/personalCenter/index.js | 2
packageBookService/pages/components/webView/index.js | 53 ++++++++++++++++++++------
pages/home/home.wxss | 1
9 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/assets/js/config.js b/assets/js/config.js
index 3c3802f..e8f0417 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -4,6 +4,7 @@
// export const appId = 3;
// export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
export const epubUrl = "http://jsysf.bnuic.com/epubReadMobile/#/";
+export const pdfUrl = "http://182.92.203.7:3007/pdfRead/"
export const requestTimeOut = 300000; // 璇锋眰瓒呮椂鏃堕棿
export const tokenKey = "jsek-token";
export const userInfoKey = "website-front-userInfo"; // 鐢ㄦ埛淇℃伅key
@@ -37,6 +38,7 @@
reg_tel,
reg_telphone,
epubUrl,
+ pdfUrl,
appId
};
export default config;
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 969db46..dfc5171 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1513,7 +1513,7 @@
return false;
}
wx.navigateTo({
- url: '/packageBookService/pages/components/webView/index?md5=' + this.data.fileInfo.md5 + '&fileName=' + this.data.fileInfo.bookName + '&fileType=' + this.data.fileInfo.fileType + '&freePage=' + this.data.fileInfo.freePage
+ url: '/packageBookService/pages/components/webView/index?md5=' + this.data.fileInfo.md5 + '&fileName=' + this.data.fileInfo.bookName + '&fileType=' + this.data.fileInfo.fileType + '&freePage=' + this.data.fileInfo.freePage + '&bookBuy=' + this.data.bookBuy
})
},
diff --git a/packageBookService/pages/components/webView/index.js b/packageBookService/pages/components/webView/index.js
index 452b945..02bafaa 100644
--- a/packageBookService/pages/components/webView/index.js
+++ b/packageBookService/pages/components/webView/index.js
@@ -44,16 +44,43 @@
},
setWebViewSrc: function (data) {
- var url = app.config.epubUrl +
- "?md5=" +
- data.md5 +
- "&bookName=" +
- data.fileName +
- "&url=" + app.config.requestCtx +
- "&token=" +
- wx.getStorageSync(app.config.tokenKey) +
- "&recordLocation=" +
- this.data.currentPage
+ var url = "";
+ if (data.fileType == 'epub') {
+ if (data.bookBuy) {
+ url = app.config.epubUrl +
+ "?md5=" +
+ data.md5 +
+ "&bookName=" +
+ data.fileName +
+ "&url=" + app.config.requestCtx +
+ "&token=" +
+ wx.getStorageSync(app.config.tokenKey) +
+ "&recordLocation=" +
+ this.data.currentPage
+ } else {
+ url = app.config.epubUrl +
+ "?md5=" +
+ data.md5 +
+ "&bookName=" +
+ data.fileName +
+ "&url=" + app.config.requestCtx +
+ "&token=" +
+ wx.getStorageSync(app.config.tokenKey) +
+ "&recordLocation=" +
+ this.data.currentPage + "&freeEpubPage=" + data.freePage
+ }
+ } else {
+ url = app.config.pdfUrl +
+ "?md5=" +
+ data.md5 +
+ "&bookName=" +
+ data.fileName +
+ "&url=" + app.config.requestCtx +
+ "&token=" +
+ wx.getStorageSync(app.config.tokenKey) +
+ "&recordLocation=" +
+ this.data.currentPage;
+ }
this.setData({
src: url
})
@@ -96,9 +123,9 @@
domain: "bookReadProgress",
key: this.data.epubObj.md5,
value: JSON.stringify(data),
- },],
+ }, ],
})
- .then((res) => { });
+ .then((res) => {});
}
},
@@ -108,7 +135,7 @@
percentage,
type
} =
- e.detail.data[0];
+ e.detail.data[0];
if (type == "progress" && type != "backDetail") {
this.setProgress({
page: currentLocation,
diff --git a/packageBookService/pages/components/webView/index.wxml b/packageBookService/pages/components/webView/index.wxml
index ec0dfb5..5013daf 100644
--- a/packageBookService/pages/components/webView/index.wxml
+++ b/packageBookService/pages/components/webView/index.wxml
@@ -1,4 +1,4 @@
<!--packageBookService/pages/components/webView/index.wxml-->
<view class="page-body">
- <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}"></web-view>
+ <web-view bind:message="drawBack" binderror="onError" bindload="onLoadWeb" src="{{src}}" id="webView"></web-view>
</view>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 03844cf..9d63ba3 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -314,7 +314,6 @@
this.setData({
'secondList.value': second
})
- console.log(this.data.secondList.options)
});
},
// 鑾峰彇閲嶇偣椤圭洰
diff --git a/pages/home/home.js b/pages/home/home.js
index 5122f72..39bb7c2 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -500,8 +500,33 @@
onMoreGuide(e) {
let type = e.currentTarget.dataset.info
if (type == "tushufuwu") {
+ let assortCode = "";
+ if (this.data.bookTypeData.name == '楂樼瓑鏁欒偛') {
+ assortCode = "jsek_higherEducation"
+ }
+ if (this.data.bookTypeData.name == '鑱屼笟鏁欒偛') {
+ assortCode = "jsek_vocationalEducation"
+ }
+ if (this.data.bookTypeData.name == '鏁欏笀鏁欒偛') {
+ assortCode = "jsek_teacherEducation"
+ }
+ if (this.data.bookTypeData.name == '灏戝効鏁欒偛') {
+ assortCode = "jsek_childrenEducation"
+ }
+ if (this.data.bookTypeData.name == '鑰冭瘯鍩硅') {
+ assortCode = "jsek_examTraining"
+ }
+ if (this.data.bookTypeData.name == '涓婚鍑虹増') {
+ assortCode = "jsek_themePublishing"
+ }
+ if (this.data.bookTypeData.name == '瀛︽湳钁椾綔') {
+ assortCode = "jsek_academicWorks"
+ }
+ if (this.data.bookTypeData.name == '澶т紬璇荤墿') {
+ assortCode = "jsek_popularReadingMaterials"
+ }
wx.navigateTo({
- url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name
+ url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name + '&assortCode=' + assortCode
})
} else if (type == "shuziyuedu") {
wx.navigateTo({
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 61a1f7a..d965282 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -21,7 +21,7 @@
</view>
</swiper-item>
</swiper>
- <view class="body-loading" wx:else="">
+ <view class="body-loading" wx:else>
<t-loading theme="circular" size="40rpx" class="wrapper" />
</view>
</view>
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 480c400..54fd68c 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -65,6 +65,7 @@
display: flex;
align-items: center;
justify-content: center;
+ background: #f6f6f6;
}
.swiper {
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 6d450dd..bbeb19f 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -47,7 +47,7 @@
{
title: '鍑轰功鐢宠',
icon: '/static/images/personal/chushu.png',
- url: '/packagePersonal/pages/publishBooks/index',
+ url: '',
type: 'publishBooks',
}
];
--
Gitblit v1.9.1