From ebfc641a1a1bc6c40b8010f31f7a836f09308b6e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 27 三月 2024 11:04:19 +0800
Subject: [PATCH] 样式修改
---
packagePersonal/pages/sampleBooks/index.wxml | 7
app.wxss | 7
packageDomain/pages/sampleBookList/index.wxml | 7
static/images/personal/my-bg.png | 0
packageDomain/pages/sampleBookList/index.wxss | 13 +
pages/personalCenter/components/user-center-card/index.wxml | 2
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 24 ++
packagePersonal/pages/downloads/index.wxss | 5
packagePersonal/pages/downloads/index.wxml | 7
packagePersonal/pages/feedBack/index.wxss | 7
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 153 +++++++++---------
packagePersonal/pages/feedBack/index.wxml | 7
package.json | 1
packageBookService/pages/bookServices/list/index.js | 3
packageDomain/pages/sampleBookList/index.js | 66 ++++++--
pages/bookServices/assort/index.wxml | 107 +-----------
pages/home/home.wxml | 2
packagePersonal/pages/sampleBooks/index.wxss | 5
pages/home/home.wxss | 2
packagePersonal/pages/myMassage/index.wxml | 7
packagePersonal/pages/myMassage/index.wxss | 5
21 files changed, 227 insertions(+), 210 deletions(-)
diff --git a/app.wxss b/app.wxss
index 7874623..19efb42 100644
--- a/app.wxss
+++ b/app.wxss
@@ -8,4 +8,9 @@
box-sizing: border-box;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
-}
\ No newline at end of file
+}
+
+.t-loading__circular {
+ color: #ff6d00 !important;
+}
+
diff --git a/package.json b/package.json
index 5309c96..afcd516 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
]
},
"dependencies": {
+ "epub.js": "^0.2.15",
"moment": "^2.30.1",
"spark-md5": "^3.0.2",
"tdesign-miniprogram": "^1.0.0",
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 7fd0570..4c8d2b5 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -322,9 +322,6 @@
},
],
sort,
- coverSize: {
- width: 105
- },
paging: {
start: 0,
size: this.data.pageCount.page * 8,
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index c6ea8b8..7c768b1 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -1,81 +1,84 @@
-<view class="page-header">
- <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick">
- <t-tab-panel label="绾歌川鏍蜂功" value="0" />
- <t-tab-panel label="鐢靛瓙鏍蜂功" value="1" />
- </t-tabs>
-</view>
-<view class="page-content">
- <view class="bookListBox">
- <view class="tips">
- <rich-text space="emsp" nodes="{{description}}" class="content" />
- </view>
- <view class="bookList">
- <view wx:if="{{bookList.length > 0}}">
- <view wx:for="{{bookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
- <t-swipe-cell>
- <t-cell title="宸︽粦鍗曟搷浣�" note="杈呭姪淇℃伅" bordered="{{false}}">
- <view class="listItem flex">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else="" />
- </view>
- <view class="body-info">
- <view class="name">{{item.title}}</view>
- <view class="author">浣滆�咃細{{item.author}}</view>
- <view class="author">ISBN:{{item.isbn}}</view>
- <view class="author">鍑虹増鏃堕棿:{{item.publicationDate}}</view>
- </view>
- </view>
- </t-cell>
- <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-book="{{item}}">鍒犻櫎</view>
- </t-swipe-cell>
+<view class="container">
+ <view class="page-header">
+ <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick">
+ <t-tab-panel label="绾歌川鏍蜂功" value="0" />
+ <t-tab-panel label="鐢靛瓙鏍蜂功" value="1" />
+ </t-tabs>
+ </view>
+ <view class="page-content">
+ <view class="content">
+ <view class="bookListBox">
+ <view class="tips">
+ <rich-text space="emsp" nodes="{{description}}" class="content" />
+ </view>
+ <view class="bookList">
+ <view wx:if="{{bookList.length > 0}}">
+ <view wx:for="{{bookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
+ <t-swipe-cell>
+ <t-cell title="宸︽粦鍗曟搷浣�" note="杈呭姪淇℃伅" bordered="{{false}}">
+ <view class="listItem flex">
+ <view class="specialSubject-img">
+ <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
+ <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else="" />
+ </view>
+ <view class="body-info">
+ <view class="name">{{item.title}}</view>
+ <view class="author">浣滆�咃細{{item.author}}</view>
+ <view class="author">ISBN:{{item.isbn}}</view>
+ <view class="author">鍑虹増鏃堕棿:{{item.publicationDate}}</view>
+ </view>
+ </view>
+ </t-cell>
+ <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-book="{{item}}">鍒犻櫎</view>
+ </t-swipe-cell>
+ </view>
+ </view>
+ <view wx:if="{{bookList.length == 0}}" class="empyt">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
</view>
</view>
- <view wx:if="{{bookList.length == 0}}" class="empyt">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <view class="formBox">
+ <view class="title">
+ 鎺堣鎯呭喌
+ </view>
+ <view class="teachingInfo">
+ <view class="item">
+ <text class="label">瀛︽牎锛�</text>
+ <text>{{teacherInfo.schoolName}}</text>
+ </view>
+ <view class="item">
+ <text class="label">浠绘暀璇剧▼锛�</text>
+ <text>{{teacherInfo.courseName}}</text>
+ </view>
+ </view>
+ <view class="title" wx:if="{{active =='0'}}">
+ 鏀惰揣浜烘儏鍐�
+ </view>
+ <view class="receiverInfo" wx:if="{{active =='0'}}">
+ <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" />
+ </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" />
+ </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" />
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="btn-area">
+ <button class="submit" bindtap="submit">鎻愪氦</button>
</view>
</view>
</view>
- <view class="formBox">
- <view class="title">
- 鎺堣鎯呭喌
- </view>
- <view class="teachingInfo">
- <view class="item">
- <text class="label">瀛︽牎锛�</text>
- <text>{{teacherInfo.schoolName}}</text>
- </view>
- <view class="item">
- <text class="label">浠绘暀璇剧▼锛�</text>
- <text>{{teacherInfo.courseName}}</text>
- </view>
- </view>
- <view class="title" wx:if="{{active =='0'}}">
- 鏀惰揣浜烘儏鍐�
- </view>
- <view class="receiverInfo" wx:if="{{active =='0'}}">
- <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" />
- </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" />
- </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" />
- </view>
- </view>
- </view>
- </view>
- <view class="btn-area">
- <button class="submit" bindtap="submit">鎻愪氦</button>
- </view>
-
</view>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index 894c094..e7c8141 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -1,14 +1,28 @@
page {
- background-color: #F2F3F8;
+ background-color: #f0f2f5;
+}
+
+.container {
+ width: 100%;
+ height: 100vh;
}
.page-header {
width: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ z-index: 1;
}
.page-content {
- padding-bottom: env(safe-area-inset-bottom);
+ padding-top: 96rpx;
+}
+.content {
+ height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
+ box-sizing: border-box;
+ overflow-y: auto;
}
.t-tabs__track {
@@ -130,6 +144,10 @@
.delete-btn {
margin: 0 auto;
+ height: 100%;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
}
.formBox {
@@ -174,7 +192,7 @@
}
.btn-area {
- margin-top: 40rpx;
+ margin: 40rpx 0;
padding: 0 40rpx;
}
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index ab27b30..4634442 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -132,6 +132,20 @@
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
}
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+ */
+ onShow() {
if (wx.getStorageSync("paperBookList")) {
this.setData({
paperBookList: wx.getStorageSync("paperBookList"),
@@ -146,20 +160,6 @@
num: this.data.paperBookList.length + this.data.electronicBookList.length
})
this.getBookList(false);
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
- */
- onReady() {
-
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
- */
- onShow() {
-
},
goBack() {
wx.navigateBack();
@@ -621,7 +621,6 @@
this.setData({
alreadyElectronicBookList: list,
});
- this.getBookList(false);
}
})
},
@@ -885,7 +884,14 @@
if (this.data.ebookCount > 0) {
const eBookData = this.data.electronicBookList
if (eBookData.length == 2) {
- item.electronChecked = false
+ 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鏈牱涔�",
icon: 'none',
@@ -907,9 +913,11 @@
})
this.setData({
electronicBookList: [...this.data.electronicBookList, ...[itemAttr]],
- num: this.data.electronicBookList.length + this.data.paperBookList.length
})
wx.setStorageSync("electronicBookList", this.data.electronicBookList);
+ this.setData({
+ num: this.data.electronicBookList.length + this.data.paperBookList.length
+ })
} else {
let list = this.data.electronicBookList;
list.forEach((obj, index) => {
@@ -953,6 +961,13 @@
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鏈牱涔�",
@@ -976,9 +991,11 @@
})
this.setData({
paperBookList: [...this.data.paperBookList, ...[itemAttr]],
- num: this.data.paperBookList.lenght + this.data.electronicBookList.length
})
wx.setStorageSync("paperBookList", this.data.paperBookList);
+ this.setData({
+ num: this.data.paperBookList.length + this.data.electronicBookList.length
+ })
} else {
let list = this.data.paperBookList;
list.forEach((obj, index) => {
@@ -1027,6 +1044,19 @@
url: "/packageDomain/pages/sampleBookList/applicationForm/index",
});
},
+
+ // 鐩戝惉婊氬姩璺濈
+ onPageScroll(e) {
+ if (e && e.scrollTop >= 1000) {
+ this.setData({
+ isBackTop: true
+ })
+ } else {
+ this.setData({
+ isBackTop: false
+ })
+ }
+ },
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 223dc51..eb74398 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -41,7 +41,7 @@
<t-image src="/static/images/home/yangshuliebiao.png" mode="heightFix" class="iconImage" />
</view>
</view>
- <view class="book-list" wx:if="{{bookList.length > 0}}">
+ <view class="book-list" wx:if="{{bookList.length > 0 && !skeletonLoding}}">
<view class="book-box" wx:for="{{bookList}}" wx:key="id">
<view class="book-img" bind:tap="goDetail" data-book="{{item}}">
<t-image src="{{item.icon}}" width="105" height="145" aria-label="{{item.name}}" wx:if="{{item.icon}}" />
@@ -55,7 +55,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{bookList.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -64,6 +64,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
</view>
</view>
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index cd9e157..f34a04f 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -71,9 +71,8 @@
.t-dropdown-menu:after,
.t-dropdown-menu::after {
- height: 0px;
+ height: 0px !important;
}
-
.t-dropdown-item__body,
.t-dropdown-item__footer,
@@ -93,7 +92,7 @@
}
.t-dropdown-menu__item--active {
- height: 85rpx !important;
+ height: 86rpx !important;
background: #F6F6F6 !important;
border-radius: 40rpx 40rpx 0 0;
}
@@ -175,6 +174,11 @@
padding: 200rpx 0;
}
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
+}
+
.book-list {
padding: 20rpx;
@@ -239,7 +243,7 @@
}
.checkbox .t-checkbox--block {
- padding: 20rpx 0 !important;
+ padding: 0 !important;
align-items: center;
}
@@ -256,6 +260,7 @@
.checkbox .t-checkbox {
font-size: 28rpx !important;
+ align-items: center;
}
.checkbox .t-checkbox__icon--left {
diff --git a/packagePersonal/pages/downloads/index.wxml b/packagePersonal/pages/downloads/index.wxml
index 83981f8..edd6047 100644
--- a/packagePersonal/pages/downloads/index.wxml
+++ b/packagePersonal/pages/downloads/index.wxml
@@ -5,7 +5,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="pageInfo" wx:if="{{list.length > 0}}">
+ <view class="pageInfo" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="item-con" data-info="{{item}}" bindtap="toList">
<view class="icon">
@@ -25,7 +25,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -34,6 +34,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
</view>
\ No newline at end of file
diff --git a/packagePersonal/pages/downloads/index.wxss b/packagePersonal/pages/downloads/index.wxss
index f9ab05d..59b332b 100644
--- a/packagePersonal/pages/downloads/index.wxss
+++ b/packagePersonal/pages/downloads/index.wxss
@@ -89,4 +89,9 @@
.loading {
padding: 20rpx;
text-align: center;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/feedBack/index.wxml b/packagePersonal/pages/feedBack/index.wxml
index 8a4bad2..278e0ed 100644
--- a/packagePersonal/pages/feedBack/index.wxml
+++ b/packagePersonal/pages/feedBack/index.wxml
@@ -12,7 +12,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="list" wx:if="{{list.length > 0}}">
+ <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view wx:if="{{activeName == 'bookOpinion'}}" class="listBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="icon">
@@ -40,7 +40,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -49,6 +49,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
</view>
diff --git a/packagePersonal/pages/feedBack/index.wxss b/packagePersonal/pages/feedBack/index.wxss
index 812c531..d5408dd 100644
--- a/packagePersonal/pages/feedBack/index.wxss
+++ b/packagePersonal/pages/feedBack/index.wxss
@@ -1,6 +1,5 @@
page {
background-color: #f0f2f5;
- padding: 0 20rpx;
}
.container {
@@ -23,6 +22,7 @@
.content {
height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
box-sizing: border-box;
+ background: #fff;
}
.t-tabs__track {
@@ -185,4 +185,9 @@
.empyt {
background: #fff;
padding: 200rpx 0;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/myMassage/index.wxml b/packagePersonal/pages/myMassage/index.wxml
index 5a96715..fc0ab8e 100644
--- a/packagePersonal/pages/myMassage/index.wxml
+++ b/packagePersonal/pages/myMassage/index.wxml
@@ -5,7 +5,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="pageInfo" wx:if="{{list.length > 0}}">
+ <view class="pageInfo" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="icon">
<t-image src="/static/images/personal/notification1.png" mode="heightFix" class="img" />
@@ -21,7 +21,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -30,6 +30,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
</view>
\ No newline at end of file
diff --git a/packagePersonal/pages/myMassage/index.wxss b/packagePersonal/pages/myMassage/index.wxss
index 593df59..50098f9 100644
--- a/packagePersonal/pages/myMassage/index.wxss
+++ b/packagePersonal/pages/myMassage/index.wxss
@@ -77,4 +77,9 @@
.loading {
padding: 20rpx;
text-align: center;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/packagePersonal/pages/sampleBooks/index.wxml b/packagePersonal/pages/sampleBooks/index.wxml
index 2369db3..b9be5b6 100644
--- a/packagePersonal/pages/sampleBooks/index.wxml
+++ b/packagePersonal/pages/sampleBooks/index.wxml
@@ -19,7 +19,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="list" wx:if="{{list.length > 0}}">
+ <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
<view class="codeInfoBox">
<view class="top">
@@ -58,7 +58,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0}}" class="empyt">
+ <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -67,6 +67,9 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
+ <view class="body-loading" wx:if="{{skeletonLoding}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
</scroll-view>
</view>
</view>
diff --git a/packagePersonal/pages/sampleBooks/index.wxss b/packagePersonal/pages/sampleBooks/index.wxss
index 8e3d30a..fab9f33 100644
--- a/packagePersonal/pages/sampleBooks/index.wxss
+++ b/packagePersonal/pages/sampleBooks/index.wxss
@@ -184,4 +184,9 @@
-webkit-line-clamp: 2;
overflow: hidden;
text-overflow: ellipsis;
+}
+
+.body-loading {
+ padding: 200rpx 0;
+ text-align: center;
}
\ No newline at end of file
diff --git a/pages/bookServices/assort/index.wxml b/pages/bookServices/assort/index.wxml
index 86fdbe9..e715594 100644
--- a/pages/bookServices/assort/index.wxml
+++ b/pages/bookServices/assort/index.wxml
@@ -2,21 +2,8 @@
<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 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>
@@ -25,13 +12,7 @@
<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}}"
- />
+ <t-side-bar-item wx:for="{{assortList}}" wx:key="id" value="{{item.refCode}}" label="{{item.name}}" badge-props="{{item.badgeProps}}" />
</t-side-bar>
</view>
<view class="page-right">
@@ -39,73 +20,27 @@
<view class="side-bar-content" wx:if="{{!listLoding}}">
<!-- 涓�绾у垎绫� -->
<view class="tab-top">
- <scroll-view
- scroll-x="{{true}}"
- class="myScroll"
- show-scrollbar="{{false}}"
- >
- <view
- wx:for="{{startList}}"
- wx:key="id"
- class="row {{startCheck.id == item.id ? 'tab-active' : ''}}"
- bind:tap="tabClick"
- data-tabData="{{item}}"
- >{{item.name}}</view
- >
+ <scroll-view scroll-x="{{true}}" class="myScroll" show-scrollbar="{{false}}">
+ <view wx:for="{{startList}}" wx:key="id" class="row {{startCheck.id == item.id ? 'tab-active' : ''}}" bind:tap="tabClick" data-tabData="{{item}}">{{item.name}}</view>
</scroll-view>
</view>
<!-- 鍐呭 -->
- <scroll-view
- scroll-y="{{true}}"
- class="class-list"
- scroll-into-view="{{ 'list' + startCheck.id}}"
- >
+ <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>
+ <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 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 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="widthFix"
- />
+ <image src="{{citem.icon ? citem.icon : '/static/images/bookService/assort/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 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/bookService/assort/book-img.png'}}"
- mode="widthFix"
- ></image>
+ <image src="{{item.icon ? item.icon : '/static/images/bookService/assort/book-img.png'}}" mode="widthFix"></image>
</view>
<text class="classify">鍏ㄩ儴</text>
</view>
@@ -116,23 +51,11 @@
</view>
<!-- loading -->
<view class="loading-box" wx:if="{{listLoding}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{listLoding}}"
- 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}}"
- />
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loading}}" wx:if="{{loading}}" />
</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 18466b5..4170fe9 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -13,7 +13,7 @@
</t-search>
</view>
<view class="swiper-wrap">
- <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" bind:click="navToActivityDetail" />
+ <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" height="380rpx" bind:click="navToActivityDetail" />
</view>
</view>
<view class="home-page-menu">
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 30146a9..16964bf 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -230,7 +230,7 @@
background-repeat: no-repeat;
background-size: 40% 64%;
background-position: right;
- background-image: url(http://182.92.203.7:3007/jsek/website/image/click-icon.png);
+ background-image: url(http://jsysf.bnuic.com/website/image/click-icon.png);
}
.t-tabs .t-tabs__track {
diff --git a/pages/personalCenter/components/user-center-card/index.wxml b/pages/personalCenter/components/user-center-card/index.wxml
index 19e9ae9..bfac078 100644
--- a/pages/personalCenter/components/user-center-card/index.wxml
+++ b/pages/personalCenter/components/user-center-card/index.wxml
@@ -1,7 +1,7 @@
<view class="user-center-card">
<!-- 鏈櫥褰曠殑鎯呭喌 -->
<block wx:if="{{currAuthStep === AuthStepType.ONE}}">
- <view class="user-center-card__header" bind:tap="gotoUserEditPage">
+ <view class="user-center-card__header">
<t-avatar image="{{userInfo.avatarUrl || defaultAvatarUrl}}" class="user-center-card__header__avatar" />
<view>
<view class="user-center-card__header__name">{{'璇风櫥褰�'}}</view>
diff --git a/static/images/personal/my-bg.png b/static/images/personal/my-bg.png
index bd863e4..c8b8f9b 100644
--- a/static/images/personal/my-bg.png
+++ b/static/images/personal/my-bg.png
Binary files differ
--
Gitblit v1.9.1