From 606018855ad2d5ad55f527b76e9652fdb58ed982 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 09 九月 2024 19:50:05 +0800
Subject: [PATCH] bug
---
packageDomain/pages/publickBookForm/index.wxss | 2
pages/digitalTextbooks/index.wxml | 66 +---------
pages/home/home.js | 8 +
pages/digitalCourses/digitalCoursesDetails/index.js | 32 ++--
static/images/digitalCourses/courseIcon.png | 0
pages/cart/paymentPage/index.wxml | 8
packagePersonal/pages/myOrder/index.js | 47 ++++++-
pages/digitalCourses/index.wxml | 2
pages/digitalCourses/digitalCoursesDetails/components/question/question.js | 2
pages/digitalCourses/digitalCoursesDetails/index.wxml | 2
packagePersonal/pages/myOrder/index.wxml | 3
pages/cart/index.js | 47 ++++++-
static/images/digitalTextbooks/textBookIcon.png | 0
pages/cart/paymentPage/index.js | 18 +++
pages/bibliographyList/index.wxml | 2
pages/bibliographyList/index.wxss | 9 +
packageBookService/pages/bookServices/detail/index.js | 19 +-
pages/bibliographyList/index.js | 6
pages/cart/index.wxml | 84 ++-----------
19 files changed, 173 insertions(+), 184 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 815a389..99d3595 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -2590,7 +2590,6 @@
return childrenList
},
uploadFile(e) {
- console.log(123)
this.setData({
dialogBox: true,
isShowUp: true
@@ -2599,6 +2598,12 @@
closeDialog() {
this.setData({
dialogBox: false,
+ resourceInfo: {
+ resourceName: '',
+ fileType: '',
+ description: '',
+ agree: false
+ },
});
},
onCloseProtocol() {
@@ -2752,15 +2757,9 @@
},
handleRemove(e) {
- console.log(e)
- let md5 = e.currentTarget.dataset.md5
- for (let i = 0; i < this.data.fileList.length; i++) {
- if (this.data.fileList.md5 == md5) {
- this.data.fileList.splice(i, 1)
- }
- }
this.setData({
isShowUp: true,
+ fileList: []
});
},
confirmM() {
@@ -2803,9 +2802,7 @@
icon: "success",
title: "璇蜂笂浼犺祫婧愭枃浠�",
});
- this.setData({
- dialogBox: false,
- });
+ this.closeDialog()
})
}
})
\ No newline at end of file
diff --git a/packageDomain/pages/publickBookForm/index.wxss b/packageDomain/pages/publickBookForm/index.wxss
index dfa7c4c..801fe24 100644
--- a/packageDomain/pages/publickBookForm/index.wxss
+++ b/packageDomain/pages/publickBookForm/index.wxss
@@ -11,6 +11,8 @@
.content {
height: calc(100vh - env(safe-area-inset-bottom));
box-sizing: border-box;
+ flex-grow: 1;
+ overflow-y: auto;
}
.tips {
diff --git a/packagePersonal/pages/myOrder/index.js b/packagePersonal/pages/myOrder/index.js
index 075570e..365419e 100644
--- a/packagePersonal/pages/myOrder/index.js
+++ b/packagePersonal/pages/myOrder/index.js
@@ -183,15 +183,26 @@
} = e.currentTarget.dataset;
let parentData = null;
let bookId = book.orderSaleMethod.product.id;
-
- parentData = await app.MG.store.getProductBySaleMethod({
- 'saleMethodId': book.orderSaleMethod.id
- })
- if (parentData.parentProduct.length > 0) {
- bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
+ const type = book.orderSaleMethod.product.cmsTypeRefCode
+ let url = ''
+ if (type == 'jsek_mediaBook') {
+ // 鍥句功銆佷簯瀛︿範
+ parentData = await app.MG.store.getProductBySaleMethod({
+ 'saleMethodId': book.orderSaleMethod.id
+ })
+ if (parentData.parentProduct.length > 0) {
+ bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
+ }
+ url = `/packageBookService/pages/bookServices/detail/index?id=${bookId}&name=${book.name}`
+ } else if (type == 'jsek_digitalCourses') {
+ // 璇剧▼
+ url = '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.orderSaleMethod.product.id + '&path=' + ''
+ } else if (type == 'jsek_digitalTextbooks') {
+ // 鏁板瓧鏁欐潗
+ url = '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + book.orderSaleMethod.product.id
}
wx.navigateTo({
- url: `/packageBookService/pages/bookServices/detail/index?id=${bookId}&name=${book.name}`,
+ url
});
},
@@ -333,7 +344,25 @@
/**
* 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
*/
- onShareAppMessage() {
-
+ onShareAppMessage() {},
+ // 澶勭悊璁㈠崟绫诲瀷鏄剧ず
+ handleOrderType(book) {
+ console.log(book);
+ const type = book.orderSaleMethod.product.cmsTypeRefCode
+ let title = ''
+ if (type == 'jsek_mediaBook') {
+ if (book.orderSaleMethod.type == 'defaultSaleMethod') {
+ title = '鍥句功鏈嶅姟-鐢靛瓙涔�'
+ } else if (book.orderSaleMethod.type == 'createProductSaleMethod' && book.orderSaleMethod.cmsItemList == 0) {
+ title = '鍥句功鏈嶅姟-缁勫嵎'
+ } else {
+ title = '鍥句功鏈嶅姟-浜戝涔�'
+ }
+ } else if (type == 'jsek_digitalCourses') {
+ title = '鏁板瓧鏁欐潗'
+ } else {
+ title = '鏁板瓧璇剧▼'
+ }
+ return title
}
})
\ No newline at end of file
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index a580c5b..6ba7728 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -34,9 +34,10 @@
<view class="cmsName" wx:if="{{itemes.orderSaleMethod.type != 'defaultSaleMethod'}}">{{itemes.orderSaleMethod.cmsItemList[0].name}}</view>
<view class="{{items.saleMethodLinks.length == 1 ? 'top' : ''}}">
<text class="typeBox">{{
+ itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_mediaBook' ?
itemes.orderSaleMethod.type == 'defaultSaleMethod'
? '鍥句功鏈嶅姟-鐢靛瓙涔�'
- : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '鍥句功鏈嶅姟-缁勫嵎' : '鍥句功鏈嶅姟-浜戝涔�'
+ : itemes.orderSaleMethod.type == 'createProductSaleMethod' && itemes.orderSaleMethod.cmsItemList == 0 ? '鍥句功鏈嶅姟-缁勫嵎' : '鍥句功鏈嶅姟-浜戝涔�' : itemes.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses' ? '鏁板瓧璇剧▼' : '鏁板瓧鏁欐潗'
}}</text>
</view>
</view>
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index f1bca7e..e870312 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -183,7 +183,7 @@
queryType: '*',
paging: {
start: '0',
- size: this.data.start * 9
+ size: this.data.start * 12
},
coverSize: {
width: 260
@@ -231,7 +231,7 @@
queryType: '*',
paging: {
start: '0',
- size: this.data.start * 9
+ size: this.data.start * 12
},
coverSize: {
width: 260
@@ -275,7 +275,7 @@
queryType: '*',
paging: {
start: '0',
- size: this.data.start * 9
+ size: this.data.start * 12
},
coverSize: {
width: 260
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index d17cd26..adddd18 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -1,7 +1,7 @@
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{loading}}" />
-<view wx:if="{{!loading}}">
+<view wx:if="{{!loading}}" class="page" >
<view wx:if="{{downloadLoadin}}" class="loadinBox">
<t-loading class="colors" theme="circular" size="70rpx" class="wrapper" />
</view>
diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss
index f633966..b7f88f1 100644
--- a/pages/bibliographyList/index.wxss
+++ b/pages/bibliographyList/index.wxss
@@ -1,5 +1,10 @@
@import "./index.skeleton.wxss";
+.page {
+ width: 100%;
+ height: 100%;
+}
+
.back-icon {
width: 48rpx;
height: 100%;
@@ -250,12 +255,12 @@
}
.page-content {
- height: calc(100vh - 176rpx);
+ height: calc(100vh - 168rpx -env(safe-area-inset-bottom));
background-color: #fff;
}
.scroll-box {
- height: calc(100vh - 220rpx - env(safe-area-inset-bottom));
+ height: calc(100vh - 264rpx - env(safe-area-inset-bottom));
padding-bottom: env(safe-area-inset-bottom);
}
diff --git a/pages/cart/index.js b/pages/cart/index.js
index ff80efe..c873a64 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -119,6 +119,24 @@
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
item.name = item.linkCmsItems[0].name ? item.productMonWithLinkDto.product.name + ':' + item.linkCmsItems[0].name : item.productMonWithLinkDto.product.name
item.saleMethod.price = this.numFormat(item.saleMethod.price)
+
+ //
+ if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalTextbooks') {
+ item.typeTxt = '鏁板瓧鏁欐潗'
+ item.productType = "鏁板瓧鏁欐潗"
+ } else if (item.productMonWithLinkDto.links[0].storeRefCode == 'jsek_digitalCourses') {
+ item.typeTxt = '鏁板瓧璇剧▼'
+ item.productType = "鏁板瓧璇剧▼"
+ } else {
+ item.typeTxt = '鐢靛瓙涔�'
+ item.productType = "鍥句功鏈嶅姟-鐢靛瓙涔�"
+
+ if (item.saleMethod.type == 'createProductItemSaleMethod') {
+ item.typeTxt = '浜戝涔�'
+ item.productType = "鍥句功鏈嶅姟-浜戝涔�"
+ }
+ }
+ //
});
this.setData({
@@ -307,17 +325,28 @@
async onBook(e) {
const item = e.currentTarget.dataset.item
console.log(item);
- let parentData = null;
- parentData = await app.MG.store.getProductBySaleMethod({
- 'saleMethodId': item.saleMethod.id
- })
- console.log(parentData)
- let bookId = item.productMonWithLinkDto.product.id;
- if (parentData.parentProduct.length > 0) {
- bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
+ const type = item.productMonWithLinkDto.links[0].storeRefCode
+ let url = ''
+ if (type == 'jsek_digitalCourses') {
+ // 璇剧▼
+ url = '/pages/digitalCourses/digitalCoursesDetails/index?id=' + item.productMonWithLinkDto.product.id + '&path=' + ''
+ } else if (type == 'jsek_digitalTextbooks') {
+ // 鏁板瓧鏁欐潗
+ url = '/pages/digitalTextbooks/digitalTextbooksDetails/index?id=' + item.productMonWithLinkDto.product.id
+ } else {
+ let parentData = null;
+ parentData = await app.MG.store.getProductBySaleMethod({
+ 'saleMethodId': item.saleMethod.id
+ })
+ console.log(parentData)
+ let bookId = item.productMonWithLinkDto.product.id;
+ if (parentData.parentProduct.length > 0) {
+ bookId = parentData.parentProduct[parentData.parentProduct.length - 1].id;
+ }
+ url = '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name
}
wx.navigateTo({
- url: '/packageBookService/pages/bookServices/detail/index?id=' + bookId + '&name=' + item.productMonWithLinkDto.product.name
+ url
})
}
});
\ No newline at end of file
diff --git a/pages/cart/index.wxml b/pages/cart/index.wxml
index fcbc60c..978a60f 100644
--- a/pages/cart/index.wxml
+++ b/pages/cart/index.wxml
@@ -4,11 +4,7 @@
<!-- loading
hidden -->
<view hidden="{{hidden}}">
- <scroll-view
- scroll-y="{{true}}"
- class="outsideContentBox"
- bindscrolltolower="onScrollToLower"
- >
+ <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
<view>
<!-- <checkbox-group bindchange="HandelItemChange"> -->
<view wx:if="{{shoppingCartData.length <= 0}}" class="noDataBox">
@@ -16,37 +12,27 @@
<empty />
</view>
<!-- <button bind:tap="onLogin"> 鍘荤櫥褰�</button> -->
- <t-swipe-cell
- wx:for="{{shoppingCartData}}"
- wx:key="index"
- wx:for-item="item"
- wx:for-index="index"
- opened="{{swipeOpened}}"
- >
+ <t-swipe-cell wx:for="{{shoppingCartData}}" wx:key="index" wx:for-item="item" wx:for-index="index" opened="{{swipeOpened}}">
<view class="itemWarp">
<t-cell bordered="{{false}}">
<view slot="title" class="titleBox">
- <view wx:if="{{item.type == 'product'}}" style="width: 386rpx">
+ <view style="width: 386rpx">
<view class="boosName">
- <text class="eBook">鐢靛瓙涔�</text>
+ <text class="eBook">{{item.typeTxt}}</text>
<text> {{item.name}}</text>
</view>
</view>
- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
+ <!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
<view class="boosName">
<text class="cloudLearning">浜戝涔�</text>
<text> {{item.name}}</text>
</view>
- </view>
+ </view> -->
</view>
<view slot="description" class="descriptionBox">
<view>
- <view class="textBox" wx:if="{{item.type == 'product'}}"
- >鍥句功鏈嶅姟-鐢靛瓙涔�</view
- >
- <view class="textBox" wx:if="{{item.type == 'item'}}"
- >鍥句功鏈嶅姟-浜戝涔�</view
- >
+ <view class="textBox" wx:if="{{item.type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
+ <view class="textBox" wx:if="{{item.type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
</view>
<view wx:if="{{item.saleMethod.price != 0}}" class="price-box">
锟{item.saleMethod.price }}
@@ -55,46 +41,19 @@
</view>
<view slot="left-icon" class="left-icon">
<view class="contentCheckbox">
- <t-checkbox
- icon="rectangle"
- value=" {{item.id}}"
- data-item="{{item}}"
- checked="{{item.checked}}"
- bindchange="HandelItemChange"
- />
+ <t-checkbox icon="rectangle" value=" {{item.id}}" data-item="{{item}}" checked="{{item.checked}}" bindchange="HandelItemChange" />
</view>
<view class="left-image" data-item="{{item}}" bind:tap="onBook">
- <image
- wx:if="{{item.imgUrl}}"
- src="{{item.imgUrl}}"
- class="imageStyle"
- mode="aspectFit"
- />
- <image
- wx:else
- src="/static/images/default-book-img.png"
- class="imageStyle"
- mode="aspectFit"
- />
+ <image wx:if="{{item.imgUrl}}" src="{{item.imgUrl}}" class="imageStyle" mode="aspectFit" />
+ <image wx:else src="/static/images/default-book-img.png" class="imageStyle" mode="aspectFit" />
</view>
</view>
</t-cell>
</view>
- <view
- slot="right"
- class="btn delete-btn"
- bind:tap="onDelete"
- data-item="{{item}}"
- >鍒犻櫎</view
- >
+ <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-item="{{item}}">鍒犻櫎</view>
</t-swipe-cell>
<view wx:if="{{shoppingCartData.length > 0}}" 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>
</view>
@@ -104,25 +63,16 @@
<view class="bottomBox">
<view class="checkGroupBox">
<checkbox-group bindchange="bottomChange">
- <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}"
- >鍏ㄩ��</checkbox
- >
+ <checkbox disabled="{{onDisabled}}" value="鍏ㄩ��" checked="{{checkAll}}">鍏ㄩ��</checkbox>
</checkbox-group>
</view>
<view class="settlementBox">
- <view class="totalPrice"
- >鎬讳环:<text class="totalPriceText">锟{totalPrice}}</text></view
- >
+ <view class="totalPrice">鎬讳环:<text class="totalPriceText">锟{totalPrice}}</text></view>
<view class="buttonBox">
- <t-button
- class="tButtonBox"
- size="small"
- shape="round"
- bind:tap="goPaymentPage"
- >
+ <t-button class="tButtonBox" size="small" shape="round" bind:tap="goPaymentPage">
<view>鍘荤粨绠�({{selectedCount}})</view>
</t-button>
</view>
</view>
</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 818666c..febb0d2 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -161,11 +161,29 @@
payPrice: res.payPrice.toFixed(2),
ImmediatelyReceive: res.payPrice
})
+ console.log(1, res.saleMethodLinks);
res.saleMethodLinks.forEach(item => {
const type = item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product';
item.type = type; // 灏唗ype璁剧疆涓篿tem瀵硅薄鐨勫睘鎬э紝鑰屼笉鏄娇鐢╯etData
item.paymentIcon = getPublicImage(item.orderSaleMethod.product.icon)
item.payPrice = this.numFormat(item.payPrice)
+ item.orderSaleMethod.price = this.numFormat(item.orderSaleMethod.price)
+ //
+ if (item.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalTextbooks') {
+ item.typeTxt = '鏁板瓧鏁欐潗'
+ item.productType = "鏁板瓧鏁欐潗"
+ } else if (item.orderSaleMethod.product.cmsTypeRefCode == 'jsek_digitalCourses') {
+ item.typeTxt = '鏁板瓧璇剧▼'
+ item.productType = "鏁板瓧璇剧▼"
+ } else {
+ item.typeTxt = '鐢靛瓙涔�'
+ item.productType = "鍥句功鏈嶅姟-鐢靛瓙涔�"
+
+ if (item.orderSaleMethod.type == 'createProductItemSaleMethod') {
+ item.typeTxt = '浜戝涔�'
+ item.productType = "鍥句功鏈嶅姟-浜戝涔�"
+ }
+ }
})
this.setData({
productList: res.saleMethodLinks,
diff --git a/pages/cart/paymentPage/index.wxml b/pages/cart/paymentPage/index.wxml
index b0ceeb3..f52919e 100644
--- a/pages/cart/paymentPage/index.wxml
+++ b/pages/cart/paymentPage/index.wxml
@@ -23,18 +23,18 @@
</view>
<view class="cartListContent">
<view class="cartListDetails">
- <view wx:if="{{item.type == 'product'}}" style="width: 386rpx">
+ <view style="width: 500rpx">
<view class="boosName">
- <text class="eBook">鐢靛瓙涔�</text>
+ <text class="eBook">{{item.typeTxt}}</text>
<text> {{item.orderSaleMethod.product.name}}</text>
</view>
</view>
- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
+ <!-- <view wx:if="{{item.type == 'item'}}" style="width: 386rpx">
<view class="boosName">
<text class="cloudLearning">浜戝涔�</text>
<text> {{item.orderSaleMethod.product.name}}</text>
</view>
- </view>
+ </view> -->
</view>
<view class="textBox" wx:if="{{item.type == 'product'}}">鍥句功鏈嶅姟-鐢靛瓙涔�</view>
<view class="textBox" wx:if="{{item.type == 'item'}}">鍥句功鏈嶅姟-浜戝涔�</view>
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/question/question.js b/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
index 1b0b32d..f17fd45 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
+++ b/pages/digitalCourses/digitalCoursesDetails/components/question/question.js
@@ -154,7 +154,7 @@
};
var data = {
topicIdOrRefCode: "onlineQuestioning",
- name: "鎰忚鍙嶉",
+ name: this.properties.bookInfo.name,
content: JSON.stringify(submitData),
type: "ProductComment",
cmsTypeRefCode: "",
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.js b/pages/digitalCourses/digitalCoursesDetails/index.js
index c9aedc0..ad21895 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/index.js
@@ -1013,22 +1013,22 @@
onCertificate() {
- // if (!this.data.isBuy) {
- // wx.showToast({
- // title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
- // if (!this.data.isLearn) {
- // wx.showToast({
- // title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
- // icon: "none",
- // duration: 1000,
- // });
- // return false
- // }
+ if (!this.data.isBuy) {
+ wx.showToast({
+ title: "璇峰厛璐拱锛屼綋楠屽畬鏁存湇鍔�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
+ if (!this.data.isLearn) {
+ wx.showToast({
+ title: "鎮ㄧ殑瀛︿範浠诲姟杩樻湭瀹屾垚锛屾殏涓嶈兘鐢宠璇佷功锛屽姞娌瑰摝锛�",
+ icon: "none",
+ duration: 1000,
+ });
+ return false
+ }
if (this.data.isCertificate && this.data.isCertificate.state == 'WaitAudit') {
wx.showToast({
title: "鎮ㄧ敵璇风殑璇佷功姝ｅ湪瀹℃牳涓�",
diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index 2dc7c7a..8b2608f 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -283,7 +283,7 @@
鏀惰棌
</view>
</view>
- <view class="bottom-btn" bind:tap="onCertificate">
+ <view class="bottom-btn" bind:tap="onCertificate" wx:if="{{!isCertificate.state || isCertificate.state == 'Reject'}}">
<view class="applicationImageBox">
<image src="/static/images/digitalCourses/zhengshushenqing@2x.png" />
</view>
diff --git a/pages/digitalCourses/index.wxml b/pages/digitalCourses/index.wxml
index 1454672..3fe8c8f 100644
--- a/pages/digitalCourses/index.wxml
+++ b/pages/digitalCourses/index.wxml
@@ -36,7 +36,7 @@
<view class="ExternalInformationBox">
<view class="informationBox" wx:for="{{courseList}}" wx:key="index" wx:for-item="item" data-item="{{item}}">
<view class="book-img" bind:tap="courseDetail" data-item="{{item}}">
- <image src="{{item.icon}}" mode="aspectFit" />
+ <image src="{{item.icon ? item.icon : '/static/images/digitalCourses/courseIcon.png'}}" mode="aspectFit" />
</view>
<view class="book-Info">
<view class="book-name" bind:tap="courseDetail" data-item="{{item}}">
diff --git a/pages/digitalTextbooks/index.wxml b/pages/digitalTextbooks/index.wxml
index 4ae678c..81a7417 100644
--- a/pages/digitalTextbooks/index.wxml
+++ b/pages/digitalTextbooks/index.wxml
@@ -6,46 +6,20 @@
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view class="back-icon">
<!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
- <image
- src="/static/images/digitalTextbooks/chevron-left.png"
- bind:tap="goBack"
- mode="aspectFit"
- />
+ <image src="/static/images/digitalTextbooks/chevron-left.png" bind:tap="goBack" mode="aspectFit" />
</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="heardTab">
<view class="tabBox">
- <t-tabs
- defaultValue="{{0}}"
- bind:change="selectTab"
- t-class="custom-tabs"
- >
- <t-tab-panel
- wx:for="{{tabList}}"
- wx:key="index"
- wx:for-item="item"
- label="{{item.name}}"
- value="{{index}}"
- style="{{tabPanelstyle}}"
- >
+ <t-tabs defaultValue="{{0}}" bind:change="selectTab" t-class="custom-tabs">
+ <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}" style="{{tabPanelstyle}}">
</t-tab-panel>
</t-tabs>
</view>
<view class="dropdown">
<t-dropdown-menu>
- <t-dropdown-item
- options="{{sorter.options}}"
- default-value="{{sorter.value}}"
- bindchange="onSort"
- />
+ <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
</t-dropdown-menu>
</view>
</view>
@@ -57,35 +31,15 @@
<view>鏁板瓧鏁欐潗鍒楄〃</view>
</view>
</view>
- <scroll-view
- scroll-y="{{true}}"
- class="outsideContentBox"
- bindscrolltolower="onScrollToLower"
- >
+ <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
<view class="bookContentBox">
- <view
- class="external"
- wx:for="{{digitalTextbooksData}}"
- wx:key="index"
- wx:for-item="item"
- wx:for-index="index"
- data-item="{{item}}"
- bind:tap="jumpDetails"
- >
+ <view class="external" wx:for="{{digitalTextbooksData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="jumpDetails">
<view class="amountClick">
- <t-icon
- name="browse"
- size="15"
- data-name="{{item}}"
- bind:click="goBack"
- />
+ <t-icon name="browse" size="15" data-name="{{item}}" bind:click="goBack" />
<view style="margin-left: 5rpx">{{item.viewCount}}</view>
</view>
<view class="imageBox">
- <image
- src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}"
- mode=""
- />
+ <image src="{{item.icon ? item.icon : '/static/images/digitalTextbooks/textBookIcon.png'}}" mode="" />
</view>
<view class="bookName">{{item.name}}</view>
<view class="information">
@@ -105,4 +59,4 @@
</view>
</scroll-view>
</view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 1b2f624..3f7f267 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -643,12 +643,16 @@
if (this.data.scoll) {
if (e.detail.scrollTop < 20) {
this.data.scoll = false
- this.isChange(false);
+ // 閬垮厤棰戠箒璋冪敤 setData
+ if (this.data.isWhite)
+ this.isChange(false);
}
} else {
if (e.detail.scrollTop > 20) {
this.data.scoll = true
- this.isChange(true);
+ // 閬垮厤棰戠箒璋冪敤 setData
+ if (!this.data.isWhite)
+ this.isChange(true);
}
}
},
diff --git a/static/images/digitalCourses/courseIcon.png b/static/images/digitalCourses/courseIcon.png
new file mode 100644
index 0000000..cdea1b6
--- /dev/null
+++ b/static/images/digitalCourses/courseIcon.png
Binary files differ
diff --git a/static/images/digitalTextbooks/textBookIcon.png b/static/images/digitalTextbooks/textBookIcon.png
new file mode 100644
index 0000000..1a2255b
--- /dev/null
+++ b/static/images/digitalTextbooks/textBookIcon.png
Binary files differ
--
Gitblit v1.9.1