From 34dd2d10cf26c86ed170a59aa36718f7c27f24d0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 15:30:29 +0800
Subject: [PATCH] 图书详情bug修改，云学习无销售方法check禁用
---
packageBookService/pages/bookServices/examination/questionList/index.wxss | 2 +-
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 1 +
packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml | 2 +-
packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss | 12 ++++++++----
packageBookService/pages/bookServices/detail/components/tree/index.js | 36 ++++++++++++++++++------------------
packageBookService/pages/bookServices/detail/index.js | 5 ++---
6 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml b/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml
index d3a326f..7d1a6e9 100644
--- a/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml
@@ -1,5 +1,5 @@
<!--packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxml-->
-<view class="reletedBooks fl between">
+<view class="reletedBooks fl ">
<view
wx:for="{{relatedBookData}}"
wx:key="id"
diff --git a/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss b/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss
index 708f333..2b31049 100644
--- a/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss
+++ b/packageBookService/pages/bookServices/detail/components/relatedBooks/index.wxss
@@ -4,9 +4,6 @@
flex-wrap: wrap;
}
-.between {
- justify-content: space-between;
-}
.ctr {
justify-content: center;
@@ -19,6 +16,11 @@
.book-box {
width: 28%;
margin-bottom: 40rpx;
+ margin-right: calc(16vw - 68rpx);
+}
+
+.book-box:nth-child(3n) {
+ margin-right: 0;
}
.book-image {
@@ -35,7 +37,6 @@
}
.book-name {
- color: #333;
margin-top: 20rpx;
width: 100%;
word-break: break-all;
@@ -43,6 +44,9 @@
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
+ color: #333;
+ font-weight: bold;
+ font-size: 28rpx;
}
.loading-box {
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 7aba5ed..079d169 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -67,14 +67,16 @@
);
},
observers: {
- openIds: function (newValue) {
- // var myEventDetail = {
- // }
- // var myEventOption = {
- // bubbles: true,
- // composed: true
- // }
- // this.triggerEvent('handleTree', myEventDetail, myEventOption)
+ treeList: function (newValue) {
+ const list = [];
+ let checked = "";
+ console.log("鏂板��", this.properties.treeList);
+ this.properties.treeList.forEach((item) => {
+ if (item.children && item.children.length > 0) {
+ list.push(...this.flattenTree([item]));
+ }
+ });
+ const flag = list.findIndex((item) => item.checked == true);
},
},
@@ -307,14 +309,14 @@
});
const flag =
list.findIndex((item) => item.checked == false) > -1 ? true : false;
- var myEventDetail = {
- value:flag,
- }; // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
- var myEventOption = {
- bubbles: true,
- composed: true,
- }; // 瑙﹀彂浜嬩欢鐨勯�夐」
- this.triggerEvent('changeCheckAll',myEventDetail,myEventOption)
+ var myEventDetail = {
+ value: flag,
+ }; // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
+ var myEventOption = {
+ bubbles: true,
+ composed: true,
+ }; // 瑙﹀彂浜嬩欢鐨勯�夐」
+ this.triggerEvent("changeCheckAll", myEventDetail, myEventOption);
const updataList = this.findAndUpdateItemsByIds(
this.properties.treeList,
ids,
@@ -334,7 +336,6 @@
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
const flag = e.detail.checked;
- debugger;
// 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
let checkResourceTitleList = [];
const item = e.currentTarget.dataset.item;
@@ -344,7 +345,6 @@
list.forEach((item) => {
ids.push(item.id);
});
- // console.log(list, 'list789');
const updatedTreeList = this.findAndUpdateItemsByIds(
this.properties.treeList,
ids,
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index ef9cd2b..f5271b2 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -62,6 +62,7 @@
<!-- checked="{{citem.checked}}" -->
<!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> -->
<t-checkbox
+ disabled="{{!citem.saleMethod[0].Id}}"
icon="rectangle"
checked="{{citem.checked}}"
data-item="{{citem}}"
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index fb30f25..f4f4c86 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -733,8 +733,8 @@
openTeachids: result,
});
} else if (type.refCode == "jsek_cloudLearning") {
- let arr = this.handleTreeData(list).filter((item) =>
- this.resourceIsBuy(item)
+ let arr = this.handleTreeData(list).filter(
+ (item) => item.saleMethod[0]
);
let freeIds = arr.filter((item) => {
return item.saleMethod[0].Price == 0;
@@ -743,7 +743,6 @@
this.setData({
isshowDrawBtn: false,
});
- debugger;
this.findChildIds(list, result);
this.setData({
learn: list,
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index d59420d..70cc1af 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -138,7 +138,7 @@
}
.marginL {
- margin-left: 140rpx;
+ margin-left: 40rpx;
}
.answer-center {
--
Gitblit v1.9.1