From 558845242a07b68f42fa1802c45ab2769395d8b8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 29 四月 2024 14:31:30 +0800
Subject: [PATCH] 合并代码
---
pages/home/home.js | 1
packageBookService/pages/bookServices/detail/buyResource/index.js | 5
packagePersonal/pages/myCollection/index.js | 1
pages/bookExhibitionList/select/select.wxss | 1
packageBookService/pages/bookServices/detail/index.wxml | 5
packageDomain/pages/resourceDetails/myAudio/index.js | 2
packageDomain/pages/resourceDetails/document/index.js | 21 ++
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 4
pages/bookExhibitionList/select/select.json | 3
packageBookService/pages/bookServices/detail/components/tree/index.js | 55 ++++++
packageBookService/pages/bookServices/detail/index.js | 53 ++++-
pages/home/home.wxml | 318 +++++++++++++++++++++++++++++-----
project.config.json | 16 -
packagePersonal/pages/sampleBooks/index.js | 1
14 files changed, 402 insertions(+), 84 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index b4032b9..8986936 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -127,7 +127,7 @@
// 鎵佸钩鍖栨暟鎹浆鎹ree
getTreeList(rootList, pathLength, newArr, path) {
for (const item of rootList) {
- if (item.productLinkPath.length == pathLength && item.productLinkPath.includes(path)) {
+ if ((pathLength - item.productLinkPath.length >= 0 && pathLength - item.productLinkPath.length <= 3) && item.productLinkPath.includes(path)) {
if (item.sysType == 'CmsItem') {
if (item.selectType == 'webpage') {
item.disabled = true
@@ -288,7 +288,8 @@
// })
// }
// debugger
- this.getTreeList(res.datas.cmsDatas[0].datas, 17, list, '\\')
+ const num = query.cmsPath.length + 6
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
list = this.ensureTreeConsistency(list)
list = this.changeResourceChildren(list)
console.log('淇敼鍚庝簯', list);
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 379c69a..c6d26b1 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -48,6 +48,9 @@
checkAllState: {
type: Boolean,
},
+ deadline: {
+ type: String
+ }
},
data: {
sonPurchaseSaleMethodId: "",
@@ -181,7 +184,7 @@
}
}
wx.navigateTo({
- url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}`,
+ url: `${url}?productLinkPath=${item.productLinkPath}&parentProductLinkPath=${parentProductLinkPath}&parentName=${parentName}&activeId=${item.id}&bookId=${this.properties.bookInfo.id}&bookName=${this.properties.bookInfo.name}&cmsId=${this.properties.bookInfo.rootCmsItemId}&formPath=${this.properties.tab}&applyState=${this.properties.applyState}&deadline=${this.properties.deadline}`,
});
console.log(item, '7899');
@@ -226,10 +229,60 @@
},
});
}
+<<<<<<< Updated upstream
+=======
+ // if (item.selectType == "document" || item.selectType == "pdf") {
+ // const fileLink = app.config.requestCtx + "/file/api/ApiDownload?md5=" + item.file;
+ // let filePath = wx.env.USER_DATA_PATH + '/' + item.name
+ // console.log(filePath, 'filePath');
+ // //鎻愮ず鍔犺浇涓�
+ // util.showLoading();
+ // // 鍗曟涓嬭浇鍏佽鐨勬渶澶ф枃浠朵负 200MB
+ // wx.downloadFile({
+ // url: fileLink,
+ // success: function (res) {
+ // if (res.statusCode != 200) {
+ // util.hideLoadingWithErrorTips();
+ // return false;
+ // }
+ // var Path = res.tempFilePath; //杩斿洖鐨勬枃浠朵复鏃跺湴鍧�锛岀敤浜庡悗闈㈡墦寮�鏈湴棰勮鎵�鐢�
+ // wx.saveFile({
+ // tempFilePath: Path,
+ // success: function (res) {
+ // var savedFilePath = res.savedFilePath;
+ // // 灏嗘枃浠朵繚瀛樹负 item.name
+ // wx.saveFile({
+ // tempFilePath: savedFilePath,
+ // filePath: wx.env.USER_DATA_PATH + '/' + item.name,
+ // success: function (res) {
+ // wx.openDocument({
+ // filePath: res.savedFilePath,
+ // showMenu: true,
+ // success: function (res) {
+ // util.hideLoading();
+ // },
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // }
+ // });
+ // },
+ // fail: function (err) {
+ // util.hideLoadingWithErrorTips();
+ // },
+ // });
+ // }
+>>>>>>> Stashed changes
if (item.selectType == "webpage") {
this.setData({
webpageSrc: item.jsek_link,
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 9878d34..3d57863 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -19,7 +19,7 @@
data-parent="{{''}}"
>
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
- <view class="box-image" style="width: 100%">
+ <view class="box-image" style="width: 80%">
<view
class="checkBox"
wx:if="{{isShowCheck}}"
@@ -93,7 +93,7 @@
<!-- 浜戝涔犲浘鏍� -->
<view> </view>
<!-- 鍚嶇О -->
- <text class="name" style="width: 80%">{{item.name || '-'}}</text>
+ <text class="name" style="width: 100%">{{item.name || '-'}}</text>
</view>
<!-- 鏁欏璧勬簮绫诲瀷 -->
<view class="teachClass"> {{item.resourceClass}} </view>
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index ec81e90..5dd2180 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -150,7 +150,8 @@
},
],
showIndex: '',
- successOrderNumber: ''
+ successOrderNumber: '',
+ applicationState: '' // 鐢靛瓙鏍蜂功鐢宠鐘舵��
},
resetTree: function (e) {
@@ -767,7 +768,8 @@
// 鎵佸钩鍖栨暟鎹浆鎹ree
getTreeList(rootList, pathLength, newArr, path) {
for (const item of rootList) {
- if (item.productLinkPath.length == pathLength && item.productLinkPath.includes(path)) {
+ // 姝ゅ鍘熸湰 item.productLinkPath.length == pathLength 浣� productLinkPath 闀垮害涓埆涔﹀瓨鍦�4銆�5浣嶄氦閿�
+ if ((pathLength - item.productLinkPath.length >= 0 && pathLength - item.productLinkPath.length <= 3) && item.productLinkPath.includes(path)) {
if (item.sysType == 'CmsItem') {
if (item.selectType == 'webpage') {
item.disabled = true
@@ -898,7 +900,8 @@
}
}
});
- this.getTreeList(res.datas.cmsDatas[0].datas, 17, list, '\\')
+ const num = query.cmsPath.length + 6
+ this.getTreeList(res.datas.cmsDatas[0].datas, num, list, '\\')
list = this.ensureTreeConsistency(list)
list = this.changeResourceChildren(list)
console.log('淇敼鍚庝簯', list);
@@ -1324,7 +1327,6 @@
},
// 鐢宠鏁欏璧勬簮
applyResource() {
-
// if (this.data.applyResourceState) {
// return wx.showToast({
// icon: "error",
@@ -1610,7 +1612,6 @@
},
updateShoppingCartHidden() {
-
const isSHow = this.data.shoppingCartGetId.some(
(item) => item == data.saleMethod[0].Id
);
@@ -2087,6 +2088,20 @@
list.push(item);
}
});
+ const smBook = list.find(item => item.content[0].id == this.data.bookDetail.id)
+ console.log('宸茬敵璇�', smBook);
+ if (smBook && smBook.state == 'Normal') {
+ const flag = new Date(JSON.parse(smBook.feedBack).endDate + '23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ this.setData({
+ applicationState: 'Normal'
+ })
+ } else {
+ this.setData({
+ applicationState: 'overdue'
+ })
+ }
+ }
this.setData({
alreadyElectronicBookList: list,
});
@@ -2175,15 +2190,27 @@
return false;
}
let isApply = this.data.alreadyElectronicBookList.find(
- (eitem) => eitem.id == this.data.bookDetail.id
+ (eitem) => eitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
- wx.showToast({
- title: "璇ヤ功宸茬敵璇凤紒",
- icon: "none",
- duration: 1000,
- });
- return false;
+ if (isApply.state == 'WaitAudit') {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ } else if (isApply.state == 'Normal') {
+ const flag = new Date(JSON.parse(isApply.feedBack).endDate + '23:59:59').getTime() > new Date().getTime()
+ if (flag) {
+ wx.showToast({
+ title: "璇ヤ功宸茬敵璇凤紒",
+ icon: "none",
+ duration: 1000,
+ });
+ return false;
+ }
+ }
}
if (this.data.electronicBookList.length >= 2) {
wx.showToast({
@@ -2251,7 +2278,7 @@
return false;
}
let isApply = this.data.alreadyPaperBookList.find(
- (pitem) => pitem.id == this.data.bookDetail.id
+ (pitem) => pitem.content[0].id == this.data.bookDetail.id
);
if (isApply) {
wx.showToast({
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 3377785..4b32c1f 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -230,6 +230,7 @@
treeList="{{teach}}"
tab="{{tabValue}}"
applyState="{{applyState}}"
+ deadline="{{deadline}}"
bind:downloadTeach="downloadTeach"
bind:handleTree="handleTree"
openTeachids="{{openTeachids}}"
@@ -380,7 +381,7 @@
<view
class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
bind:tap="goRead"
- wx:if="{{!bookBuy}}"
+ wx:if="{{ applicationState == 'overdue' ? true :!bookBuy}}"
>
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
@@ -406,7 +407,7 @@
wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
>鍏嶈垂棰嗗彇</view
>
- <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
+ <view class="buy read" bind:tap="goRead" wx:if="{{ applicationState == 'Normal' ? true : bookBuy}}">绔嬪嵆鏌ョ湅</view>
</view>
</view>
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 22a42c8..9cf27f2 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -24,7 +24,9 @@
titleName: '',
pdfDatA: [],
startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
- pauseTime: 0 //鏆傚仠鏃堕棿
+ pauseTime: 0, //鏆傚仠鏃堕棿
+ applyState: '',
+ deadline: '',
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -56,7 +58,9 @@
cmsId: options.cmsId,
parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
- productLinkPath: options.productLinkPath
+ productLinkPath: options.productLinkPath,
+ applyState: options.applyState,
+ deadline: options.deadline
})
this.resourceDetailsData()
},
@@ -194,6 +198,18 @@
//zpi鏂囦欢涓嬭浇
onDownloadButton() {
const item = this.data.zipData;
+ if (this.data.applyState !== 'Normal') {
+ return wx.showToast({
+ icon: 'none',
+ title: '璇峰厛鐢宠涓嬭浇',
+ })
+ } else {
+ const flag = new Date(this.data.deadline) > new Date()
+ if (!flag) return wx.showToast({
+ icon: 'none',
+ title: '璇峰厛鐢宠涓嬭浇',
+ })
+ }
if (!item || !item.file) {
wx.showToast({
title: '鏂囦欢淇℃伅缂哄け',
@@ -201,7 +217,6 @@
});
return;
}
-
const downloadUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file;
wx.showLoading({
title: '姝ｅ湪涓嬭浇...',
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js
index acee924..b1d52eb 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.js
+++ b/packageDomain/pages/resourceDetails/myAudio/index.js
@@ -85,7 +85,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ console.log(options);
wx.setNavigationBarTitle({
title: '璧勬簮璇︽儏-闊抽'
diff --git a/packagePersonal/pages/myCollection/index.js b/packagePersonal/pages/myCollection/index.js
index 211f2f0..57f3507 100644
--- a/packagePersonal/pages/myCollection/index.js
+++ b/packagePersonal/pages/myCollection/index.js
@@ -90,6 +90,7 @@
})
} else {
this.setData({
+ list: [],
skeletonLoding: false,
loading: false
})
diff --git a/packagePersonal/pages/sampleBooks/index.js b/packagePersonal/pages/sampleBooks/index.js
index bc1a1e4..08b89f3 100644
--- a/packagePersonal/pages/sampleBooks/index.js
+++ b/packagePersonal/pages/sampleBooks/index.js
@@ -117,6 +117,7 @@
field: 'CreateDate'
}
}).then((res) => {
+ console.log(res.datas);
try {
if (res.datas.length > 0) {
res.datas.forEach((item) => {
diff --git a/pages/bookExhibitionList/select/select.json b/pages/bookExhibitionList/select/select.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/bookExhibitionList/select/select.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/bookExhibitionList/select/select.wxss b/pages/bookExhibitionList/select/select.wxss
new file mode 100644
index 0000000..6ec77a0
--- /dev/null
+++ b/pages/bookExhibitionList/select/select.wxss
@@ -0,0 +1 @@
+/* pages/bookExhibitionList/select/select.wxss */
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index a9aebaf..54de09d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -606,7 +606,6 @@
}
}
},
-
isChange(data) {
this.setData({
isWhite: data
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index a5b37b2..b6bf9af 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,21 +1,60 @@
<view class="container">
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll" wx:if="{{!loading}}">
- <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
+ <t-pull-down-refresh
+ value="{{baseRefresh.value}}"
+ loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}"
+ bind:refresh="onPullDownRefresh"
+ wx:if="{{!loading}}"
+ bind:scroll="onScroll"
+ >
+ <view
+ class="background {{ isWhite ? 'white':''}}"
+ style="padding-top: {{barHeight}}px"
+ >
<text class="text">浜笀E璇�</text>
</view>
<view class="home-page-header">
<view class="bg">
- <image src="/static/images/home/home-bg.png" mode="heightFix" class="image" />
+ <image
+ src="/static/images/home/home-bg.png"
+ mode="heightFix"
+ class="image"
+ />
</view>
<view class="search">
- <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}">
- <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
+ <t-search
+ t-class-input="t-search__input"
+ t-class-input-container="t-search__input-container"
+ placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��"
+ leftIcon=""
+ bind:submit="onRetrievalPage"
+ model:value="{{searchVal}}"
+ >
+ <t-icon
+ slot="left-icon"
+ prefix="wr"
+ name="search"
+ size="40rpx"
+ color="#bbb"
+ bind:tap="navToSearchPage"
+ />
</t-search>
</view>
<view class="swiper-wrap">
<!-- <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{ { type: 'dots' } }}" height="380rpx" bind:click="navToActivityDetail" /> -->
- <swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper">
- <swiper-item wx:for="{{bannerList}}" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="navToActivityDetail">
+ <swiper
+ interval="5000"
+ indicator-dots="true"
+ autoplay="true"
+ circular="true"
+ class="swiper"
+ >
+ <swiper-item
+ wx:for="{{bannerList}}"
+ wx:for-index="index"
+ wx:key="index"
+ data-info="{{item}}"
+ bindtap="navToActivityDetail"
+ >
<view class="swiperItem">
<image src="{{item.value}}" mode="widthFix" class="img" />
</view>
@@ -24,36 +63,78 @@
</view>
</view>
<view class="home-page-menu">
- <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
- <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
+ <t-grid
+ class="t-grid-block"
+ theme="card"
+ border="{{border}}"
+ column="{{5}}"
+ >
+ <t-grid-item
+ wx:for="{{tabList}}"
+ wx:for-index="index"
+ wx:key="index"
+ text="{{item.text}}"
+ image="{{item.icon}}"
+ data-info="{{item}}"
+ bindtap="toPages"
+ />
</t-grid>
</view>
<view class="home-page-container">
<view class="home-page-list">
<view class="tabCardPublic iconOne">
<view class="icon">
- <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/zhuantitaolun2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center;">
+ <view
+ data-info="{{'zhuantitaolun'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ style="align-items: center"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="listBox">
- <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
- <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
+ <view
+ wx:for="{{specialSubjectList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="listItemBox"
+ >
+ <view
+ class="listItem"
+ bindtap="goSubjectDetail"
+ data-book="{{item}}"
+ >
<view class="specialSubject-img">
<image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
- <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
- <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view>
- <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
+ <view class="time" wx:if="{{item.liveTime}}"
+ >鐩存挱鏃堕棿锛歿{item.liveTime}}</view
+ >
+ <view class="time" wx:if="{{item.startTime}}"
+ >寮�鎾椂闂达細{{ item.startTime }}</view
+ >
+ <view class="time" wx:if="{{!item.liveTime && !item.startTime}}"
+ >寮�鎾椂闂达細<text class="grey">寰呭畾</text></view
+ >
<view class="flex jc-sb">
- <text class="author">{{item.lecturer}} {{item.position}}</text>
+ <text class="author"
+ >{{item.lecturer}} {{item.position}}</text
+ >
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
</view>
</view>
</view>
@@ -61,35 +142,77 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/jingxuankecheng2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/jingxuankecheng2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
+ <view
+ data-info="{{'jingxuankecheng'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="home-page-tabs">
- <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
- <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+ <t-tabs
+ t-class="t-tabs"
+ split="{{false}}"
+ defaultValue="{{activeItem}}"
+ bind:change="tabChangeHandle"
+ >
+ <t-tab-panel
+ wx:for="{{courseTypeList}}"
+ wx:for-index="index"
+ wx:key="index"
+ label="{{item.name}}"
+ value="{{index}}"
+ />
</t-tabs>
</view>
<view class="listBox1">
<view wx:if="{{courseList.length>0}}">
- <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
+ <view
+ wx:for="{{courseList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="listItemBox"
+ >
<view class="listItem flex">
- <view class="specialSubject-img" data-book="{{item}}" bindtap="goCourseDetail">
+ <view
+ class="specialSubject-img"
+ data-book="{{item}}"
+ bindtap="goCourseDetail"
+ >
<image src="{{item.icon}}" mode="aspectFill" class="img" />
</view>
<view class="body-info">
- <view class="name" data-book="{{item}}" bindtap="goCourseDetail">{{item.name}}</view>
+ <view
+ class="name"
+ data-book="{{item}}"
+ bindtap="goCourseDetail"
+ >{{item.name}}</view
+ >
<view class="flex jc-sb">
<text class="author">{{item.courseLeader}}</text>
<text class="classHours">{{item.classHours}}璇炬椂</text>
</view>
<view class="priceBox flex jc-sb">
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
+ <image
+ src="/static/images/home/home-cart.png"
+ mode="aspectFit"
+ class="addCartImg"
+ bind:tap="addCart"
+ data-info="{{item}}"
+ />
</view>
</view>
</view>
@@ -101,7 +224,11 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/tushufuwu2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/tushufuwu2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
<view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
<text class="more">鏇村</text>
@@ -109,16 +236,39 @@
</view>
</view>
<view class="home-page-tabs">
- <t-tabs t-class="t-tabs" split="{{false}}" position="{{'home'}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
- <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+ <t-tabs
+ t-class="t-tabs"
+ split="{{false}}"
+ position="{{'home'}}"
+ defaultValue="{{activeItem1}}"
+ bind:change="tabBookClick"
+ >
+ <t-tab-panel
+ wx:for="{{bookTypeList}}"
+ wx:for-index="index"
+ wx:key="index"
+ label="{{item.name}}"
+ value="{{index}}"
+ />
</t-tabs>
</view>
<view class="listBox2">
<view wx:if="{{booksList.length > 0}}" class="flex">
- <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+ <view
+ wx:for="{{booksList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
<view class="listItem" bind:tap="goDetail" data-book="{{item}}">
<view class="specialSubject-img">
- <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" class="img" aria-label="{{item.name}}" />
+ <image
+ src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFit"
+ class="img"
+ aria-label="{{item.name}}"
+ />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
@@ -133,7 +283,11 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/shuziyuedu2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/shuziyuedu2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
<view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
<text class="more">鏇村</text>
@@ -141,8 +295,18 @@
</view>
</view>
<view class="listBox2 flex">
- <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
- <view class="listItem" bind:tap="goReadBookDetail" data-book="{{item}}">
+ <view
+ wx:for="{{readBookList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
+ <view
+ class="listItem"
+ bind:tap="goReadBookDetail"
+ data-book="{{item}}"
+ >
<view class="specialSubject-img">
<image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
@@ -155,28 +319,64 @@
</view>
<view class="tabCardPublic iconTwo">
<view class="icon">
- <image src="/static/images/home/shuzijiaocai2.png" mode="aspectFit" class="iconImage" />
+ <image
+ src="/static/images/home/shuzijiaocai2.png"
+ mode="aspectFit"
+ class="iconImage"
+ />
</view>
- <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
+ <view
+ data-info="{{'shuzijiaocai'}}"
+ bindtap="onMoreGuide"
+ class="flex"
+ >
<text class="more">鏇村</text>
<t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
</view>
</view>
<view class="listBox3">
<view wx:if="{{textbookList.length > 0}}">
- <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
+ <view
+ wx:for="{{textbookList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="textbooksItemBox"
+ >
<view class="listItem flex">
- <view class="specialSubject-img" bind:tap="goTextBookDetail" data-book="{{item}}">
+ <view
+ class="specialSubject-img"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >
<image src="{{item.icon}}" mode="aspectFit" class="img" />
</view>
<view class="body-info">
- <view class="name" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.name}}</view>
- <view class="introduction" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.description}}</view>
+ <view
+ class="name"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >{{item.name}}</view
+ >
+ <view
+ class="introduction"
+ bind:tap="goTextBookDetail"
+ data-book="{{item}}"
+ >{{item.description}}</view
+ >
<view class="author">{{item.author}}</view>
<view class="priceBox flex jc-sb">
<text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- <image src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ <text class="price" wx:if="{{item.price !== 0}}"
+ >锟{item.price}}</text
+ >
+ <image
+ src="/static/images/home/home-cart.png"
+ mode="aspectFit"
+ class="addCartImg"
+ bind:tap="addCart"
+ data-info="{{item}}"
+ />
</view>
</view>
</view>
@@ -188,17 +388,37 @@
</view>
<view class="tabCardPublic">
<view class="icon">
- <image src="/static/images/home/paihangbang2.png" mode="" class="iconImage" />
+ <image
+ src="/static/images/home/paihangbang2.png"
+ mode=""
+ class="iconImage"
+ />
</view>
</view>
<view class="rankingList">
- <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
+ <scroll-view class="srcolbox" scroll-x scroll-with-animation="true">
<view class="booksListBox">
- <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+ <view
+ wx:for="{{rankingList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="index"
+ class="booksListItemBox"
+ >
<view class="listItem" bind:tap="goDetail" data-book="{{item}}">
<view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFit" class="img" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
+ <image
+ src="{{item.icon}}"
+ mode="aspectFit"
+ class="img"
+ wx:if="{{item.icon}}"
+ />
+ <image
+ src="/static/images/default-book-img.png"
+ mode="aspectFit"
+ class="img"
+ wx:else
+ />
</view>
<view class="body-info">
<view class="name">{{item.name}}</view>
@@ -214,4 +434,4 @@
</t-pull-down-refresh>
</view>
<import src="home.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
\ No newline at end of file
+<template is="skeleton" wx:if="{{loading}}" />
diff --git a/project.config.json b/project.config.json
index 7f717ad..6dfe519 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,9 +1,5 @@
{
"description": "椤圭洰閰嶇疆鏂囦欢锛岃瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "packOptions": {
- "ignore": [],
- "include": []
- },
"setting": {
"urlCheck": true,
"es6": true,
@@ -24,8 +20,6 @@
"compileHotReLoad": false,
"lazyloadPlaceholderEnable": false,
"useMultiFrameRuntime": true,
- "useApiHook": true,
- "useApiHostProcess": true,
"ignoreDevUnusedFiles": false,
"babelSetting": {
"ignore": [],
@@ -47,9 +41,6 @@
"condition": false
},
"compileType": "miniprogram",
- "libVersion": "2.23.1",
- "appid": "wx7f362fe7cb6e0d1f",
- "projectname": "tdesign-miniprogram-starter-retail",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
@@ -139,5 +130,10 @@
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 2
- }
+ },
+ "packOptions": {
+ "ignore": [],
+ "include": []
+ },
+ "appid": "wx7f362fe7cb6e0d1f"
}
\ No newline at end of file
--
Gitblit v1.9.1