From dc1b48bb46e5715a5a55ee2c0f60175b849a6b3b Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 09 四月 2024 19:32:30 +0800
Subject: [PATCH] 问题修改
---
packageBookService/pages/bookServices/list/index.wxml | 119 +---------
pages/home/home.js | 32 ++
packageDomain/pages/sampleBookList/index.wxml | 95 ++++----
packageDomain/pages/sampleBookList/index.wxss | 18 +
packageBookService/pages/bookServices/detail/index.wxml | 97 ++++----
packageBookService/pages/bookServices/list/index.js | 58 ++---
packageBookService/pages/bookServices/detail/index.wxss | 12 +
packageDomain/pages/sampleBookList/applicationForm/index.js | 36 +-
assets/js/config.js | 8
packageDomain/pages/sampleBookList/index.js | 138 ++++--------
10 files changed, 264 insertions(+), 349 deletions(-)
diff --git a/assets/js/config.js b/assets/js/config.js
index c98d8ff..458bd1a 100644
--- a/assets/js/config.js
+++ b/assets/js/config.js
@@ -1,7 +1,7 @@
-export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
-export const appId = 27;
-// export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
-// export const appId = 3;
+// export const requestCtx = "http://182.92.203.7:3001"; // 璇锋眰鍦板潃
+// export const appId = 27;
+export const requestCtx = "https://jsek.bnuic.com"; // 璇锋眰鍦板潃
+export const appId = 3;
// export const epubUrl = "http://182.92.203.7:3007/epubReadMobile/";
export const epubUrl = "https://jsek.bnuic.com/epubReadMobile/#/";
export const pdfUrl = "http://182.92.203.7:3007/pdfRead/";
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index df12911..e48ce1d 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -94,66 +94,69 @@
</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-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view>
- </t-tab-panel>
- <!-- <t-tab-panel
+ <movable-area class="movable-area">
+ <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-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+ </t-tab-panel>
+ <!-- <t-tab-panel
label="鐢靛瓙涔�"
icon="{{tabValue == 'jsek_eBook' ? eBookClickIcon : eBookIcon}}"
value="jsek_eBook"
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>
- </view>
- <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}}">
- <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>
+ <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 }}" />
+ <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}}">
+ <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>
- <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}}">
+ <view wx:if="{{!loading}}">
+ <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}}">
+ <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>
+ </t-tabs>
+ </view>
+ <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
+ <view class="applyBox" bindtap="goApply">
+ <view class="box">
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <view class="num" wx:if="{{num > 0}}">{{num}}</view>
</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}}">
- <view wx:if="{{!loading}}">
- <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}}">
- <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>
- </t-tabs>
- </view>
+ </view>
+ </movable-view>
+ </movable-area>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
<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" />
-
- <view class="applyBox" bindtap="goApply">
- <view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
- <view class="num" wx:if="{{num > 0}}">{{num}}</view>
- </view>
- </view>
<!-- 璐拱鎸夐挳 -->
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 21eac5e..396a0f8 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -336,6 +336,18 @@
height: 100%;
}
+.movable-area {
+ width: 100%;
+ height: 100%;
+}
+
+.movable-view {
+ width: 184rpx;
+ height: 184rpx;
+ top: 400rpx;
+ left: 520rpx;
+}
+
.applyBox {
width: 184rpx;
height: 184rpx;
diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 6f9dd50..a870a7d 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -1,5 +1,7 @@
const app = getApp();
-import { loginInfo } from "../../../../assets/js/login";
+import {
+ loginInfo
+} from "../../../../assets/js/login";
Page({
/**
* 椤甸潰鐨勫垵濮嬫暟鎹�
@@ -22,12 +24,7 @@
bookList: [],
stairList: {
value: "",
- options: [
- {
- value: "",
- label: "涓�绾�",
- },
- ],
+ options: [],
},
secondList: {
value: [],
@@ -40,8 +37,7 @@
},
sortList: {
value: "default",
- options: [
- {
+ options: [{
value: "default",
label: "榛樿鎺掑簭",
},
@@ -127,13 +123,11 @@
if (options.secondCode) {
this.setData({
secondCode: options.secondCode,
- pathList: [
- {
- Path: options.secondCode,
- Type: "*",
- StoreRefCode: app.config.goodsStore,
- },
- ],
+ pathList: [{
+ Path: options.secondCode,
+ Type: "*",
+ StoreRefCode: app.config.goodsStore,
+ }, ],
});
}
// 鑾峰彇浜岀骇鍒嗙被
@@ -228,12 +222,10 @@
},
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
- const options = [
- {
- value: "",
- label: "涓�绾�",
- },
- ];
+ const options = [{
+ value: "",
+ label: "涓�绾у垎绫�",
+ }, ];
for (let index = 0; index < res.datas.length; index++) {
const item = res.datas[index];
options.push({
@@ -426,12 +418,10 @@
}
const query = {
...pathObj,
- filterList: [
- {
- value: "Normal",
- field: "state",
- },
- ],
+ filterList: [{
+ value: "Normal",
+ field: "state",
+ }, ],
sort,
paging: {
start: 0,
@@ -471,9 +461,9 @@
},
// 涓�绾у垎绫诲垏鎹�
onChangeStair(e) {
- const path = e.detail.value.length
- ? `${this.data.assortCheck.code}\\${e.detail.value}`
- : this.data.assortCheck.code;
+ const path = e.detail.value.length ?
+ `${this.data.assortCheck.code}\\${e.detail.value}` :
+ this.data.assortCheck.code;
console.log(this.data.path);
this.setData({
@@ -603,7 +593,9 @@
},
// 璺宠浆鍥句功璇︽儏
goDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
@@ -626,4 +618,4 @@
showDropdown: false,
});
},
-});
+});
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 8749e98..d97dfb4 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -3,71 +3,20 @@
<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">
<view class="header-scroll">
<t-dropdown-menu style="width: 1200rpx">
- <t-dropdown-item
- disabled="{{disabledStair}}"
- optionsColumns="2"
- options="{{stairList.options}}"
- value="{{stairList.value}}"
- bindchange="onChangeStair"
- />
- <t-dropdown-item
- disabled="{{disabledSecondList}}"
- label="浜岀骇"
- bind:open="openDropdown"
- bind:close="closeDropdown"
- options="{{secondList.options}}"
- optionsColumns="2"
- multiple
- value="{{secondList.value}}"
- bind:confirm="onConfirmSecond"
- bind:change="onChangeSecond"
- />
- <t-dropdown-item
- label="閲嶇偣椤圭洰"
- disabled="{{disabledProject}}"
- options="{{majorProjectList.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{majorProjectList.value}}"
- bind:confirm="changeMajorProject"
- bind:reset="resetMajorProject"
- />
- <t-dropdown-item
- label="鏂板舰鎬佹暀鏉�"
- disabled="{{disabledNewForms}}"
- options="{{newTextBook.options}}"
- optionsColumns="2"
- multiple
- defaultValue="{{newTextBook.value}}"
- bind:confirm="changeNewText"
- bind:reset="resetNewText"
- />
- <t-dropdown-item
- options="{{sortList.options}}"
- value="{{sortList.value}}"
- bindchange="onSortChange"
- />
+ <t-dropdown-item disabled="{{disabledStair}}" optionsColumns="2" options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" />
+ <t-dropdown-item disabled="{{disabledSecondList}}" label="浜岀骇" bind:open="openDropdown" bind:close="closeDropdown" options="{{secondList.options}}" optionsColumns="2" multiple value="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:change="onChangeSecond" />
+ <t-dropdown-item label="閲嶇偣椤圭洰" disabled="{{disabledProject}}" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" />
+ <t-dropdown-item label="鏂板舰鎬佹暀鏉�" disabled="{{disabledNewForms}}" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" />
+ <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" />
</t-dropdown-menu>
</view>
<!-- <view class="header-sort">
@@ -76,28 +25,10 @@
</t-dropdown-menu>
</view> -->
</view>
- <scroll-view
- scroll-y="{{true}}"
- scroll-into-view="{{backTop}}"
- refresher-enabled="{{true}}"
- lower-threshold="{{200}}"
- refresher-threshold="{{80}}"
- refresher-default-style="none"
- refresher-triggered="{{triggered}}"
- bindrefresherrefresh="onPullDownRefresh"
- bindrefresherpulling="{{refresh.onPulling}}"
- class="list-container"
- bindrefresherrefresh="onPullDownRefresh"
- bindscrolltolower="onReachBottom"
- >
+ <scroll-view scroll-y="{{true}}" scroll-into-view="{{backTop}}" refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherrefresh="onPullDownRefresh" bindrefresherpulling="{{refresh.onPulling}}" class="list-container" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
<view slot="refresher" class="refresh-container">
<view class="loading">
- <t-loading
- theme="circular"
- size="40rpx"
- text="姝ｅ湪鍒锋柊..."
- class="wrapper"
- />
+ <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
<view class="assort-title" id="assort-title">
@@ -106,19 +37,9 @@
</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="aspectFit"
- />
+ <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="aspectFit" />
</view>
<view class="book-name book-color">{{ item.name}}</view>
<view class="book-author book-color">{{item.author}}</view>
@@ -129,25 +50,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" wx:if="{{bookList.length}}">
- <t-loading
- theme="circular"
- size="40rpx"
- class="wrapper"
- wx:if="{{isMore == true}}"
- loading="{{isMore}}"
- />
+ <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" loading="{{isMore}}" />
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</scroll-view>
</view>
-</page-meta>
+</page-meta>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js
index b1831f9..baf669e 100644
--- a/packageDomain/pages/sampleBookList/applicationForm/index.js
+++ b/packageDomain/pages/sampleBookList/applicationForm/index.js
@@ -34,17 +34,21 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
+ let that = this;
+ that.setData({
+ bookList: []
+ })
if (wx.getStorageSync(app.config.userInfoKey)) {
- this.setData({
+ that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- if (this.data.userInfo.role == 'Teacher') {
- this.setData({
- 'teacherInfo.schoolName': JSON.parse(this.data.userInfo.data).schoolName,
- 'teacherInfo.courseName': JSON.parse(this.data.userInfo.data).courseName,
- 'contactInfo.fullName': JSON.parse(this.data.userInfo.data).fullName,
- 'contactInfo.phone': JSON.parse(this.data.userInfo.data).phone,
- 'contactInfo.detailedAddress': JSON.parse(this.data.userInfo.data).detailedAddress,
+ if (that.data.userInfo.role == 'Teacher') {
+ that.setData({
+ 'teacherInfo.schoolName': JSON.parse(that.data.userInfo.data).schoolName,
+ 'teacherInfo.courseName': JSON.parse(that.data.userInfo.data).courseName,
+ 'contactInfo.fullName': JSON.parse(that.data.userInfo.data).fullName,
+ 'contactInfo.phone': JSON.parse(that.data.userInfo.data).phone,
+ 'contactInfo.detailedAddress': JSON.parse(that.data.userInfo.data).detailedAddress,
})
} else {
wx.showModal({
@@ -60,19 +64,19 @@
})
}
if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
- bookList: wx.getStorageSync("paperBookList")
+ that.setData({
+ paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
+ bookList: JSON.parse(wx.getStorageSync("paperBookList"))
})
}
if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList")
+ that.setData({
+ electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList"))
})
}
- this.getSelectBookCount();
- this.getSelectPaperBookCount();
- this.getPaperType();
+ that.getSelectBookCount();
+ that.getSelectPaperBookCount();
+ that.getPaperType();
}
},
diff --git a/packageDomain/pages/sampleBookList/index.js b/packageDomain/pages/sampleBookList/index.js
index 6861e0e..8ee6d3b 100644
--- a/packageDomain/pages/sampleBookList/index.js
+++ b/packageDomain/pages/sampleBookList/index.js
@@ -14,7 +14,6 @@
userInfo: null,
path: '*',
pathList: [],
-
bookList: [],
//楂樼骇鍒嗙被
iconList: {
@@ -24,20 +23,13 @@
//涓�绾у垎绫�
stairList: {
value: '',
- options: [],
+ options: [{
+ value: "",
+ label: "涓�绾у垎绫�",
+ }],
},
//浜岀骇鍒嗙被
secondList: {
- value: [],
- options: [],
- },
- //閲嶇偣椤圭洰
- majorProjectList: {
- value: [],
- options: [],
- },
- //鏂板舰鎬佹暀鏉�
- newTextBook: {
value: [],
options: [],
},
@@ -46,7 +38,6 @@
name: '',
code: '',
},
-
stairCode: '', // 涓�绾у垎绫婚�変腑椤�
secondCode: '', // 浜岀骇鍒嗙被閫変腑椤�
sort: '', // 鎺掑簭
@@ -91,28 +82,31 @@
paperBookCount: 0, //绾歌川涔﹀墿浣欐鏁�
ebookCount: 0, //鐢靛瓙涔﹀墿浣欐鏁�
num: 0,
+ x: 280,
+ y: 300,
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ let that = this;
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
- this.setData({
+ that.setData({
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
// 鎼滅储璧嬪��
if (options && options.searchValue) {
- this.setData({
+ that.setData({
searchValue: options.searchValue,
});
}
// 楂樼骇鍒嗙被璧嬪��
if (options && options.assortCode) {
- this.setData({
+ that.setData({
assortCheck: {
name: options.assorName,
code: options.assortCode,
@@ -120,13 +114,13 @@
},
});
}
- if (this.data.assortCheck.code) {
+ if (that.data.assortCheck.code) {
// 鑾峰彇涓�绾у垎绫�
- this.getStairList(this.data.assortCheck.code);
+ ththatis.getStairList(that.data.assortCheck.code);
}
// 涓�绾у垎绫诲拰path璧嬪��
if (options && options.assortCode && options.stairCode) {
- this.setData({
+ that.setData({
'stairList.value': options.stairCode,
stairCode: options.stairCode,
path: `${options.assortCode}\\${options.stairCode}`,
@@ -134,7 +128,7 @@
}
// 浜岀骇鍒嗙被璧嬪��
if (options && options.secondCode) {
- this.setData({
+ that.setData({
secondCode: options.secondCode,
pathList: [{
Path: options.secondCode,
@@ -143,30 +137,26 @@
}],
})
}
- this.getIconTypeList();
- // 鑾峰彇閲嶇偣椤圭洰
- this.getProjectList('bookClassification');
- //鏂板舰鎬佹暀鏉�
- this.getProjectList('newFormsTextbooks');
+ that.getIconTypeList();
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey)
if (!token) {
loginInfo(app, (data) => {
if (data) {
- this.setData({
+ that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
+ that.getAlreadyPBookList()
+ that.getAlreadyEBookList()
// 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
+ that.getSelectPaperBookCount()
+ that.getSelectBookCount()
}
})
} else {
- this.setData({
+ that.setData({
userInfo: JSON.parse(wx.getStorageSync(app.config.userInfoKey))
})
@@ -184,32 +174,33 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
- this.setData({
+ let that = this;
+ that.setData({
page: 1,
paperBookList: [],
electronicBookList: []
})
- this.getAlreadyPBookList()
- this.getAlreadyEBookList()
+ that.getAlreadyPBookList()
+ that.getAlreadyEBookList()
// 鑾峰彇鐢宠娆℃暟
- this.getSelectPaperBookCount()
- this.getSelectBookCount()
+ that.getSelectPaperBookCount()
+ that.getSelectBookCount()
if (wx.getStorageSync("paperBookList") || wx.getStorageSync("electronicBookList")) {
if (wx.getStorageSync("paperBookList")) {
- this.setData({
- paperBookList: wx.getStorageSync("paperBookList"),
+ that.setData({
+ paperBookList: JSON.parse(wx.getStorageSync("paperBookList")),
})
}
if (wx.getStorageSync("electronicBookList")) {
- this.setData({
- electronicBookList: wx.getStorageSync("electronicBookList"),
+ that.setData({
+ electronicBookList: JSON.parse(wx.getStorageSync("electronicBookList")),
})
}
- this.setData({
- num: this.data.paperBookList.length + this.data.electronicBookList.length
+ that.setData({
+ num: Number(that.data.paperBookList.length) + Number(that.data.electronicBookList.length)
})
}
- this.getBookList(false);
+ that.getBookList(false);
},
goBack() {
wx.navigateBack();
@@ -260,7 +251,10 @@
}
}
app.MG.store.getStoreChannelList(query).then((res) => {
- let list = [];
+ let list = [{
+ value: "",
+ label: "鎬诲垎绫�",
+ }];
if (res.datas.length > 0)(
res.datas.forEach((item) => {
item.value = item.refCode;
@@ -276,7 +270,7 @@
)
this.setData({
'iconList.options': list,
- 'iconList.value': this.data.assortCode,
+ 'iconList.value': this.data.assortCheck.code,
});
})
},
@@ -296,7 +290,10 @@
},
};
app.MG.store.getStoreChannelList(query).then(async (res) => {
- let options = [];
+ let options = [{
+ value: "",
+ label: "涓�绾у垎绫�",
+ }];
if (res.datas.length > 0) {
for (let index = 0; index < res.datas.length; index++) {
let item = res.datas[index];
@@ -347,50 +344,7 @@
})
});
},
- // 鑾峰彇閲嶇偣椤圭洰
- getProjectList(type) {
- const options = [];
- const arr = [];
- let array = [];
- const query = {
- refCodes: [type],
- };
- app.MG.store.getProductTypeField(query).then((res) => {
- array = JSON.parse(res[0].config).option;
- for (let index = 0; index < array.length; index++) {
- const element = array[index];
- if (element.child) {
- for (let index = 0; index < element.child.length; index++) {
- const item = element.child[index];
- arr.push(item);
- }
- }
- }
- if (type == 'bookClassification') {
- for (let index = 0; index < arr.length; index++) {
- const element = arr[index];
- options.push({
- value: element.value,
- label: element.name,
- });
- }
- this.setData({
- 'majorProjectList.options': options,
- });
- } else if (type == 'newFormsTextbooks') {
- for (let index = 0; index < arr.length; index++) {
- const element = arr[index];
- options.push({
- value: element.value,
- label: element.name,
- });
- }
- this.setData({
- 'newTextBook.options': options,
- });
- }
- });
- },
+
// 鑾峰彇鍥句功鍒楄〃
getBookList(isReachBottom) {
let that = this;
@@ -916,13 +870,13 @@
this.setData({
electronicBookList: eList,
})
- wx.setStorageSync("electronicBookList", eList);
+ wx.setStorageSync("electronicBookList", JSON.stringify(eList));
} else {
pList.push(itemAttr)
this.setData({
paperBookList: pList,
})
- wx.setStorageSync("paperBookList", pList);
+ wx.setStorageSync("paperBookList", JSON.stringify(pList));
}
this.setData({
num: this.data.num + 1
diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml
index 1d214f0..3f7724b 100644
--- a/packageDomain/pages/sampleBookList/index.wxml
+++ b/packageDomain/pages/sampleBookList/index.wxml
@@ -13,8 +13,8 @@
<!-- <scroll-view scroll-x scroll-with-animation='true' class="srcolbox"> -->
<view class="srcolbox">
<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 options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" />
+ <t-dropdown-item 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" 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>
@@ -32,52 +32,57 @@
</view>
<view class="bookServices-list">
<view class="list-body">
- <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
- <view slot="refresher" class="refresh-container">
- <view class="loading">
- <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
- </view>
- </view>
- <view class="title">
- <view class="line"></view>
- <view class="icon">
- <image src="/static/images/home/yangshuliebiao.png" mode="aspectFit" class="iconImage" />
- </view>
- </view>
- <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}}" />
- <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.name}}" wx:else />
- </view>
- <view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view>
- <view class="book-author book-color">{{item.author}}</view>
- <view class="checkbox">
- <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
- <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
+ <movable-area class="movable-area">
+ <scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
+ <view slot="refresher" class="refresh-container">
+ <view class="loading">
+ <t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- </view>
- <view wx:if="{{bookList.length == 0 && !skeletonLoding}}" class="empyt">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view>
- <view class="bottom-loading" wx:if="{{bottomLoading}}">
- <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
- </view>
- <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 class="title">
+ <view class="line"></view>
+ <view class="icon">
+ <image src="/static/images/home/yangshuliebiao.png" mode="aspectFit" class="iconImage" />
+ </view>
+ </view>
+ <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}}" />
+ <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.name}}" wx:else />
+ </view>
+ <view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view>
+ <view class="book-author book-color">{{item.author}}</view>
+ <view class="checkbox">
+ <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless='true' checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" />
+ <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless='true' class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" />
+ </view>
+ </view>
+ </view>
+ <view wx:if="{{bookList.length == 0 && !skeletonLoding}}" class="empyt">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
+ <view class="bottom-loading" wx:if="{{bottomLoading}}">
+ <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
+ </view>
+ <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>
+ <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
+ <view class="applyBox" bindtap="goApply">
+ <view class="box">
+ <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <view class="num" wx:if="{{num > 0}}">{{num}}</view>
+ </view>
+ </view>
+ </movable-view>
+ </movable-area>
</view>
</view>
<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
- <view class="applyBox" bindtap="goApply">
- <view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
- <view class="num" wx:if="{{num > 0}}">{{num}}</view>
- </view>
- </view>
+
</view>
\ No newline at end of file
diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss
index ff97538..9c512d7 100644
--- a/packageDomain/pages/sampleBookList/index.wxss
+++ b/packageDomain/pages/sampleBookList/index.wxss
@@ -49,10 +49,11 @@
.header-scroll {
width: 100vw;
+ overflow-x: auto;
}
.srcolbox {
- width: 100%;
+ width: 900rpx;
white-space: nowrap;
}
@@ -279,14 +280,22 @@
margin-left: 10rpx;
}
+.movable-area {
+ width: 100%;
+ height: 100%;
+}
+.movable-view {
+ width: 184rpx;
+ height: 184rpx;
+ top: 800rpx;
+ left: 520rpx;
+}
.applyBox {
width: 184rpx;
height: 184rpx;
- position: fixed;
- bottom: 20%;
- right: 0;
+
}
.applyBox .box {
@@ -299,6 +308,7 @@
.applyBox .box .t-image {
width: 100%;
height: 100%;
+
}
.num {
diff --git a/pages/home/home.js b/pages/home/home.js
index cac6afc..063db05 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -173,6 +173,10 @@
start: 0,
size: 4
},
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
fields: {
liveTime: [],
lecturer: [],
@@ -198,7 +202,6 @@
getCourseTypeListList() {
const data = {
path: 'jsek_homepageDigitalCourses',
- filterList: [],
queryType: '\\',
searchList: [],
size: '20',
@@ -207,7 +210,11 @@
sort: {
type: 'Asc',
field: 'LinkOrder'
- }
+ },
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }]
}
app.MG.store.getStoreChannelList(data).then((res) => {
if (res.datas && res.datas.length > 0) {
@@ -233,6 +240,10 @@
start: 0,
size: 4
},
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
fields: {
courseLeader: [],
affiliatedUnit: [],
@@ -260,7 +271,10 @@
getBookTypeList() {
const data = {
path: 'jsek_homepageBookService',
- filterList: [],
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
queryType: '\\',
searchList: [],
size: '20',
@@ -297,6 +311,10 @@
start: 0,
size: 6
},
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
fields: {
author: []
}
@@ -327,6 +345,10 @@
start: 0,
size: 3
},
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
fields: {
author: []
}
@@ -349,6 +371,10 @@
start: 0,
size: 6
},
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
fields: {
author: [],
}
--
Gitblit v1.9.1