From 36b2ce21114082da777b66b4bda250c9ca7ecd30 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 14:38:25 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/list/index.wxml | 4
packageBookService/pages/bookServices/list/index.wxss | 9 +
packageBookService/pages/bookServices/detail/index.wxml | 16 ++-
packageBookService/pages/bookServices/detail/index.wxss | 5 +
pages/bookExhibitionList/index.js | 34 ++++++
custom-tab-bar/index.js | 17 ++-
pages/bookExhibitionDetails/index.js | 13 +-
packageBookService/pages/bookServices/detail/components/tree/index.js | 3
packageBookService/pages/bookServices/list/index.js | 2
pages/bookServices/assort/index.wxml | 2
packageBookService/pages/bookServices/detail/index.js | 46 ++++++--
pages/bookServices/assort/index.wxss | 2
pages/retrievalPage/index.js | 2
packageBookService/pages/bookServices/detail/components/teachResource/index.js | 6 +
pages/bookExhibitionDetails/index.wxml | 6
pages/cart/index.wxss | 2
pages/bookExhibitionDetails/index.wxss | 28 ++---
custom-tab-bar/index.wxml | 4
packageBookService/pages/bookServices/detail/index.json | 3
packageBookService/pages/bookServices/detail/components/teachResource/index.wxss | 7 +
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 4
pages/bookExhibitionList/index.wxss | 51 ++++-----
pages/bookExhibitionList/index.wxml | 15 ++
custom-tab-bar/data.js | 5 +
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 2
pages/cart/index.js | 2
26 files changed, 192 insertions(+), 98 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 513be0c..16a0b78 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -1,11 +1,13 @@
export default [
{
+ id: 0,
text: '棣栭〉',
url: 'pages/home/home',
icon: '/static/images/home/Home@2x.png',
activeIcon: '/static/images/home/Home-click@2x.png'
},
{
+ id: 1,
text: '鍥句功鏈嶅姟',
url: 'pages/bookServices/assort/index',
icon: '/static/images/home/service@2x.png',
@@ -13,18 +15,21 @@
},
{
+ id: 2,
text: '瀛︿範',
url: 'pages/student/index',
icon: '/static/images/home/learn@2x.png',
activeIcon: '/static/images/home/learn-click@2x.png'
},
{
+ id: 3,
text: '璐墿杞�',
url: 'pages/cart/index',
icon: '/static/images/home/cart@2x.png',
activeIcon: '/static/images/home/cart-click@2x.png'
},
{
+ id: 4,
text: '涓汉涓績',
url: 'pages/personalCenter/index',
icon: '/static/images/home/my@2x.png',
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 3783000..b7ed143 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -4,15 +4,20 @@
active: 0,
list: TabMenu,
},
-
+ observers: {
+ 'active': function (newValue) {
+ console.log('active鍙樺寲', newValue);
+ }
+ },
methods: {
onChange(event) {
- this.setData({ active: event.detail.value });
- console.log(this.data.active);
+ console.log(event);
+ this.setData({ active: this.data.list[event.detail.value].id });
+ const url = this.data.list[event.detail.value].url.startsWith('/')
+ ? this.data.list[event.detail.value].url
+ : `/${this.data.list[event.detail.value].url}`
wx.switchTab({
- url: this.data.list[event.detail.value].url.startsWith('/')
- ? this.data.list[event.detail.value].url
- : `/${this.data.list[event.detail.value].url}`,
+ url: url
});
},
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 90d22b6..6cfdf11 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,11 +1,11 @@
<t-tab-bar value="{{active}}" bindchange="onChange" split="{{false}}">
- <t-tab-bar-item wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+ <t-tab-bar-item wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="{{item.id}}">
<view class="custom-tab-bar-wrapper">
<!-- <t-icon prefix="wr" name="{{item.icon}}" size="48rpx" />
<view class="text">{{ item.text }}</view> -->
<!-- <t-image wx:if="{{active !== index}}" class="tabImg" src="{{item.icon}}" mode="heightFix" width="22" height="22" />
<t-image wx:else class="tabImg" src="{{item.activeIcon}}" mode="heightFix" width="22" height="22" /> -->
- <t-image class="tabImg" src="{{active == index ? item.activeIcon : item.icon}}" width="22" height="22"></t-image>
+ <t-image class="tabImg" src="{{active == item.id ? item.activeIcon : item.icon}}" width="22" height="22"></t-image>
<view class="text">{{ item.text }}</view>
</view>
</t-tab-bar-item>
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.js b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
index 37b0645..6085f13 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.js
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
@@ -7,6 +7,10 @@
rejectCause: {
type: String,
value: ''
+ },
+ applyResourceLoading: {
+ type: Boolean,
+ value: false,
}
},
data: {
@@ -15,11 +19,11 @@
},
methods: {
applyResource() {
+ debugger
var myEventDetail = {} // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
var myEventOption = {
bubbles: true,
composed: true,
- // capturePhase: true,
} // 瑙﹀彂浜嬩欢鐨勯�夐」
this.triggerEvent('applyResource', myEventDetail, myEventOption)
},
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index c6e9715..21c7786 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -19,11 +19,11 @@
</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 == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx;" loading="{{applyResourceLoading}}">鐢宠</t-button>
</view>
</view>
<!-- 鏈�氳繃鍘熷洜 -->
-<t-dialog visible="{{showRejectDialog}}" title="鎻愮ず" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog">
+<t-dialog visible="{{showRejectDialog}}" title="鎻愮ず" confirm-btn="{{ confirmBtn }}" bind:confirm="closeDialog" class="notPassed">
<view slot="content">
<text class="cause-title">璧勬簮涓嬭浇鐢宠鏈�氳繃锛岃В鍐抽棶棰樺悗鍙偣鍑烩�滅敵璇封�濇寜閽噸鏂版彁浜ょ敵璇�</text>
<view class="cause-content">鍘熷洜:{{ rejectCause }}</view>
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
index e207958..180e822 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxss
@@ -88,4 +88,11 @@
.cause-content {
line-height: 40rpx;
+}
+
+.notPassed {
+ --td-button-primary-bg-color: #ff6c00;
+ --td-button-primary-border-color: #ff6c00;
+ --td-button-primary-active-bg-color: #ff984d;
+ --td-button-primary-active-border-color: #ff984d;
}
\ 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 eed99e1..6a672a3 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -297,6 +297,9 @@
},
// 鍔犲叆璐墿杞�
async onCloudShoppingCart() {
+
+
+
let requests = []
const item = this.data.cloudShoppingCart
console.log(item, 'item');
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index a5e3c7e..32b7b5a 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,6 +1,6 @@
<view class="tree">
<t-collapse default-value="{{activeValues}}" bind:change="handleChange">
- <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{index}}" expandIcon>
+ <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{index}}" expandIcon disabled="{{!item.children}}">
<view slot="header" class="header-title">
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" bind:change="checkResourceTitle" />
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index faa412f..194c949 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -51,7 +51,8 @@
residue: 0, // 缁勫嵎鍓╀綑娆℃暟
mockList: [] // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
- flag: true
+ flag: true,
+ applyResourceLoading: false
},
@@ -262,7 +263,6 @@
})
}
}
- console.log('缁勫嵎淇℃伅', this.data.mockData);
this.setData({
'bookDetail.publicationDate': this.formatDate(this.data.bookDetail.publicationDate),
'bookDetail.class': className,
@@ -270,6 +270,7 @@
'bookDetail.oldPrice': this.numFormat(this.data.bookDetail.oldPrice),
'bookDetail.paperPrice': this.numFormat(this.data.bookDetail.paperPrice),
});
+ console.log('鍥句功淇℃伅', this.data.bookDetail);
});
},
@@ -426,6 +427,7 @@
teach: list,
loading: false
})
+ console.log('鏁欏璧勬簮', this.data.teach);
this.findChildIds(this.data.teach, this.data.openTeachids = [])
} else if (type.refCode == 'jsek_cloudLearning') {
res.datas.cmsDatas[0].datas.forEach(item => {
@@ -555,6 +557,17 @@
// 鍥句功娣诲姞璐墿杞�
async addBookShopcCar() {
+
+ const token = wx.getStorageSync('jsek-token')
+ if (!token) {
+ return wx.getUserProfile({
+ desc: '鐢ㄦ埛鐧诲綍',
+ success: (res) => {
+ console.log(res);
+ }
+ })
+ }
+
const shoppingCartGetId = []
let query = {
@@ -706,10 +719,15 @@
})
}
})
- console.log('鏈夋晥鏃ユ湡', this.data.deadline);
+ this.setData({
+ applyResourceLoading: false
+ })
},
// 鐢宠鏁欏璧勬簮
applyResource() {
+ this.setData({
+ applyResourceLoading: true
+ })
// let role = userStore.userInfo ? userStore.userInfo.role : null
// if (role) {
// if (role == 'Teacher') {
@@ -732,7 +750,9 @@
}
app.MG.ugc.newTopicMessage(query).then((res) => {
if (res) {
- Message.success('鐢宠宸叉彁浜わ紝璇峰緟瀹℃牳閫氳繃鍚庝笅杞�')
+ wx.showToast({
+ title: '鐢宠宸叉彁浜わ紝璇峰緟瀹℃牳閫氳繃鍚庝笅杞�',
+ })
}
this.getApplyInfo(this.data.bookDetail.id)
})
@@ -994,14 +1014,14 @@
async allAddShoppiingCar() {
const child = this.selectComponent('#learn-resource')
const token = wx.getStorageSync('jsek-token')
- // if (!token) {
- // return wx.getUserProfile({
- // desc: '鐢ㄦ埛鐧诲綍',
- // success: (res) => {
- // console.log(res);
- // }
- // })
- // }
+ if (!token) {
+ return wx.getUserProfile({
+ desc: '鐢ㄦ埛鐧诲綍',
+ success: (res) => {
+ console.log(res);
+ }
+ })
+ }
let shopList = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
this.getShoppingCartProductGet()
if (!shopList.length) return wx.showToast({
@@ -1197,7 +1217,7 @@
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
const tree = this.selectComponent('#tree')
-
+
tree.onCloudShoppingCart()
diff --git a/packageBookService/pages/bookServices/detail/index.json b/packageBookService/pages/bookServices/detail/index.json
index 823f4ac..9bba7c1 100644
--- a/packageBookService/pages/bookServices/detail/index.json
+++ b/packageBookService/pages/bookServices/detail/index.json
@@ -16,7 +16,8 @@
"suggest": "/packageBookService/pages/bookServices/detail/components/suggest/suggest",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-dialog": "tdesign-miniprogram/dialog/dialog",
- "t-toast": "tdesign-miniprogram/toast/toast"
+ "t-toast": "tdesign-miniprogram/toast/toast",
+ "t-empty": "tdesign-miniprogram/empty/empty"
},
"navigationStyle": "custom",
"onReachBottomDistance": 200
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 14524ff..b6006bb 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -95,17 +95,23 @@
<view class="book-resource">
<t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
<t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
- <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}"></book-brief>
+ <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content && bookDetail.authorIntroduction}}"></book-brief>
+ <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
</t-tab-panel>
<t-tab-panel label="鐢靛瓙涔�" value="1" style="{{tabPanelstyle}}">
鐢靛瓙涔�
</t-tab-panel>
<t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
<view wx:if="{{!loading && teach.length}}">
- <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource"></teach-resource>
- <tree bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}"></tree>
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+ <tree bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
</view>
<t-loading theme="circular" size="60rpx" class="loading" loading="{{loading}}" />
+ <!-- <view wx:if="{{!teach.length && !loading}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view> -->
</t-tab-panel>
<t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
@@ -137,8 +143,8 @@
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="shopCar {{tabValue == 'jsek_teachingResources' ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
- <view class="buy {{tabValue == 'jsek_teachingResources' ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
+ <view class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jesk_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar">鍔犲叆璐墿杞�</view>
+ <view class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jesk_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn">绔嬪嵆璐拱</view>
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index f4f9c56..2287ac5 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -295,4 +295,9 @@
--td-button-primary-border-color: #ff6c00;
--td-button-primary-active-bg-color: #ff984d;
--td-button-primary-active-border-color: #ff984d;
+}
+
+.noData {
+ /* width: 500rpx;
+ height: 500rpx; */
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index cc50289..81847df 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -45,7 +45,7 @@
sort: '', // 鎺掑簭
enable: false,
loadingProps: {
- size: '50rpx',
+ size: '50rpx'
},
loading: false,
noData: false
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 81aa827..fc24cad 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -25,7 +25,7 @@
</view>
</view>
</view>
- <t-pull-down-refresh value="{{enable}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onRefresh">
+ <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>
@@ -35,7 +35,7 @@
<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">
- <t-image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" width="105" height="145" aria-label="{item.name{}}" />
+ <t-image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="widthFix" />
</view>
<view class="book-name book-color">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 3a0d134..862b086 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -86,11 +86,16 @@
color: #333;
}
-.book-img image {
- object-fit: contain;
+.book-img {
+ width: 210rpx;
+ height: 290rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
}
+
.book-name {
margin-top: 24rpx;
color: #333;
diff --git a/pages/bookExhibitionDetails/index.js b/pages/bookExhibitionDetails/index.js
index bb04659..b4df761 100644
--- a/pages/bookExhibitionDetails/index.js
+++ b/pages/bookExhibitionDetails/index.js
@@ -14,7 +14,7 @@
bookExhibitionList: [],
navBarHeight: '',
barHeight: '',
- bookName: ''
+ subtitleName: '',
},
/**
@@ -32,7 +32,8 @@
this.setData({
- bookName: options.bookName
+ bookName: options.bookName,
+ subtitleName: options.subtitleName
})
const passId = options.id
@@ -138,15 +139,15 @@
this.setData({
bookExhibitionList: res.datas
})
- console.log(this.data.bookExhibitionList, 88888);
+ console.log(this.data.bookExhibitionList, 'bookExhibitionList');
})
},
onBookDetails(event) {
const item = event.currentTarget.dataset.item;
console.log(item, 'item');
- // wx.navigateTo({
- // url: '/pages/bookExhibitionDetails/index?id?name=' + item.id + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
- // });
+ wx.navigateTo({
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
+ });
},
goBack() {
wx.navigateBack();
diff --git a/pages/bookExhibitionDetails/index.wxml b/pages/bookExhibitionDetails/index.wxml
index 87b5129..41204f8 100644
--- a/pages/bookExhibitionDetails/index.wxml
+++ b/pages/bookExhibitionDetails/index.wxml
@@ -4,11 +4,11 @@
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
- <view class="navbar-title">{{bookName}}</view>
+ <view class="navbar-title">{{subtitleName}}</view>
</view>
<view class="headBox">
- <text class="titleBox">{{bookName}}</text>
+ <view class="titleBox">{{bookName}}</view>
<view class="informationBox">
<text class="informationNameBox">鍙戝竷浜�:{{bookCreator}}</text>
<text class="informationTimeBox">鍙戝竷鏃ユ湡锛歿{bookBeginDate}}</text>
@@ -33,6 +33,6 @@
<image class="booksImageBox" src="{{item.icon}}" mode="" />
</view>
<view class="booksTextBox"> <text>{{item.name}}</text></view>
-
+ <view class="boosAuthor">{{item.author}}</view>
</view>
</view>
\ No newline at end of file
diff --git a/pages/bookExhibitionDetails/index.wxss b/pages/bookExhibitionDetails/index.wxss
index c8feec7..01c31ea 100644
--- a/pages/bookExhibitionDetails/index.wxss
+++ b/pages/bookExhibitionDetails/index.wxss
@@ -24,25 +24,13 @@
}
.titleBox {
- height: 60rpx;
+
font-weight: 800;
font-size: 45rpx;
display: flex;
justify-content: center;
- padding: 0 30rpx;
- /* text-indent: 6%; */
+ padding: 10rpx 30rpx;
- /* overflow: hidden;
- text-overflow: ellipsis;
-
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 1; */
- margin: 0 130rpx;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 1;
- overflow: hidden;
- text-overflow: ellipsis;
}
.informationBox {
@@ -108,13 +96,21 @@
font-weight: bold;
width: 280rpx;
margin: 30rpx 25rpx;
- /* overflow: hidden;
+ overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap; */
+ white-space: nowrap;
}
.outsideBooksBox {
display: flex;
flex-wrap: wrap;
+}
+
+.boosAuthor {
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #949494;
+ margin: 30rpx 25rpx;
}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/index.js b/pages/bookExhibitionList/index.js
index 032e4a3..84d40c5 100644
--- a/pages/bookExhibitionList/index.js
+++ b/pages/bookExhibitionList/index.js
@@ -58,8 +58,8 @@
options: [],
},
navBarHeight: '',
- barHeight: ''
-
+ barHeight: '',
+ windowHeight: '',
},
@@ -68,6 +68,34 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ // 鑾峰彇灞忓箷楂樺害
+ wx.getSystemInfo({
+ success: function (res) {
+ // this.setData({
+ // windowHeight: res.windowHeight
+ // })
+
+ // 鑾峰彇鑺傜偣鐨勭被鍚�
+ var query = wx.createSelectorQuery();
+ query.select('.assembleContent').boundingClientRect();
+ query.exec(function (res) {
+
+ console.log(res, 'res');
+ let node = res[0];
+ node.setStyle({
+ backgroundColor: '#0256b9',
+ })
+ // // 淇敼鑺傜偣鏍峰紡
+ // if (node) {
+ // node.setStyle({
+ // backgroundColor: 'red',
+ // color: 'white'
+ // });
+ // }
+ });
+ }
+ });
+
// console.log(this.data.filteredItems, 88888);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
@@ -348,7 +376,7 @@
const item = event.currentTarget.dataset.item;
console.log(item);
wx.navigateTo({
- url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
+ url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name + '&subtitleName=' + item.subtitleName // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
});
},
// 鎼滅储妗�
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 77fa0f8..212b518 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -41,13 +41,22 @@
<view class="assembleContent">
<view class="titleBox">
<view class="frameBox"></view>
- <image class="titleTextBox" src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="aspectFit" />
+ <view class="titleTextBox">
+ <image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="heightFix" />
+ </view>
+
</view>
<view class="outside">
+ <view wx:if="{{bookExhibitionList.length }}">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
<view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bindtap="onBookExhibitionDetails" data-item="{{item}}">
- <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" />
- <image wx:else="" src="/static/images/bookExhibitionList/banner.png" mode="" />
+ <view class="imageBox">
+ <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="widthFix" />
+ <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="heightFix" />
+ </view>
+
<view class="textBox" title="{{item.subtitleName}}"> <text>{{item.subtitleName}}</text></view>
</view>
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 7d917bb..3b28263 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -4,12 +4,10 @@
background-color: #fff;
display: flex;
align-items: center;
-
}
.navbar-title {
white-space: nowrap;
- /* overflow: hidden; */
text-overflow: ellipsis;
color: #0F1214;
font-size: 40rpx;
@@ -23,47 +21,42 @@
flex-wrap: wrap;
justify-content: space-between;
margin: 15px;
-
-
}
.contentBox {
width: 330rpx;
- /* height: 231rpx; */
- /* border: 1px #000 solid; */
margin: 10px 0;
background-color: #fff;
-
}
-image {
- width: 327rpx;
+.contentBox .imageBox {
+ width: 330rpx;
height: 128rpx;
+}
+
+
+
+image {
+ width: 100%;
+ height: 100%;
}
.textBox {
font-family: PingFang SC, PingFang SC;
width: 280rpx;
- /* height: 75rpx; */
font-size: 25rpx;
-
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
- /* text-align: center; */
margin: 20rpx;
-
}
.example-search {
- /* width: 300px; */
background-color: #fff;
- /* padding: 16rpx 32rpx; */
-
}
.iconBox {
@@ -112,6 +105,8 @@
padding-top: 30rpx;
}
+
+
.frameBox {
width: 7rpx;
height: 54rpx;
@@ -121,8 +116,15 @@
.titleTextBox {
margin-left: 5px;
- width: 150rpx;
+ width: 200rpx;
height: 37rpx;
+ /*瀹� 3.7 楂�1 */
+}
+
+.titleTextBox image {
+ width: 100%;
+ height: 100%;
+ image-rendering: -webkit-optimize-contrast;
}
.classification {
@@ -137,17 +139,12 @@
.assembleContent {
background-color: #F2F3F8;
+
}
-
-/* .t-dropdown-menu__item--active {
- color: #0F1214;
-} */
-
.t-dropdown-menu:after,
.t-dropdown-menu::after {
height: 0px;
}
-
.t-dropdown-item__body,
.t-dropdown-item__footer,
@@ -169,7 +166,6 @@
.t-dropdown-menu__item--active {
height: 68rpx !important;
background: #F6F6F6 !important;
- /* border-radius: 40rpx 40rpx 0 0; */
}
.t-dropdown-menu__item--active,
@@ -201,8 +197,9 @@
/* background-color: #FF6C00 !important; */
/* } */
-/* .menu--t-dropdown-menu::after {
+/*
+ */
+.menu--t-dropdown-menu::after {
background-color: var(--td-component-border, var(--td-gray-color-4, #fff)) !important;
-}
- */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/pages/bookServices/assort/index.wxml b/pages/bookServices/assort/index.wxml
index 59c923d..f02d0c0 100644
--- a/pages/bookServices/assort/index.wxml
+++ b/pages/bookServices/assort/index.wxml
@@ -34,7 +34,7 @@
<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/bookService/assort/book-img.png'}}" mode="heightFix" />
+ <image src="{{citem.icon ? citem.icon : '/static/images/bookService/assort/book-img.png'}}" mode="widthFix" />
</view>
<view class="classify">{{citem.name}}</view>
</view>
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index f065f59..4b330d3 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -127,7 +127,6 @@
.book-box image {
height: 142rpx;
- object-fit: contain !important;
}
.classify {
@@ -141,6 +140,7 @@
}
.assort-img {
+ display: flex;
width: 116rpx;
height: 142rpx;
box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 16c1922..7e52034 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -22,6 +22,8 @@
},
onShow() {
this.shoppingCartGet();
+ this.setData({ totalPrice: 0.00, selectedCount: 0, checkAll: false, })
+
},
onDelete(e) {
const item = e.currentTarget.dataset.item;
diff --git a/pages/cart/index.wxss b/pages/cart/index.wxss
index 5661723..4d47114 100644
--- a/pages/cart/index.wxss
+++ b/pages/cart/index.wxss
@@ -28,7 +28,7 @@
padding: 30rpx;
background: #F2F3F8;
border-radius: 18rpx 18rpx 18rpx 18rpx;
- padding-bottom: 230rpx;
+ padding-bottom: 325rpx;
/* height: 260rpx; */
}
diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index e5e7d1c..77f1025 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -526,7 +526,7 @@
console.log(e.currentTarget.dataset.item);
const item = e.currentTarget.dataset.item
wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name' + item.name
+ url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
})
--
Gitblit v1.9.1