From 8d4e08cae809eddaecaefd3cd21b2c65ee8af160 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 19 九月 2024 14:44:42 +0800
Subject: [PATCH] bug修改
---
packageBookService/pages/bookServices/detail/buyResource/index.js | 22 +++++-----
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 6 +-
packageBookService/pages/bookServices/detail/components/tree/index.js | 6 +++
packageBookService/pages/bookServices/detail/index.js | 4 -
assets/js/middleGround/api/store.js | 34 ++++++++---------
assets/js/middleGround/tool.js | 10 +++--
6 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/assets/js/middleGround/api/store.js b/assets/js/middleGround/api/store.js
index 8a8f185..79e8543 100644
--- a/assets/js/middleGround/api/store.js
+++ b/assets/js/middleGround/api/store.js
@@ -362,13 +362,13 @@
Path: cmsPath + '',
Type: cmsType || '\\',
Name: [],
- Icon: [],
+ // Icon: [],
TypeId: [],
- RefCode: [],
- Description: [],
+ // RefCode: [],
+ // Description: [],
// ChildrenCount: [],
// ChildrenFolderCount: [],
- CreateDate: [],
+ // CreateDate: [],
SysType: [],
SaleMethod: [],
PageQuery: {
@@ -388,13 +388,11 @@
Path: '*',
Type: '\\',
Name: [],
- Icon: [],
TypeId: [],
RefCode: [],
- Description: [],
- ChildrenCount: [],
- ChildrenFolderCount: [],
- CreateDate: [],
+ // Description: [],
+ // ChildrenCount: [],
+ // ChildrenFolderCount: [],
SysType: [],
SaleMethod: [],
PageQuery: {
@@ -413,10 +411,10 @@
Path: cmsPath + '',
Type: '\\',
Name: [],
- Icon: [],
+ // Icon: [],
TypeId: [],
- RefCode: [],
- Description: [],
+ // RefCode: [],
+ // Description: [],
LinkTypes: [linkType.linkType],
PageQuery: {
Start: 0,
@@ -448,18 +446,18 @@
SortQuery: sort ? [sort] : [{
LinkOrder: 'Desc'
}],
- CreateDate: [],
- Description: [],
+ // CreateDate: [],
+ // Description: [],
Name: [],
- Icon: [],
+ // Icon: [],
RefCode: [],
- Description: [],
+ // Description: [],
TypeId: [],
SysType: [],
State: [],
Tag: [],
- BeginDate: [],
- EndDate: [],
+ // BeginDate: [],
+ // EndDate: [],
ProductLinkInfo: [],
AllowDonate: [],
DonatePriceList: [],
diff --git a/assets/js/middleGround/tool.js b/assets/js/middleGround/tool.js
index c9601b7..890f81b 100644
--- a/assets/js/middleGround/tool.js
+++ b/assets/js/middleGround/tool.js
@@ -257,11 +257,13 @@
}
}
}
- if (subItem.productLinkInfo && subItem.productLinkInfo.length)
+ if (subItem.productLinkInfo && subItem.productLinkInfo.length) {
+ let itemProductLinkInfo = subItem.productLinkInfo.find(citem => citem.Name == item.datas.Name)
subItem.productLinkPath =
- subItem.productLinkInfo[0].LinkPath +
- "\\" +
- subItem.productLinkInfo[0].CmsItemId;
+ itemProductLinkInfo.LinkPath +
+ "\\" +
+ itemProductLinkInfo.CmsItemId;
+ }
if (subItem.linkInfo && subItem.linkInfo.length)
subItem.linkPath =
subItem.linkInfo[0].LinkPath + "\\" + subItem.linkInfo[0].CmsItemId;
diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.js b/packageBookService/pages/bookServices/detail/buyResource/index.js
index dd5debe..aa65579 100644
--- a/packageBookService/pages/bookServices/detail/buyResource/index.js
+++ b/packageBookService/pages/bookServices/detail/buyResource/index.js
@@ -258,23 +258,23 @@
itemFields: {
SysType: 'CmsFolder',
// 璧勬簮绫诲瀷锛岃瘯璇绘枃浠讹紝鏄惁鍏佽涓嬭浇绛夊弬鏁�
- learnSelectType: [],
- selectType: [],
- freeFile: [],
- file: [],
- protectedFile: [],
- resourcesClassification: [],
- isDownload: [],
- jsek_resourceBrief: [],
- jsek_link: [],
- jsek_questionBank: []
+ // learnSelectType: [],
+ // selectType: [],
+ // freeFile: [],
+ // file: [],
+ // protectedFile: [],
+ // resourcesClassification: [],
+ // isDownload: [],
+ // jsek_resourceBrief: [],
+ // jsek_link: [],
+ // jsek_questionBank: []
},
pading: {
start: 0,
size: 999
},
}
- app.MG.store.getProductDetail(query).then((res) => {
+ app.MG.store.getProductDetailNoChildren(query).then((res) => {
if (!res.datas.cmsDatas[0].datas.length) {
return this.setData({
noResources: true,
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index d957cf7..74bb4ae 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -326,6 +326,7 @@
// 鍏ㄩ��
checkAll() {
+ wx.showLoading()
const ids = [];
let list = [];
let checked = "";
@@ -357,10 +358,12 @@
composed: true,
}; // 瑙﹀彂浜嬩欢鐨勯�夐」
this.triggerEvent("changeCheckAll", myEventDetail, myEventOption);
+ wx.hideLoading()
},
// 绔犺妭鍕鹃��
checkResourceTitle(e) {
+ wx.showLoading()
const flag = e.detail.checked;
// 杩欎釜鏃跺�檆hecked鐨勫�兼槸fals
const item = e.currentTarget.dataset.item;
@@ -409,9 +412,11 @@
this.setData({
openIds: this.data.openIds,
});
+ wx.hideLoading()
},
// 瀛愰」鍕鹃��
checkResource(e) {
+ wx.showLoading()
const citem = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
let outermost;
@@ -478,6 +483,7 @@
this.triggerEvent("changeListChecked", myEventDetail, myEventOption);
}
}
+ wx.hideLoading()
},
// 鍔犲叆璐墿杞�
async onCloudShoppingCart(e) {
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index 16070da..01e0577 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -149,13 +149,13 @@
/>
<!-- 绔犺妭鍚� -->
<view class="title-box">
- <view class="title-t" >
+ <view class="title-t">
<view class="title-name">{{item.name}} </view>
<view wx:if="{{item.sysType =='CmsFolder'}}" class="title-num">
锛坽{item.childrenItem}}锛�
</view>
</view>
- <view class="title-icon" >
+ <view class="title-icon">
<!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
<image
src="/static/images/bookService/detail/cart@2x.png"
@@ -266,7 +266,7 @@
<!-- 鍚嶇О -->
<text
class="name"
- style="{{ tab == 'jsek_teachingResources' ? citem.resourceClass ? 'width: 420rpx' : 'width: 500rpx;' : (citem.isShopCar &&citem.isbuy ) ? 'width: 400rpx;' : (citem.isShopCar ||citem.isbuy) ? 'width:460rpx' : 'width:500rpx'}}"
+ style="{{ tab == 'jsek_teachingResources' ? citem.resourceClass ? 'width: 400rpx' : 'width: 420rpx;' : (citem.isShopCar &&citem.isbuy ) ? 'width: 300rpx;' : (citem.isShopCar ||citem.isbuy) ? 'width:360rpx' : 'width:420rpx'}}"
>{{citem.name || '-'}}</text
>
</view>
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 44051f6..f9a7f11 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -949,7 +949,6 @@
let query = {
path: '*',
queryType: '*',
- // storeInfo: this.data.options.storeInfo,
productId: this.data.bookDetail.id,
cmsPath: type.productLinkPath,
cmsType: '*',
@@ -962,10 +961,9 @@
file: [],
protectedFile: [],
resourcesClassification: [],
- isDownload: [],
+ // isDownload: [],
jsek_resourceBrief: [],
jsek_link: [],
- jsek_questionBank: []
},
pading: {
start: 0,
--
Gitblit v1.9.1