From 7eab4acb4bb2060970f81840e5d2b72f259b07cb Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 28 三月 2024 11:40:19 +0800
Subject: [PATCH] yangshu
---
assets/js/middleGround/api/ugc.js | 2
packageBookService/pages/bookServices/list/index.wxml | 118 ++++------------------------
pages/personalCenter/index.wxml | 2
packageBookService/pages/bookServices/list/index.wxss | 1
packageDomain/pages/sampleBookList/index.wxml | 10 +-
packageDomain/pages/sampleBookList/index.wxss | 4
pages/bookExhibitionList/index.wxml | 7 -
packageDomain/pages/sampleBookList/applicationForm/index.wxss | 20 ++--
pages/personalCenter/index.js | 46 ++++++----
packageDomain/pages/sampleBookList/applicationForm/index.wxml | 10 +-
10 files changed, 70 insertions(+), 150 deletions(-)
diff --git a/assets/js/middleGround/api/ugc.js b/assets/js/middleGround/api/ugc.js
index 76e4bfd..525e9dd 100644
--- a/assets/js/middleGround/api/ugc.js
+++ b/assets/js/middleGround/api/ugc.js
@@ -3,7 +3,7 @@
tokenKey
} from "../../config";
import toolClass from "../../toolClass";
-let token = wx.getStorageSync(tokenKey) ? wx.getStorageSync(tokenKey) : ''
+let token = wx.getStorageSync(tokenKey) ? wx.getStorageSync(tokenKey) : '';
const ugcApi = {
// 鑾峰彇鍟嗗搧鐐硅禐Topic
getProductLikesTopic(data) {
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 9dd160f..a95f792 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -2,111 +2,42 @@
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
- <t-icon
- name="chevron-left"
- size="30"
- data-name="{{item}}"
- bind:click="goBack"
- />
+ <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
- <t-search
- model:value="{{searchValue}}"
- shape="round"
- placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
- class="navBar-search"
- style="width: 464rpx"
- bind:submit="searchBook"
- />
+ <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">
- <scroll-view scroll-x="{{true}}" class="header-scroll">
+ <!-- <scroll-view scroll-x="{{true}}" class="header-scroll"> -->
+ <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-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>
- </scroll-view>
+ </view>
+ <!-- </scroll-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' : ''}}"
- />
+ <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"
- >
+ <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-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"
- />
+ <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>
@@ -117,24 +48,13 @@
</view>
<!-- loading -->
<view class="loading-box" wx:if="{{loaidng}}">
- <t-loading
- theme="circular"
- size="60rpx"
- class="wrapper"
- loading="{{loaidng}}"
- wx:if="{{loaidng}}"
- />
+ <t-loading theme="circular" size="60rpx" class="wrapper" loading="{{loaidng}}" wx:if="{{loaidng}}" />
</view>
</view>
<view class="bottom-box">
- <t-loading
- theme="circular"
- size="40rpx"
- class="wrapper"
- wx:if="{{isMore == true}}"
- />
+ <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>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 89598cf..a096e07 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -68,6 +68,7 @@
.header-scroll {
height: 100%;
width: 85vw;
+ overflow-x: auto;
}
.icon-left {
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
index 1c521f3..99a28eb 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml
@@ -1,10 +1,8 @@
<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>
+ <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 class="page-content">
<view class="content">
<view class="bookListBox">
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
index 0848af0..cdff08e 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss
@@ -7,21 +7,14 @@
height: 100vh;
}
-.page-header {
- width: 100%;
- position: fixed;
- top: 0;
- left: 0;
- z-index: 1;
-}
.page-content {
- padding-top: 96rpx;
+ margin-top: -30rpx;
}
.content {
- height: calc(100vh - env(safe-area-inset-bottom) - 96rpx);
box-sizing: border-box;
+ height: calc(100vh - env(safe-area-inset-bottom) - 86rpx);
overflow-y: auto;
}
@@ -31,8 +24,13 @@
}
.t-tabs {
- margin-top: 20rpx;
+ padding-top: 20rpx;
background: none !important;
+ width: 100%;
+ position: fixed;
+ top: 0rpx;
+ left: 0;
+ z-index: 1
}
.t-tabs__wrapper {
@@ -74,7 +72,7 @@
background: #fff;
min-height: 200rpx;
border-radius: 10rpx;
- margin-top: -30rpx;
+
padding: 60rpx 40rpx 40rpx 40rpx;
}
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index cd12887..ff98b95 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -10,13 +10,15 @@
</view>
<view class="list-header">
<view class="header-scroll">
- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox">
+ <!-- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox"> -->
+ <view class="srcolbox">
<t-dropdown-menu>
- <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" default-value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" arrow-icon="" />
- <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" arrow-icon="" />
+ <t-dropdown-item label="鎬诲垎绫�" options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
+ <t-dropdown-item label="涓�绾�" options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" />
<t-dropdown-item label="浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
</t-dropdown-menu>
- </scroll-view>
+ </view>
+ <!-- </scroll-view> -->
</view>
<view class="header-sort" bind:tap="sortClick">
<view class="sort-name">鎺掑簭</view>
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index 12603b3..bde13fa 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -92,9 +92,9 @@
}
.t-dropdown-menu__item--active {
- height: 86rpx !important;
+ /* height: 86rpx !important; */
background: #F6F6F6 !important;
- border-radius: 40rpx 40rpx 0 0;
+ /* border-radius: 40rpx 40rpx 0 0; */
}
.t-radio__title {
diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml
index 7402a14..b677700 100644
--- a/pages/bookExhibitionList/index.wxml
+++ b/pages/bookExhibitionList/index.wxml
@@ -21,15 +21,8 @@
<t-dropdown-menu class="classification">
<t-dropdown-item options="{{product.options}}" value="{{product.value}}" bindchange="onChange" />
<t-dropdown-item class="{{keynoteDisabled ? 'disableds' : ' '}}" disabled="{{keynoteDisabled}}" label=" 閲嶇偣椤圭洰" options="{{multipleSelect.options}}" value="{{multipleSelect.value}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" show-overlay="{{true}}">
-
-
-
</t-dropdown-item>
-
</t-dropdown-menu>
-
-
-
<view class="outsideSortBox">
<view class="sortBox" bind:tap="onSwapRight">
<text>鎺掑簭</text>
diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js
index 190cc96..a6682bd 100644
--- a/pages/personalCenter/index.js
+++ b/pages/personalCenter/index.js
@@ -1,6 +1,5 @@
const app = getApp()
-const menuData = [
- {
+const menuData = [{
title: '鎴戠殑璁㈠崟',
icon: '/static/images/personal/order.png',
url: '/packagePersonal/pages/myOrder/index',
@@ -49,8 +48,7 @@
type: 'publishBooks',
}
];
-const moreMenu = [
- {
+const moreMenu = [{
title: '鎴戠殑娑堟伅',
icon: '/static/images/personal/notification.png',
url: '/packagePersonal/pages/myMassage/index',
@@ -63,8 +61,7 @@
type: 'feedback',
}
];
-const moreMenu1 = [
- {
+const moreMenu1 = [{
title: '鍏充簬鎴戜滑',
icon: '/static/images/personal/about.png',
url: '/packagePersonal/pages/aboutUs/index?types=jsek_aboutUs',
@@ -77,8 +74,7 @@
type: 'contact',
}
];
-const userTypeList = [
- {
+const userTypeList = [{
lable: '涓亴鏁欏笀',
value: 'vocSchoolTeachers'
},
@@ -119,7 +115,11 @@
visible: false,
baseRefresh: {
value: false
- }
+ },
+ loadingProps: {
+ size: '50rpx',
+ },
+ scrollTop: 0,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -165,8 +165,7 @@
/**
* 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
*/
- onReachBottom() {
- },
+ onReachBottom() {},
// 鑾峰彇鐧诲綍鐢ㄦ埛韬唤
getUserInfo() {
app.MG.identity.getCurrentAppUser().then(res => {
@@ -281,20 +280,22 @@
});
},
tabUserTypeClick(e) {
- let { info } = e.currentTarget.dataset;
+ let {
+ info
+ } = e.currentTarget.dataset;
this.setData({
userTypeActive: info.value,
});
},
submit() {
let userTypeInfo = {
- requests: [
- {
- data: JSON.stringify({ userType: this.data.userTypeActive }),
- name: '鐢ㄦ埛绫诲瀷',
- type: 'userType'
- }
- ]
+ requests: [{
+ data: JSON.stringify({
+ userType: this.data.userTypeActive
+ }),
+ name: '鐢ㄦ埛绫诲瀷',
+ type: 'userType'
+ }]
}
app.MG.identity.setAppUserInfo(userTypeInfo).then((res) => {
if (res) {
@@ -337,8 +338,15 @@
this.setData({
isWhite: e.detail.scrollTop > 10 ? true : false
})
+ const {
+ scrollTop
+ } = e.detail;
+ this.setData({
+ scrollTop
+ });
},
+
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
diff --git a/pages/personalCenter/index.wxml b/pages/personalCenter/index.wxml
index 50cd24b..9e03e35 100644
--- a/pages/personalCenter/index.wxml
+++ b/pages/personalCenter/index.wxml
@@ -1,5 +1,5 @@
<view>
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+ <t-pull-down-refresh value="{{baseRefresh.value}}" loadingProps="{{loadingProps}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
<view style="width: 100%; height: {{barHeight}}px;"></view>
<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
<text class="text">涓汉涓績</text>
--
Gitblit v1.9.1