From 6608a6839d771d38640988e3ee496ecdd91765a4 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 09 四月 2024 15:12:59 +0800
Subject: [PATCH] 代码合并
---
packageDomain/pages/sampleBookList/index.wxml | 9
packageDomain/pages/sampleBookList/index.wxss | 2
pages/personalCenter/feedBackSubmit/index.js | 17 +
packagePersonal/pages/myMassage/index.js | 18 +
packageBookService/pages/bookServices/detail/index.wxml | 290 +++++---------------------------
packageDomain/pages/sampleBookList/applicationForm/index.js | 12 +
packagePersonal/pages/feedBack/index.js | 23 +-
packageDomain/pages/sampleBookList/index.js | 114 +++++++-----
packageDomain/pages/sampleBookList/index.json | 3
packagePersonal/pages/downloads/index.js | 2
10 files changed, 170 insertions(+), 320 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index f15c2de..df12911 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -4,55 +4,30 @@
<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>
<view class="navbar-title">{{options.name}}</view>
</view>
<t-toast id="t-toast" />
- <scroll-view
- scroll-y="{{true}}"
- class="book"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
<!-- 鍥句功璇︽儏 -->
<view class="book-box">
<view class="book-detail" id="book-detail">
<view class="detail-left">
<view class="book-img">
- <image
- loading=""
- src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFill"
- aria-label="{{bookDetail.name}}"
- />
+ <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/collect.png"
- wx:if="{{!bookDetail.isFavourite}}"
- />
- <image
- loading=""
- src="/static/images/bookService/detail/collecting.png"
- wx:if="{{bookDetail.isFavourite}}"
- />
+ <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
+ <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image
- loading=""
- src="/static/images/bookService/detail/suggest.png"
- />
+ <image loading="" src="/static/images/bookService/detail/suggest.png" />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -74,24 +49,15 @@
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
- >鍑虹増鏃堕棿锛�</view
- >
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view
- class="message-li"
- wx:if="{{bookDetail.class}}"
- style="height: 80rpx"
- >
+ <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
- <image
- src="/static/images/bookService/detail/square.png"
- class="right-background"
- />
+ <image src="/static/images/bookService/detail/square.png" class="right-background" />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -100,17 +66,12 @@
<!-- 鐢靛瓙涔﹀敭浠� -->
<view class="electron-price" wx:if="{{bookDetail.price}}">
<view>
- <image
- src="/static/images/bookService/detail/electon-price.png"
- />
+ <image src="/static/images/bookService/detail/electon-price.png" />
</view>
<view class="price">
- <view class="price-text"
- >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
- bookDetail.price}}</view
- >
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
- >楼{{bookDetail.oldPrice}}
+ <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view>
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
@@ -120,66 +81,24 @@
<view>
<image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price"
- >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- '楼'+bookDetail.paperPrice}}</view
- >
+ <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view>
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image
- src="/static/images/bookService/detail/jd.png"
- wx:if="{{bookDetail.JDLink}}"
- bind:tap="goShop"
- data-link="{{bookDetail.JDLink}}"
- data-type="jd"
- />
- <image
- class="tmall-image"
- src="/static/images/bookService/detail/tmall.png"
- bind:tap="goShop"
- data-link="{{bookDetail.tmallLink}}"
- wx:if="{{bookDetail.tmallLink}}"
- />
- <image
- src="/static/images/bookService/detail/dangdang.png"
- bind:tap="goShop"
- data-link="{{bookDetail.dangdangLink}}"
- wx:if="{{bookDetail.dangdangLink}}"
- />
- <image
- src="/static/images/bookService/detail/weidian.png"
- bind:tap="goShop"
- data-link="{{bookDetail.weidianLink}}"
- wx:if="{{bookDetail.weidianLink}}"
- />
+ <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
+ <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
+ <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
+ <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs
- value="{{tabValue}}"
- bind:change="onTabsChange"
- t-class="custom-tabs"
- t-class-content="custom-panel"
- class="tab-class"
- >
- <t-tab-panel
- label="鍥句功绠�浠�"
- icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
- value="brief"
- style="{{tabPanelstyle}}"
- >
- <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-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}">
+ <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>
@@ -190,141 +109,48 @@
style="{{tabPanelstyle}}"
>
</t-tab-panel> -->
- <t-tab-panel
- label="鏁欏璧勬簮"
- icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
- value="jsek_teachingResources"
- class="{{loading ? 'loading': ''}}"
- >
- <view
- wx:if="{{!loading && teach.length && !noResources && applyState}}"
- >
- <teach-resource
- applyState="{{applyState}}"
- rejectCause="{{rejectCause}}"
- deadline="{{deadline}}"
- bind:applyResource="applyResource"
- applyResourceLoading="{{applyResourceLoading}}"
- ></teach-resource>
- <tree
- id="teach-tree"
- openIds="{{openTeachids}}"
- bookInfo="{{bookDetail}}"
- treeList="{{teach}}"
- tab="{{tabValue}}"
- applyState="{{applyState}}"
- bind:downloadTeach="downloadTeach"
- bind:handleTree="handleTree"
- openTeachids="{{openTeachids}}"
- wx:if="{{teach.length}}"
- ></tree>
+ <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <view wx:if="{{!loading && teach.length && !noResources && applyState}}">
+ <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
+ <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
</view>
- <t-loading
- theme="circular"
- size="60rpx"
- class="loading"
- loading="{{loading }}"
- />
+ <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戝涔�"
- icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
- value="jsek_cloudLearning"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
<view wx:if="{{!loading && learn.length}}">
- <learn-resource
- bind:getFreeResource="getFreeResource"
- bind:allAddShoppiingCar="allAddShoppiingCar"
- id="learn-resource"
- buyResourceData="{{buyResourceData}}"
- bookId="{{bookDetail.id}}"
- isshowDrawBtn="{{isshowDrawBtn}}"
- ></learn-resource>
+ <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource>
- <tree
- id="tree"
- openIds="{{openLearnids}}"
- bookInfo="{{bookDetail}}"
- tab="{{tabValue}}"
- treeList="{{learn}}"
- buyIds="{{buyIdList}}"
- openLearnids="{{openLearnids}}"
- bind:updateShoppingCartHidden="updateShoppingCartHidden"
- bind:updateCloudLearning="updateCloudLearning"
- ></tree>
+ <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戞祴璇�"
- icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
- value="questionBank"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
<view wx:if="{{!loading}}">
- <test-resource
- id="test-resource"
- list="{{test}}"
- bookInfo="{{bookDetail}}"
- mockData="{{mockData}}"
- bind:buyMock="buyMock"
- ></test-resource>
+ <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource>
</view>
</t-tab-panel>
- <t-tab-panel
- label="浜戠瑪璁�"
- icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
- value="jsek_note"
- style="{{tabPanelstyle}}"
- >
+ <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
<note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
</t-tab-panel>
- <t-tab-panel
- label="鐩稿叧鍥句功"
- icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
- value="related_books"
- style="{{tabPanelstyle}}"
- >
- <related-books
- relatedBookData="{{relatedBookData}}"
- relatedBookLoading="{{relatedBookLoading}}"
- noRelatedBookData="{{noRelatedBookData}}"
- bind:goBookDetails="goBookDetails"
- ></related-books>
+ <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
+ <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
</t-tab-panel>
</t-tabs>
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
- <suggest
- class="suggest-component"
- id="suggest-component"
- bookIcon="{{bookDetail.icon}}"
- bookName="{{bookDetail.name}}"
- ></suggest>
+ <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
- <t-dialog
- class="teachDownloadDialog"
- visible="{{isShowTeachDownload}}"
- title="鎻愮ず"
- content="璇峰墠寰�PC绔笅杞�"
- confirm-btn="{{ confirmBtn }}"
- bind:confirm="closeTeachDownload"
- />
+ <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image
- src="/static/images/home/yangshuForm1.png"
- mode="heightFix"
- class="img"
- />
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
</view>
@@ -332,54 +158,30 @@
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image
- loading=""
- src="/static/images/bookService/detail/ebook.png"
- ></t-image>
+ <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image
- src="/static/images/bookService/detail/paper-book.png"
- ></t-image>
+ <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view
- class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
- bind:tap="goRead"
- wx:if="{{!bookBuy}}"
- >
+ <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy}}">
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
</view>
<view class="btn-text">璇曡</view>
</view>
- <view
- class="shopCar shopCarColor"
- bind:tap="addBookShopcCar"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >鍔犲叆璐墿杞�</view
- >
- <view
- class="buy buyColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}"
- >绔嬪嵆璐拱</view
- >
- <view
- class="buy receiveColor"
- bind:tap="buyBtn"
- wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
- >鍏嶈垂棰嗗彇</view
- >
+ <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view>
+ <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view>
+ <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">鍏嶈垂棰嗗彇</view>
<view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
</view>
<view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index 6b599f9..b1831f9 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -46,6 +46,18 @@
'contactInfo.phone': JSON.parse(this.data.userInfo.data).phone,
'contactInfo.detailedAddress': JSON.parse(this.data.userInfo.data).detailedAddress,
})
+ } else {
+ wx.showModal({
+ title: '灏婃暚鐨勭敤鎴凤紝鎮ㄥソ锛�', //鎻愮ず鐨勬爣棰�
+ content: '璇峰厛杩涜鏁欏笀璁よ瘉锛�', //鎻愮ず鐨勫唴瀹�
+ success: function (res) {
+ if (res.confirm) {
+ wx.navigateTo({
+ url: "/packageDomain/pages/teacherCertification/index",
+ });
+ }
+ }
+ })
}
if (wx.getStorageSync("paperBookList")) {
this.setData({
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 0858a02..6861e0e 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -50,6 +50,30 @@
stairCode: '', // 涓�绾у垎绫婚�変腑椤�
secondCode: '', // 浜岀骇鍒嗙被閫変腑椤�
sort: '', // 鎺掑簭
+ sortList: {
+ value: "default",
+ options: [{
+ value: "default",
+ label: "榛樿鎺掑簭",
+ },
+ {
+ value: "name-asc",
+ label: "鍚嶇О姝ｅ簭",
+ },
+ {
+ value: "name-desc",
+ label: "鍚嶇О鍊掑彊",
+ },
+ {
+ value: "time-asc",
+ label: "鍑虹増鏃堕棿姝ｅ簭",
+ },
+ {
+ value: "time-desc",
+ label: "鍑虹増鏃堕棿鍊掑彊",
+ },
+ ],
+ },
//鍒嗛〉
page: 1,
limit: 10,
@@ -170,7 +194,6 @@
// 鑾峰彇鐢宠娆℃暟
this.getSelectPaperBookCount()
this.getSelectBookCount()
- console.log(this.data.electronicBookList.length, this.data.paperBookList.length, 1)
if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
if (wx.getStorageSync("paperBookList")) {
this.setData({
@@ -287,7 +310,6 @@
'stairList.options': options,
'stairList.value': this.data.stairCode,
});
- console.log(this.data.stairList.options)
});
},
// 鑾峰彇涓�绾у垎绫讳笅浜岀骇鍒嗙被
@@ -384,17 +406,43 @@
queryType: '*',
};
}
- if (that.data.sort) {
+ if (this.data.sortList.value == "name-asc") {
sort = {
- Name: that.data.sort,
- BaseType: '',
+ Name: "Asc",
+ BaseType: "",
};
- } else {
+ } else if (this.data.sortList.value == "name-desc") {
sort = {
- type: 'Desc',
- field: 'ViewCount',
+ Name: "Desc",
+ BaseType: "",
+ };
+ } else if (this.data.sortList.value == "time-asc") {
+ sort = {
+ PublicationDate: "Asc",
+ BaseType: "DateTime",
+ };
+ } else if (this.data.sortList.value == "time-desc") {
+ sort = {
+ PublicationDate: "Desc",
+ BaseType: "DateTime",
+ };
+ } else if (this.data.sortList.value == "default") {
+ sort = {
+ field: "order",
+ type: "Desc",
};
}
+ // if (that.data.sort) {
+ // sort = {
+ // Name: that.data.sort,
+ // BaseType: '',
+ // };
+ // } else {
+ // sort = {
+ // type: 'Desc',
+ // field: 'ViewCount',
+ // };
+ // }
// 鎼滅储
let searchObj = {};
if (that.data.searchValue) {
@@ -495,6 +543,8 @@
})
} else {
that.setData({
+ bookList: [],
+ pageTotalCount: 0,
skeletonLoding: false,
loading: false
})
@@ -553,60 +603,32 @@
onConfirmSecond() {
this.getBookList(false);
},
- // 閲嶇偣椤圭洰鏀瑰彉
- changeMajorProject(e) {
+ onResetSecond() {
this.setData({
- 'majorProjectList.value': e.detail.value,
+ 'secondList.value': [],
});
this.getBookList(false);
},
- // 閲嶇偣椤圭洰閲嶇疆
- resetMajorProject() {
+
+ // 鎺掑簭鍒囨崲
+ onSortChange(e) {
this.setData({
- 'majorProjectList.value': [],
+ backTop: "#assort-title",
+ "sortList.value": e.detail.value,
});
- this.getBookList(false);
- },
- changeNewText(e) {
- this.setData({
- 'newTextBook.value': e.detail.value,
- });
- this.getBookList(false);
- },
- resetNewText() {
- this.setData({
- 'newTextBook.value': [],
- });
- this.getBookList(false);
- },
- // 鎺掑簭鎸夐挳
- sortClick() {
- if (!this.data.sort.length) {
- this.setData({
- sort: 'Desc',
- });
- } else if (this.data.sort == 'Desc') {
- this.setData({
- sort: 'Asc',
- });
- } else if (this.data.sort == 'Asc') {
- this.setData({
- sort: '',
- });
- }
+
let path;
if (this.data.secondCode) {
path = this.data.secondCode;
} else if (this.data.stairCode) {
- path = `${this.data.assortCheck.code
- }\\${this.data.stairCode}`;
+ path = `${this.data.assortCheck.code}\\${this.data.stairCode}`;
} else {
path = this.data.assortCheck.code;
}
this.setData({
path: path,
});
- this.getBookList(false);
+ this.getBookList(path);
},
// 鎼滅储鍥句功
searchBook(e) {
diff --git a/packageDomain/pages/sampleBookList/index.json b/packageDomain/pages/sampleBookList/index.json
index cf12577..f62f659 100644
--- a/packageDomain/pages/sampleBookList/index.json
+++ b/packageDomain/pages/sampleBookList/index.json
@@ -11,6 +11,7 @@
"t-search": "tdesign-miniprogram/search/search",
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox",
"t-loading": "tdesign-miniprogram/loading/loading",
- "t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh"
+ "t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh",
+ "t-empty": "tdesign-miniprogram/empty/empty"
}
}
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index d5999cb..1d214f0 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -2,7 +2,7 @@
<view clas="container">
<view class="page-header">
<view style="width: 100%; height: {{barHeight}}px;"></view>
- <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+ <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
<view>
<t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
</view>
@@ -15,18 +15,19 @@
<t-dropdown-menu>
<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" disabled="{{assortCheck.code == '' || stairList.options.length == 0}}" />
- <t-dropdown-item label=" 浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" />
+ <t-dropdown-item label=" 浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" bind:reset="onResetSecond" disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" />
+ <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" />
</t-dropdown-menu>
</view>
<!-- </scroll-view> -->
</view>
- <view class=" header-sort" bind:tap="sortClick">
+ <!-- <view class=" header-sort" bind:tap="sortClick">
<view class="sort-name">鎺掑簭</view>
<view class="sort-icon">
<t-icon name="swap-left" size="24rpx" class="icon-right" color="{{sort == 'Asc' ? '#ff6c00' : ''}}" />
<t-icon name="swap-left" size="24rpx" class="icon-left" color="{{sort == 'Desc' ? '#ff6c00' : ''}}" />
</view>
- </view>
+ </view> -->
</view>
</view>
<view class="bookServices-list">
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index b385e63..ff97538 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -48,7 +48,7 @@
}
.header-scroll {
- width: 80vw;
+ width: 100vw;
}
.srcolbox {
diff --git a/packagePersonal/pages/downloads/index.js b/packagePersonal/pages/downloads/index.js
index 76aa687..f87e7d1 100644
--- a/packagePersonal/pages/downloads/index.js
+++ b/packagePersonal/pages/downloads/index.js
@@ -67,6 +67,8 @@
})
} else {
this.setData({
+ list: [],
+ pageTotalCount: 0,
skeletonLoding: false,
})
}
diff --git a/packagePersonal/pages/feedBack/index.js b/packagePersonal/pages/feedBack/index.js
index e1511ec..618acf0 100644
--- a/packagePersonal/pages/feedBack/index.js
+++ b/packagePersonal/pages/feedBack/index.js
@@ -9,8 +9,7 @@
data: {
active: 0,
activeName: "bookOpinion",
- tabList: [
- {
+ tabList: [{
label: '鍥句功寤鸿',
key: 0,
value: 'bookOpinion'
@@ -80,15 +79,15 @@
getDataList(isReachBottom) {
app.MG.ugc.getTopicMessageList({
- appRefCode: app.config.appRefCode,
- topicIdOrRefCode: this.data.topicIdOrRefCode,
- start: this.data.page * this.data.limit - this.data.limit,
- size: this.data.limit,
- sort: {
- type: "Desc",
- field: "CreateDate"
- }
- })
+ appRefCode: app.config.appRefCode,
+ topicIdOrRefCode: this.data.topicIdOrRefCode,
+ start: this.data.page * this.data.limit - this.data.limit,
+ size: this.data.limit,
+ sort: {
+ type: "Desc",
+ field: "CreateDate"
+ }
+ })
.then(res => {
try {
if (res.datas.length > 0) {
@@ -112,6 +111,8 @@
})
} else {
this.setData({
+ list: [],
+ pageTotalCount: 0,
skeletonLoding: false,
})
}
diff --git a/packagePersonal/pages/myMassage/index.js b/packagePersonal/pages/myMassage/index.js
index 34762a5..998b88d 100644
--- a/packagePersonal/pages/myMassage/index.js
+++ b/packagePersonal/pages/myMassage/index.js
@@ -29,14 +29,14 @@
getDataList(isReachBottom) {
app.MG.app.getAppMessageList({
- appRefCode: app.config.appRefCode,
- start: this.data.page * this.data.limit - this.data.limit,
- size: this.data.limit,
- sort: {
- type: "Desc",
- field: "CreateDate"
- }
- })
+ appRefCode: app.config.appRefCode,
+ start: this.data.page * this.data.limit - this.data.limit,
+ size: this.data.limit,
+ sort: {
+ type: "Desc",
+ field: "CreateDate"
+ }
+ })
.then(res => {
try {
if (res.datas.length > 0) {
@@ -59,6 +59,8 @@
})
} else {
this.setData({
+ list: [],
+ pageTotalCount: 0,
skeletonLoding: false,
})
}
diff --git a/pages/personalCenter/feedBackSubmit/index.js b/pages/personalCenter/feedBackSubmit/index.js
index a6f3185..462762c 100644
--- a/pages/personalCenter/feedBackSubmit/index.js
+++ b/pages/personalCenter/feedBackSubmit/index.js
@@ -68,11 +68,18 @@
const {
phoneError
} = this.data;
- const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
- if (phoneError === isPhoneNumber) {
+ if (e.detail.value) {
+ const isPhoneNumber = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(e.detail.value);
+ if (phoneError === isPhoneNumber) {
+ this.setData({
+ phoneError: !isPhoneNumber,
+ mannder: e.detail.value,
+ });
+ }
+ } else {
this.setData({
- phoneError: !isPhoneNumber,
- mannder: e.detail.value,
+ phoneError: false,
+ mannder: ''
});
}
},
@@ -97,7 +104,7 @@
if (this.data.mannder.replace(/^\s*|\s*$/g, "") == '') {
this.data.lock = true;
wx.showToast({
- title: "鍙嶉鍐呭涓嶈兘涓虹┖",
+ title: "鑱旂郴鏂瑰紡涓嶈兘涓虹┖",
icon: 'none',
duration: 1000
})
--
Gitblit v1.9.1