From 5e649be819c7297c79c21c6dc120b4b6b362db9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:23:39 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 7aba5ed..679d5e5 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -1,5 +1,7 @@
const util = require("./components/util"); // 寮曞叆灏佽杩囩殑鍔犺浇鎻愮ず
-import { loginInfo } from "../../../../../../assets/js/login";
+import {
+ loginInfo
+} from "../../../../../../assets/js/login";
const app = getApp();
Component({
// checked: false,
@@ -41,6 +43,9 @@
type: Boolean,
value: false,
},
+ checkAllState: {
+ type: Boolean,
+ },
},
data: {
sonPurchaseSaleMethodId: "",
@@ -67,14 +72,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);
},
},
@@ -82,8 +89,7 @@
handleList(tree) {
for (let index = 0; index < tree.length; index++) {
const item = tree[index];
- if (item.sysType == "CmsItem" && !item.checked) {
- }
+ if (item.sysType == "CmsItem" && !item.checked) {}
if (item.children && item.children.length > 0) {
this.handleList(item.children);
}
@@ -211,7 +217,6 @@
// 鎷垮埌鎵�鏈夐」
getAllChildren(id) {
let result = [];
-
function findChildren(item) {
if (item.id === id) {
if (item.children && item.children.length > 0) {
@@ -305,16 +310,9 @@
ids.push(item.id);
checked = item.checked;
});
- 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)
+ // const flag =
+ // list.findIndex((item) => item.checked == false) > -1 ? true : false;
+ const flag = this.properties.checkAllState;
const updataList = this.findAndUpdateItemsByIds(
this.properties.treeList,
ids,
@@ -329,12 +327,19 @@
this.setData({
treeList: updataList,
});
+ var myEventDetail = {
+ value: !flag,
+ }; // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
+ var myEventOption = {
+ bubbles: true,
+ composed: true,
+ }; // 瑙﹀彂浜嬩欢鐨勯�夐」
+ this.triggerEvent("changeCheckAll", myEventDetail, myEventOption);
},
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
const flag = e.detail.checked;
- debugger;
// 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
let checkResourceTitleList = [];
const item = e.currentTarget.dataset.item;
@@ -344,7 +349,6 @@
list.forEach((item) => {
ids.push(item.id);
});
- // console.log(list, 'list789');
const updatedTreeList = this.findAndUpdateItemsByIds(
this.properties.treeList,
ids,
@@ -422,6 +426,8 @@
});
if (shoppingCartGetId.includes(saleMethodId)) {
console.log(111);
+ // this.data.updateShoppingCartHidden();
+ // this.data.updateCloudLearning();
wx.showToast({
icon: "error",
@@ -432,13 +438,11 @@
});
} else {
let query = {
- requests: [
- {
- saleMethodId: saleMethodId,
- storeEventId: null,
- // agentCode: '鐢靛瓙涔�'
- },
- ],
+ requests: [{
+ saleMethodId: saleMethodId,
+ storeEventId: null,
+ // agentCode: '鐢靛瓙涔�'
+ }, ],
};
const addRes = await app.MG.store.addShoppingCart(query);
console.log(addRes, "addRes");
@@ -448,7 +452,14 @@
});
}
},
+ sadd() {
+ this.triggerEvent('updateShoppingCartHidden');
+ this.triggerEvent('updateCloudLearning');
+ console.log(789);
+ },
+
},
- catchtap() {},
-});
+
+ catchtap() {}
+})
\ No newline at end of file
--
Gitblit v1.9.1