From e060ad2b2da9884e00b36796548eacc6a2b9a5d3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 29 三月 2024 09:44:30 +0800
Subject: [PATCH] 图书详情，列表页bug修改
---
packageBookService/pages/bookServices/list/index.wxml | 186 ++++++++--
packageBookService/pages/bookServices/list/index.wxss | 41 ++
packageDomain/pages/sampleBookList/index.wxss | 2
packageBookService/pages/bookServices/detail/index.json | 3
packageBookService/pages/bookServices/detail/index.wxml | 13
packageBookService/pages/bookServices/detail/index.wxss | 7
packageBookService/pages/bookServices/detail/components/suggest/suggest.js | 21
packageBookService/pages/bookServices/examination/examination.json | 3
/dev/null | 1
packageBookService/pages/bookServices/list/index.json | 3
packageBookService/pages/bookServices/detail/components/tree/index.js | 130 ++++---
packageBookService/pages/bookServices/list/index.js | 31 +
pages/bookServices/assort/index.json | 2
pages/bookServices/assort/index.wxml | 246 +++++++-------
packageBookService/pages/bookServices/detail/buyResource/index.json | 3
packageBookService/pages/bookServices/detail/index.js | 205 +++++++----
pages/bookServices/assort/index.wxss | 4
packageBookService/pages/bookServices/detail/components/testResource/testResource.json | 3
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 98 +----
19 files changed, 582 insertions(+), 420 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.json b/packageBookService/pages/bookServices/detail/buyResource/index.json
index 17a46f1..71422da 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.json
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.json
@@ -5,5 +5,6 @@
"t-loading": "tdesign-miniprogram/loading/loading",
"t-button": "tdesign-miniprogram/button/button"
},
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "disableScroll": true
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
index c6e2f09..aeb70a6 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
@@ -61,16 +61,15 @@
})
},
async feedBack() {
- const token = wx.getStorageSync('jsek-token')
- if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
- }
- })
- }
-
+ // const token = wx.getStorageSync('jsek-token')
+ // if (!token) {
+ // return wx.getUserProfile({
+ // desc: '鐢ㄦ埛鐧诲綍',
+ // success: (res) => {
+ // console.log(res);
+ // }
+ // })
+ // }
let content = {
source: this.data.ratevalue,
phone: this.data.inputvalue,
@@ -124,4 +123,4 @@
await this.feedBack()
}
},
-})
+})
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.js b/packageBookService/pages/bookServices/detail/components/tag/index.js
deleted file mode 100644
index bc0a86a..0000000
--- a/packageBookService/pages/bookServices/detail/components/tag/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// packageBookService/pages/bookServices/detail/components/tag/index.js
-Component({
- /**
- * 缁勪欢鐨勫睘鎬у垪琛�
- */
- properties: {
-
- },
-
- /**
- * 缁勪欢鐨勫垵濮嬫暟鎹�
- */
- data: {
- list: [
- { id: 1, name: '鍥句功绠�浠�' },
- { id: 2, name: '鐢靛瓙涔�' },
- { id: 3, name: '鏁欏璧勬簮' },
- { id: 2, name: '浜戝涔�' },
- { id: 2, name: '浜戞祴璇�' },
- { id: 2, name: '浜戠瑪璁�' },
- ]
- },
-
- /**
- * 缁勪欢鐨勬柟娉曞垪琛�
- */
- methods: {
-
- }
-})
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.json b/packageBookService/pages/bookServices/detail/components/tag/index.json
deleted file mode 100644
index e8cfaaf..0000000
--- a/packageBookService/pages/bookServices/detail/components/tag/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/tag/index.wxml b/packageBookService/pages/bookServices/detail/components/tag/index.wxml
deleted file mode 100644
index 58943ab..0000000
--- a/packageBookService/pages/bookServices/detail/components/tag/index.wxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--packageBookService/pages/bookServices/detail/components/tag/index.wxml-->
-<scroll-view scroll-x="{{true}}">
- <view wx:for="{{list}}" wx:key="id">
- <view>
- <text>{{item.name}}</text>
- </view>
- </view>
-</scroll-view>
diff --git a/packageBookService/pages/bookServices/detail/components/tag/index.wxss b/packageBookService/pages/bookServices/detail/components/tag/index.wxss
deleted file mode 100644
index e5506f6..0000000
--- a/packageBookService/pages/bookServices/detail/components/tag/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* packageBookService/pages/bookServices/detail/components/tag/index.wxss */
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.json b/packageBookService/pages/bookServices/detail/components/testResource/testResource.json
index e0cdc61..d4a6209 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.json
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.json
@@ -4,6 +4,7 @@
"t-button": "tdesign-miniprogram/button/button",
"t-image": "tdesign-miniprogram/image/image",
"t-radio": "tdesign-miniprogram/radio/radio",
- "t-radio-group": "tdesign-miniprogram/radio-group/radio-group"
+ "t-radio-group": "tdesign-miniprogram/radio-group/radio-group",
+ "t-empty": "tdesign-miniprogram/empty/empty"
}
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index 700ecc7..d15b141 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -1,59 +1,31 @@
<!--pages/bookServices/detail/components/testResource/testResource.wxml-->
<view class="test-resource">
<view class="top-btn">
- <t-radio-group
- class="test-radio"
- t-class="horizontal-box"
- value="{{radioItem}}"
- bind:change="onRadioChange"
- style="margin: 0 10rpx 0 0"
- >
+ <t-radio-group class="test-radio" t-class="horizontal-box" value="{{radioItem}}" bind:change="onRadioChange" style="margin: 0 10rpx 0 0">
<view class="card {{radioItem == 'test' ? 'card--active' : ''}}">
<t-radio value="test" icon="none" borderless style="height: 80rpx">
<view class="radio-content" slot="content">
- <image
- src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
- ></image>
- <text style="color: {{radioItem == 'test' ? '#fff':''}};"
- >缁冧範</text
- >
+ <image src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"></image>
+ <text style="color: {{radioItem == 'test' ? '#fff':''}};">缁冧範</text>
</view>
</t-radio>
</view>
<view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
<t-radio value="mock" icon="none" borderless style="height: 80rpx">
<view class="radio-content" slot="content">
- <image
- src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
- ></image>
- <text style="color: {{radioItem == 'mock' ? '#fff':''}};"
- >缁勫嵎</text
- >
+ <image src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"></image>
+ <text style="color: {{radioItem == 'mock' ? '#fff':''}};">缁勫嵎</text>
</view>
</t-radio>
</view>
</t-radio-group>
- <t-button
- class="error-btn"
- theme="default"
- size="medium"
- style="padding: 0 12rpx"
- bind:tap="goMycollect"
- data-answerType="errorQuestion"
- >
+ <t-button class="error-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="errorQuestion">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/cuoti.png"></image>
<text>鎴戠殑閿欓</text>
</view>
</t-button>
- <t-button
- class="collect-btn"
- theme="default"
- size="medium"
- style="padding: 0 12rpx"
- bind:tap="goMycollect"
- data-answerType="collectQuestion"
- >
+ <t-button class="collect-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="collectQuestion">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/wodeshoucang.png"></image>
<text> 鎴戠殑鏀惰棌</text>
@@ -61,12 +33,7 @@
</t-button>
</view>
<!-- 缁冧範鍒楄〃 -->
- <view
- class="resource-list"
- wx:for="{{list}}"
- wx:key="id"
- wx:if="{{radioItem == 'test'}}"
- >
+ <view class="resource-list" wx:for="{{list}}" wx:key="id" wx:if="{{radioItem == 'test'}}">
<view class="list-title">
<image src="/static/images/bookService/detail/test-icon.png"></image>
<text>{{item.name}}</text>
@@ -77,53 +44,38 @@
</view>
</view>
+<view wx:if="{{noResources}}" class="noData" wx:if="{{radioItem == 'test' && !list.length}}">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+</view>
+
<!-- 缁勫嵎鍒楄〃 -->
<view class="mock-data" wx:if="{{radioItem == 'mock'}}">
- <view wx:if="{{mockData.mockList.length}}">
+ <view>
<view class="mack-num">
<text>宸茬粍鍗穥{mockData.mockList.length}}娆�</text>
<t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
</view>
- <view class="mock-list">
- <view
- class="mock-list-box"
- wx:for="{{mockData.mockList}}"
- wx:key="id"
- data-item="{{item}}"
- bind:tap="goMackPaper"
- >
+ <view class="mock-list" wx:if="{{mockData.mockList.length}}">
+ <view class="mock-list-box" wx:for="{{mockData.mockList}}" wx:key="id" data-item="{{item}}" bind:tap="goMackPaper">
<view class="mock-title">{{item.name}}</view>
<view class="mock-message">
<view class="message-box">
<view class="mack-state">
- <text wx:if="{{item.state == '3'}}" class="complete state-pad"
- >宸插畬鎴�</text
- >
- <text
- wx:elif="{{item.state == '2' || item.state == '1'}}"
- class="Incomplete state-pad"
- >鏈畬鎴�</text
- >
+ <text wx:if="{{item.state == '3'}}" class="complete state-pad">宸插畬鎴�</text>
+ <text wx:elif="{{item.state == '2' || item.state == '1'}}" class="Incomplete state-pad">鏈畬鎴�</text>
<text wx:else class="Incomplete state-pad">鏈紑濮�</text>
</view>
<view class="mock-time">{{item.createDate}}</view>
</view>
- <view class="mock-score" wx:if="{{item.state == '3'}}"
- >{{item.report.userScore}}鍒�</view
- >
+ <view class="mock-score" wx:if="{{item.state == '3'}}">{{item.report.userScore}}鍒�</view>
</view>
</view>
</view>
+ <view wx:else class="not-mock">
+ <image src="/static/images/bookService/examination/zhuangtai-icon.png"></image>
+ <view class="not-mock-message note-mock-text">缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view>
+ <view class="note-mock-price note-mock-text">浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view>
+ </view>
+
</view>
- <view wx:else class="not-mock">
- <image
- src="/static/images/bookService/examination/zhuangtai-icon.png"
- ></image>
- <view class="not-mock-message note-mock-text"
- >缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view
- >
- <view class="note-mock-price note-mock-text"
- >浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view
- >
- </view>
-</view>
+</view>
\ 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 675c529..715f67e 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -1,5 +1,7 @@
-import Message from 'tdesign-miniprogram/message/message';
const util = require('./components/util') // 寮曞叆灏佽杩囩殑鍔犺浇鎻愮ず
+import {
+ loginInfo
+} from '../../../../../../assets/js/login'
const app = getApp()
Component({
// checked: false,
@@ -127,71 +129,75 @@
},
// 璺宠浆闊宠棰戞挱鏀惧櫒
goPlayer(e) {
- if (this.properties.isShowCheck) return true
- const item = e.currentTarget.dataset.item
- const parent = e.currentTarget.dataset.parent
- let url
- if (item.selectType == 'video' || item.learnSelectType == 'video') {
- url = '/packageDomain/pages/resourceDetails/myVideo/index'
- } else if (item.selectType == 'audio' || item.learnSelectType == 'audio') {
- url = '/packageDomain/pages/resourceDetails/myAudio/index'
- } else if (item.selectType == 'picture' || item.selectType == 'zip') {
- url = '/packageDomain/pages/resourceDetails/document/index'
- }
- if (this.properties.tab == 'jsek_cloudLearning' && this.resourceIsBuy(item)) {
- return wx.showToast({
- icon: 'error',
- title: '璇峰厛璐拱璇ヨ祫婧�',
- })
- }
- wx.navigateTo({
- url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parent.productLinkPath}&parentName=${parent.name}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}`,
- })
-
-
- if (item.selectType == 'document' || item.selectType == 'pdf') {
- const fileLink = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
- console.log(fileLink, 'fileLink');
- //鎻愮ず鍔犺浇涓�
- util.showLoading()
- // 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
- wx.downloadFile({
- url: fileLink, // 鍦板潃宸叉墦鐮侊紝鑷繁鎹釜鍏朵粬鐨勫湴鍧�锛�"https://www.xxxxx.com/file/娴嬭瘯閫氱煡.pdf"锛�
- success: function (res) {
- console.log(res, "wx.downloadFile success res")
- if (res.statusCode != 200) {
- util.hideLoadingWithErrorTips()
- return false
- }
- var Path = res.tempFilePath //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
- wx.openDocument({
- filePath: Path,
- showMenu: true,
- success: function (res) {
- console.log('鎵撳紑鎴愬姛');
- util.hideLoading()
- }
- })
- },
- fail: function (err) {
- console.log(err, "wx.downloadFile fail err");
- util.hideLoadingWithErrorTips()
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
}
})
-
-
- }
-
- if (item.selectType == 'webpage') {
- console.log(11);
- this.setData({
- webpageSrc: item.jsek_link
+ } else {
+ if (this.properties.isShowCheck) return true
+ const item = e.currentTarget.dataset.item
+ const parent = e.currentTarget.dataset.parent
+ let url
+ if (item.selectType == 'video' || item.learnSelectType == 'video') {
+ url = '/packageDomain/pages/resourceDetails/myVideo/index'
+ } else if (item.selectType == 'audio' || item.learnSelectType == 'audio') {
+ url = '/packageDomain/pages/resourceDetails/myAudio/index'
+ } else if (item.selectType == 'picture' || item.selectType == 'zip') {
+ url = '/packageDomain/pages/resourceDetails/document/index'
+ }
+ if (this.properties.tab == 'jsek_cloudLearning' && this.resourceIsBuy(item)) {
+ return wx.showToast({
+ icon: 'error',
+ title: '璇峰厛璐拱璇ヨ祫婧�',
+ })
+ }
+ wx.navigateTo({
+ url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parent.productLinkPath}&parentName=${parent.name}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}`,
})
- console.log(this.data.webpageSrc, 'webpageSrc');
+ if (item.selectType == 'document' || item.selectType == 'pdf') {
+ const fileLink = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
+ console.log(fileLink, 'fileLink');
+ //鎻愮ず鍔犺浇涓�
+ util.showLoading()
+ // 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
+ wx.downloadFile({
+ url: fileLink, // 鍦板潃宸叉墦鐮侊紝鑷繁鎹釜鍏朵粬鐨勫湴鍧�锛�"https://www.xxxxx.com/file/娴嬭瘯閫氱煡.pdf"锛�
+ success: function (res) {
+ console.log(res, "wx.downloadFile success res")
+ if (res.statusCode != 200) {
+ util.hideLoadingWithErrorTips()
+ return false
+ }
+ var Path = res.tempFilePath //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
+ wx.openDocument({
+ filePath: Path,
+ showMenu: true,
+ success: function (res) {
+ console.log('鎵撳紑鎴愬姛');
+ util.hideLoading()
+ }
+ })
+ },
+ fail: function (err) {
+ console.log(err, "wx.downloadFile fail err");
+ util.hideLoadingWithErrorTips()
+ }
+ })
+ }
+ if (item.selectType == 'webpage') {
+ this.setData({
+ webpageSrc: item.jsek_link
+ })
+ console.log(this.data.webpageSrc, 'webpageSrc');
+ }
}
-
-
-
},
// 鎷垮埌鎵�鏈夐」
getAllChildren(id) {
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 91a8109..969db46 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1,7 +1,9 @@
// pages/bookServices/detail/index.js
-import Message from 'tdesign-miniprogram/message/index.js';
import Toast from 'tdesign-miniprogram/toast';
-import tool from '../../../../assets/js/toolClass'
+import tool from '../../../../assets/js/toolClass';
+import {
+ loginInfo
+} from '../../../../assets/js/login'
const app = getApp();
Page({
/**
@@ -70,6 +72,7 @@
paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁�
ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁�
userInfo: {},
+ pageLoading: true,
fileInfo: {
bookName: "",
fileType: "",
@@ -132,6 +135,22 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ // const token = wx.getStorageSync(app.config.tokenKey)
+ // if (!token) {
+ // loginInfo(app, (data) => {
+ // // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ // if (data) {
+ // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ // } else {
+ // // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ // }
+ // })
+ // } else {
+ // // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ // }
+
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -149,7 +168,7 @@
this.getBookInfo(options.id);
this.getResourceClass() // 鑾峰彇璧勬簮鎵�灞炲垎绫�
- const token = wx.getStorageSync('jsek-token')
+ const token = wx.getStorageSync(app.config.tokenKey)
if (token) {
this.getShoppingCartProductGet()
this.getApplyInfo(options.id)
@@ -281,7 +300,7 @@
this.setData({
"mockData'.id": 0,
"mockData.price": 0,
- "mockData.count": 0
+ "mockData.count": 0,
})
const query = {
path: '*',
@@ -359,6 +378,7 @@
'bookDetail.price': this.numFormat(this.data.bookDetail.price),
'bookDetail.oldPrice': this.numFormat(this.data.bookDetail.oldPrice),
'bookDetail.paperPrice': this.numFormat(this.data.bookDetail.paperPrice),
+ pageLoading: false
});
console.log('鍥句功淇℃伅', this.data.bookDetail);
});
@@ -485,45 +505,68 @@
},
// 鏀惰棌
setCollect() {
- if (this.data.bookDetail.isFavourite) {
- app.MG.store
- .delProductLink({
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ this.getBookInfo(this.data.bookId)
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ }
+ })
+ } else {
+ debugger
+ if (this.data.bookDetail.isFavourite) {
+ app.MG.store
+ .delProductLink({
+ productIds: [this.data.bookDetail.id],
+ linkType: 'FavoriteBookCity',
+ })
+ .then(() => {
+ this.setData({
+ 'bookDetail.isFavourite': false
+ })
+ });
+ } else {
+ const params = {
productIds: [this.data.bookDetail.id],
linkType: 'FavoriteBookCity',
- })
- .then(() => {
+ };
+ app.MG.store.addProductLink(params).then((res) => {
this.setData({
- 'bookDetail.isFavourite': false
+ 'bookDetail.isFavourite': true
})
- Message.success({
- context: this,
- offset: [20, 32],
- duration: 5000,
- content: '杩欐槸涓�鏉℃垚鍔熺殑鎻愮ず娑堟伅',
- });
});
- } else {
- const params = {
- productIds: [this.data.bookDetail.id],
- linkType: 'FavoriteBookCity',
- };
- app.MG.store.addProductLink(params).then((res) => {
- this.setData({
- 'bookDetail.isFavourite': true
- })
- Message.success({
- context: this,
- offset: ['20rpx', '32rpx'],
- duration: 2000,
- content: '鏀惰棌鎴愬姛',
- });
- });
+ }
}
+
},
// 鎴戣寤鸿
suggestBtn() {
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
const child = this.selectComponent('#suggest-component')
- child.showDialog()
+ if (!token) {
+ wx.showLoading({
+ title: '鍔犺浇涓�',
+ })
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ child.showDialog()
+ wx.hideLoading()
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ }
+ })
+ } else {
+ // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ child.showDialog()
+ }
},
// 璺宠浆缃戝簵
goShop(e) {
@@ -559,20 +602,18 @@
})
}
} else if (e.detail.label == '浜戠瑪璁�') {
- const token = wx.getStorageSync('jsek-token')
+ const token = wx.getStorageSync(app.config.tokenKey)
const child = this.selectComponent('#note')
child.handleSubmitTitle()
if (token) {
child.changeLoading()
child.getNoteList()
}
-
} else if (e.detail.label == '鐢靛瓙涔�') {
const child = this.selectComponent('#eBook')
if (child) {
child.getProgress()
}
-
}
},
// 鑾峰彇璧勬簮鎵�灞炲垎绫�
@@ -775,9 +816,7 @@
// 鍥句功娣诲姞璐墿杞�
async addBookShopcCar() {
-
if (!this.data.expire) {
-
const token = wx.getStorageSync('jsek-token')
if (!token) {
return wx.getUserProfile({
@@ -1197,54 +1236,57 @@
// 浜戝涔犱竴閿鍙�
async getFreeResource() {
const child = this.selectComponent('#learn-resource')
- const token = wx.getStorageSync('jsek-token')
+ const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
}
})
- }
- let arr = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
- let freeIds = arr.filter((item) => {
- return item.saleMethod[0].Price == 0
- })
- if (!freeIds.length) return wx.showToast({
- icon: "error",
- title: '鏆傛棤鍏嶈垂璧勬簮',
- })
- child.changeReceive(true)
- let requests = []
- freeIds.forEach((item, index) => {
- if (this.resourceIsBuy(item)) {
- requests.push({
- saleMethodId: item.saleMethod[0].Id,
- count: 1
- })
- }
- })
+ } else {
+ let arr = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
+ let freeIds = arr.filter((item) => {
+ return item.saleMethod[0].Price == 0
+ })
+ if (!freeIds.length) return wx.showToast({
+ icon: "error",
+ title: '鏆傛棤鍏嶈垂璧勬簮',
+ })
+ child.changeReceive(true)
+ let requests = []
+ freeIds.forEach((item, index) => {
+ if (this.resourceIsBuy(item)) {
+ requests.push({
+ saleMethodId: item.saleMethod[0].Id,
+ count: 1
+ })
+ }
+ })
- let query = {
- remarks: '浜戝涔�',
- requests,
- }
- try {
- const initOrderRes = await app.MG.store.initOrder(query)
- let parameter = {
- orderNum: initOrderRes.orderNumber
+ let query = {
+ remarks: '浜戝涔�',
+ requests,
}
- // 纭璁㈠崟
- const confirmOrderRes = await app.MG.store.confirmOrder(parameter)
- if (confirmOrderRes.orderNumber) {
- child.changeReceive(false)
- wx.showToast({
- title: '棰嗗彇鎴愬姛',
- })
- this.getBookInfo(this.data.bookId)
+ try {
+ const initOrderRes = await app.MG.store.initOrder(query)
+ let parameter = {
+ orderNum: initOrderRes.orderNumber
+ }
+ // 纭璁㈠崟
+ const confirmOrderRes = await app.MG.store.confirmOrder(parameter)
+ if (confirmOrderRes.orderNumber) {
+ child.changeReceive(false)
+ wx.showToast({
+ title: '棰嗗彇鎴愬姛',
+ })
+ this.getBookInfo(this.data.bookId)
+ }
+ } catch (error) {
+ console.log(error)
}
- } catch (error) {
- console.log(error)
}
},
// 浜戝涔犱竴閿喘涔�
@@ -1453,8 +1495,7 @@
buyBtn() {
if (this.data.tabValue == 'brief' && !this.data.bookBuy) {
this.buyBook()
- }
- else if (this.data.tabValue == 'jsek_cloudLearning') {
+ } else if (this.data.tabValue == 'jsek_cloudLearning') {
const tree = this.selectComponent('#tree')
tree.onCloudShoppingCart()
} else {
diff --git a/packageBookService/pages/bookServices/detail/index.json b/packageBookService/pages/bookServices/detail/index.json
index 70692f3..ebf04fd 100644
--- a/packageBookService/pages/bookServices/detail/index.json
+++ b/packageBookService/pages/bookServices/detail/index.json
@@ -20,5 +20,6 @@
"t-fab": "tdesign-miniprogram/fab/fab"
},
"navigationStyle": "custom",
- "onReachBottomDistance": 200
+ "onReachBottomDistance": 200,
+ "disableScroll": true
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index d7403f5..715cdf0 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -1,6 +1,6 @@
<!--pages/bookServices/detail/index.wxml-->
<!--瀵艰埅鍖哄煙 -->
-<view class="page-bookService">
+<view class="page-bookService" wx:if="{{!pageLoading}}">
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
@@ -98,7 +98,7 @@
<view class="book-sale">
<view class="book-price">
<!-- 鐢靛瓙涔﹀敭浠� -->
- <view class="electron-price">
+ <view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
<image
src="/static/images/bookService/detail/electon-price.png"
@@ -263,16 +263,13 @@
value="questionBank"
style="{{tabPanelstyle}}"
>
- <view wx:if="{{!loading && test.length}}">
+ <view wx:if="{{!loading}}">
<test-resource
list="{{test}}"
bookInfo="{{bookDetail}}"
mockData="{{mockData}}"
bind:buyMock="buyMock"
></test-resource>
- </view>
- <view wx:if="{{noResources}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
<t-tab-panel
@@ -351,3 +348,7 @@
>
</view>
</view>
+
+<view class="loading" wx:if="{{pageLoading}}">
+ <t-loading loading="{{pageLoading}}" size="40"></t-loading>
+</view>
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 8a67355..d9e7d14 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -372,4 +372,11 @@
background-size: 40% 64%;
background-position: right;
background-image: url(http://jsysf.bnuic.com/website/image/click-icon.png);
+}
+
+.loading {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.json b/packageBookService/pages/bookServices/examination/examination.json
index 3d3a9e7..5a645f7 100644
--- a/packageBookService/pages/bookServices/examination/examination.json
+++ b/packageBookService/pages/bookServices/examination/examination.json
@@ -9,5 +9,6 @@
"t-loading": "tdesign-miniprogram/loading/loading"
},
"navigationStyle": "custom",
- "navigationBarBackgroundColor": "#010101"
+ "navigationBarBackgroundColor": "#010101",
+ "disableScroll": true
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 868752e..5cd1be5 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -32,7 +32,9 @@
secondList: {
value: [],
options: [],
+ disabled: false,
},
+ disabledSecondList: false,
majorProjectList: {
value: [],
options: [],
@@ -49,7 +51,8 @@
size: '50rpx'
},
loading: false,
- noData: false
+ noData: false,
+ showDropdown: false,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -341,10 +344,9 @@
"pageCount.total": res.total,
loading: false
});
- console.log('鍥句功鍒楄〃', res.datas);
if (!res.datas.length) {
this.setData({
- noData: true
+ noData: true,
})
}
});
@@ -354,6 +356,7 @@
const path = e.detail.value.length ?
`${this.data.assortCheck.code}\\${e.detail.value}` :
this.data.assortCheck.code;
+ console.log(this.data.path);
this.setData({
pathList: [],
stairCode: e.detail.value,
@@ -363,6 +366,16 @@
});
this.getBookList(path);
this.getSecondList(path);
+ if (e.detail.value == '') {
+ this.setData({
+ disabledSecondList: true
+ })
+ } else {
+ this.setData({
+ disabledSecondList: false
+ })
+ }
+ console.log(this.data.disabledSecondList);
},
// 浜岀骇鍒嗙被鍒囨崲
onChangeSecond(e) {
@@ -461,4 +474,16 @@
});
this.getBookList(this.data.path)
},
+ openDropdown() {
+ console.log('灞曞紑鍝�', );
+ this.setData({
+ showDropdown: true
+ })
+ },
+ closeDropdown() {
+ console.log('鍏抽棴');
+ this.setData({
+ showDropdown: false
+ })
+ }
});
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.json b/packageBookService/pages/bookServices/list/index.json
index 397f571..9a193e3 100644
--- a/packageBookService/pages/bookServices/list/index.json
+++ b/packageBookService/pages/bookServices/list/index.json
@@ -9,5 +9,6 @@
"t-loading": "tdesign-miniprogram/loading/loading",
"t-empty": "tdesign-miniprogram/empty/empty"
},
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "disableScroll": true
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 1b7f4da..5629905 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -1,58 +1,146 @@
<!-- 鍥句功鏈嶅姟-鍒楄〃 -->
-<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" />
+<page-meta page-style="{{showDropdown ? 'overflow: hidden;' : ''}}">
+ <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>
+ <t-search
+ model:value="{{searchValue}}"
+ shape="round"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ class="navBar-search"
+ style="width: 464rpx"
+ bind:submit="searchBook"
+ />
</view>
- <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: 1000rpx">
- <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
- <t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
- <t-dropdown-item label="閲嶇偣椤圭洰" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
- <t-dropdown-item label="鏂板舰鎬佹暀鏉�" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
- </t-dropdown-menu>
- </view>
- <view class="header-sort" bind:tap="sortClick">
- <text class="sort-name">鎺掑簭</text>
- <!-- <view class="sort-icon"> -->
- <t-icon name="swap-left" size="28rpx" class="icon-right" color="{{sort == 'Asc' ? '#ff6c00' : ''}}" />
- <t-icon name="swap-left" size="28rpx" class="icon-left" color="{{sort == 'Desc' ? '#ff6c00' : ''}}" />
- <!-- </view> -->
- </view>
- </view>
- <t-pull-down-refresh value="{{enable}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onRefresh" class="down-refresh">
- <scroll-view scroll-y="{{true}}" class="list-container" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
- <view class="assort-title">
- <view class="title-box"></view>
- <view class="title-name">{{assortCheck.name}}</view>
+ <view class="bookServices-list">
+ <view class="list-header">
+ <view class="header-scroll">
+ <t-dropdown-menu style="width: 1000rpx">
+ <t-dropdown-item
+ 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
+ value="{{secondList.value}}"
+ bind:confirm="onConfirmSecond"
+ bind:change="onChangeSecond"
+ />
+ <t-dropdown-item
+ label="閲嶇偣椤圭洰"
+ options="{{majorProjectList.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{majorProjectList.value}}"
+ bind:confirm="changeMajorProject"
+ bind:reset="resetMajorProject"
+ />
+ <t-dropdown-item
+ label="鏂板舰鎬佹暀鏉�"
+ options="{{newTextBook.options}}"
+ optionsColumns="2"
+ multiple
+ defaultValue="{{newTextBook.value}}"
+ bind:confirm="changeNewText"
+ bind:reset="resetNewText"
+ />
+ </t-dropdown-menu>
</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-img">
- <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="widthFix" />
+ <view class="header-sort" bind:tap="sortClick">
+ <text class="sort-name">鎺掑簭</text>
+ <!-- <view class="sort-icon"> -->
+ <t-icon
+ name="swap-left"
+ size="28rpx"
+ class="icon-right"
+ color="{{sort == 'Asc' ? '#ff6c00' : ''}}"
+ />
+ <t-icon
+ name="swap-left"
+ size="28rpx"
+ class="icon-left"
+ color="{{sort == 'Desc' ? '#ff6c00' : ''}}"
+ />
+ <!-- </view> -->
+ </view>
+ </view>
+ <t-pull-down-refresh
+ value="{{enable}}"
+ loadingProps="{{loadingProps}}"
+ loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
+ bind:refresh="onRefresh"
+ class="down-refresh"
+ >
+ <scroll-view
+ scroll-y="{{true}}"
+ class="list-container"
+ bindrefresherrefresh="onPullDownRefresh"
+ bindscrolltolower="onReachBottom"
+ >
+ <view class="assort-title">
+ <view class="title-box"></view>
+ <view class="title-name">{{assortCheck.name}}</view>
+ </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-img">
+ <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>
</view>
- <view class="book-name book-color">{{ item.name}}</view>
- <view class="book-author book-color">{{item.author}}</view>
+ <view wx:if="{{noData}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
</view>
- <view wx:if="{{noData}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <!-- loading -->
+ <view class="loading-box" wx:if="{{loaidng}}">
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{loaidng}}"
+ wx:if="{{loaidng}}"
+ />
</view>
</view>
- <!-- loading -->
- <view class="loading-box" wx:if="{{loaidng}}">
- <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loaidng}}" wx:if="{{loaidng}}" />
+ <view class="bottom-box">
+ <t-loading
+ theme="circular"
+ size="40rpx"
+ class="wrapper"
+ wx:if="{{isMore == true}}"
+ />
+ <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
- </view>
- <view class="bottom-box">
- <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" />
- <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
- </view>
- </scroll-view>
- </t-pull-down-refresh>
-</view>
\ No newline at end of file
+ </scroll-view>
+ </t-pull-down-refresh>
+ </view>
+</page-meta>
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index a096e07..c4c528e 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -14,6 +14,7 @@
overflow: hidden;
display: flex;
height: 96rpx;
+ --td-button-primary-active-bg-color: #ff984d;
}
.list-header .t-button--primary {
@@ -27,6 +28,33 @@
border-radius: 50rpx !important;
color: #545C63 !important;
border: 2rpx solid #979797 !important;
+}
+
+.list-header .t-button--light {
+ background: #fff !important;
+ border-radius: 50rpx !important;
+ color: #545C63 !important;
+ border: 2rpx solid #979797 !important;
+}
+
+.t-checkbox--tag.t-checkbox--checked {
+ background-color: #f3e0d3 !important;
+}
+
+.t-dropdown-menu__item--active {
+ background: #F6F6F6 !important;
+}
+
+.t-button--primary::after {
+ border: none;
+}
+
+.t-radio--block {
+ padding: 20rpx !important;
+}
+
+.t-radio__border {
+ height: 0 !important;
}
.t-dropdown-menu__item--active,
@@ -73,14 +101,14 @@
.icon-left {
position: absolute;
- top: 38rpx;
+ top: 34rpx;
right: 26rpx;
transform: rotate(270deg);
}
.icon-right {
position: absolute;
- top: 38rpx;
+ top: 34rpx;
right: 10rpx;
transform: rotate(90deg);
}
@@ -151,6 +179,11 @@
box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
}
+.book-img image {
+ height: 100% !important;
+}
+
+
.book-name {
margin-top: 24rpx;
@@ -211,4 +244,8 @@
border-radius: 80rpx;
height: 70%;
margin-left: 20rpx;
+}
+
+.t-dropdown-item__body {
+ padding-bottom: 10rpx !important;
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index bde13fa..8aa5eeb 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -59,7 +59,7 @@
.srcolbox .t-button--primary {
border-radius: 50rpx !important;
background: #FF6C00 !important;
- border: none;
+ border: none !important;
}
.srcolbox .t-button--light {
diff --git a/pages/bookServices/assort/index.json b/pages/bookServices/assort/index.json
index 5c4dc95..45e1881 100644
--- a/pages/bookServices/assort/index.json
+++ b/pages/bookServices/assort/index.json
@@ -2,7 +2,7 @@
"navigationBarTitleText": "鍥句功鏈嶅姟",
"onReachBottomDistance": 10,
"backgroundTextStyle": "light",
- "enablePullDownRefresh": true,
+ "disableScroll": true,
"usingComponents": {
"t-search": "tdesign-miniprogram/search/search",
"t-icon": "tdesign-miniprogram/icon/icon",
diff --git a/pages/bookServices/assort/index.wxml b/pages/bookServices/assort/index.wxml
index ea4975a..dd4bbe7 100644
--- a/pages/bookServices/assort/index.wxml
+++ b/pages/bookServices/assort/index.wxml
@@ -1,136 +1,136 @@
<!--鍥句功鏈嶅姟鍒嗙被-->
-<view class="page-header">
- <!-- 鎼滅储妗� -->
- <view class="search">
- <t-search
- t-class-input="t-search__input"
- t-class-input-container="t-search__input-container"
- placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
- leftIcon=""
- bind:submit="navToSearchPage"
- placeholder-style="{{placeholderstyle}}"
- >
- <t-icon
- slot="left-icon"
- prefix="wr"
- name="search"
- size="40rpx"
- color="#bbb"
- />
- </t-search>
- </view>
-</view>
-
-<view class="page-container">
- <view class="side-bar-wrapper" wx:if="{{!loading}}">
- <view class="tab-left">
- <t-side-bar value="{{assortCheck.code}}" bind:change="changeAssort">
- <t-side-bar-item
- wx:for="{{assortList}}"
- wx:key="id"
- value="{{item.refCode}}"
- label="{{item.name}}"
- badge-props="{{item.badgeProps}}"
+<page-meta style="width: 100vw; overflow: hidden">
+ <view class="page-header">
+ <!-- 鎼滅储妗� -->
+ <view class="search">
+ <t-search
+ t-class-input="t-search__input"
+ t-class-input-container="t-search__input-container"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ leftIcon=""
+ bind:submit="navToSearchPage"
+ placeholder-style="{{placeholderstyle}}"
+ >
+ <t-icon
+ slot="left-icon"
+ prefix="wr"
+ name="search"
+ size="40rpx"
+ color="#bbb"
/>
- </t-side-bar>
+ </t-search>
</view>
- <view class="page-right">
- <!-- 鍙充晶 -->
- <view class="side-bar-content" wx:if="{{!listLoding}}">
- <!-- 涓�绾у垎绫� -->
- <view class="tab-top">
- <view
- class="myScroll"
- >
- <view
- wx:for="{{startList}}"
- wx:key="id"
- class="row {{startCheck.id == item.id ? 'tab-active' : ''}}"
- bind:tap="tabClick"
- data-tabData="{{item}}"
- >{{item.name}}</view
- >
- </view>
- </view>
- <!-- 鍐呭 -->
- <scroll-view
- scroll-y="{{true}}"
- class="class-list"
- scroll-into-view="{{ 'list' + startCheck.id}}"
- >
- <view wx:if="{{listLoading}}">
- <t-loading
- theme="spinner"
- size="400rpx"
- loading="{{listLoading}}"
- ></t-loading>
- </view>
- <view
- wx:for="{{startList}}"
- wx:for-item="item"
+ </view>
+
+ <view class="page-container">
+ <view class="side-bar-wrapper" wx:if="{{!loading}}">
+ <view class="tab-left">
+ <t-side-bar value="{{assortCheck.code}}" bind:change="changeAssort">
+ <t-side-bar-item
+ wx:for="{{assortList}}"
wx:key="id"
- id="{{ 'list' + item.id}}"
- class="class-box"
- wx:if="{{!listLoading}}"
- >
- <view class="class-name">{{item.name}}</view>
- <view class="class-content">
+ value="{{item.refCode}}"
+ label="{{item.name}}"
+ badge-props="{{item.badgeProps}}"
+ />
+ </t-side-bar>
+ </view>
+ <view class="page-right">
+ <!-- 鍙充晶 -->
+ <view class="side-bar-content" wx:if="{{!listLoding}}">
+ <!-- 涓�绾у垎绫� -->
+ <view class="tab-top">
+ <view class="myScroll">
<view
- wx:for="{{item.children}}"
- wx:for-item="citem"
+ wx:for="{{startList}}"
wx:key="id"
- class="book-box"
- bind:tap="goPageList"
- data-stair="{{citem}}"
+ class="row {{startCheck.id == item.id ? 'tab-active' : ''}}"
+ bind:tap="tabClick"
data-tabData="{{item}}"
- wx:if="{{item.children.length}}"
+ >{{item.name}}</view
>
- <view class="assort-img">
- <image
- src="{{citem.icon ? citem.icon : '/static/images/default-book-img.png'}}"
- mode="widthFix"
- />
- </view>
- <view class="classify">{{citem.name}}</view>
- </view>
- <view
- wx:if="{{!item.children.length}}"
- class="book-box"
- bind:tap="goPageList"
- data-tabData="{{item}}"
- >
- <view class="assort-img">
- <image
- src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
- mode="widthFix"
- ></image>
- </view>
- <text class="classify">鍏ㄩ儴</text>
- </view>
</view>
</view>
- <view class="bottom-box"> </view>
- </scroll-view>
- </view>
- <!-- loading -->
- <view class="loading-box" wx:if="{{listLoding}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{listLoding}}"
- wx:if="{{listLoding}}"
- />
+ <!-- 鍐呭 -->
+ <scroll-view
+ scroll-y="{{true}}"
+ class="class-list"
+ scroll-into-view="{{ 'list' + startCheck.id}}"
+ >
+ <view wx:if="{{listLoading}}">
+ <t-loading
+ theme="spinner"
+ size="400rpx"
+ loading="{{listLoading}}"
+ ></t-loading>
+ </view>
+ <view
+ wx:for="{{startList}}"
+ wx:for-item="item"
+ wx:key="id"
+ id="{{ 'list' + item.id}}"
+ class="class-box"
+ wx:if="{{!listLoading}}"
+ >
+ <view class="class-name">{{item.name}}</view>
+ <view class="class-content">
+ <view
+ wx:for="{{item.children}}"
+ wx:for-item="citem"
+ wx:key="id"
+ class="book-box"
+ bind:tap="goPageList"
+ data-stair="{{citem}}"
+ data-tabData="{{item}}"
+ wx:if="{{item.children.length}}"
+ >
+ <view class="assort-img">
+ <image
+ src="{{citem.icon ? citem.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFit"
+ />
+ </view>
+ <view class="classify">{{citem.name}}</view>
+ </view>
+ <view
+ wx:if="{{!item.children.length}}"
+ class="book-box"
+ bind:tap="goPageList"
+ data-tabData="{{item}}"
+ >
+ <view class="assort-img">
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFit"
+ />
+ </view>
+ <text class="classify">鍏ㄩ儴</text>
+ </view>
+ </view>
+ </view>
+ <view class="bottom-box"> </view>
+ </scroll-view>
+ </view>
+ <!-- loading -->
+ <view class="loading-box" wx:if="{{listLoding}}">
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{listLoding}}"
+ wx:if="{{listLoding}}"
+ />
+ </view>
</view>
</view>
+ <view class="loading-box" wx:if="{{loading}}">
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="wrapper"
+ loading="{{loading}}"
+ wx:if="{{loading}}"
+ />
+ </view>
</view>
- <view class="loading-box" wx:if="{{loading}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{loading}}"
- wx:if="{{loading}}"
- />
- </view>
-</view>
+</page-meta>
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index 677f61e..ad19994 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -1,4 +1,6 @@
page {
+ width: 100vw;
+ overflow: hidden;
box-sizing: border-box;
padding-bottom: calc(env(safe-area-inset-bottom) + 96rpx);
}
@@ -127,7 +129,7 @@
}
.book-box image {
- height: 142rpx;
+ height: 180rpx;
}
.classify {
--
Gitblit v1.9.1