From 2fabb6c52d7a933c49dd896bb2b3ab25d77381b4 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:28:54 +0800
Subject: [PATCH] 图书详情bug
---
packageBookService/pages/bookServices/list/index.wxml | 24 +----
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 168 +++++++++++++++++++++++++++++++++--------
packageBookService/pages/bookServices/list/index.wxss | 2
packageBookService/pages/bookServices/detail/index.wxml | 11 --
packageBookService/pages/bookServices/detail/index.js | 8 ++
5 files changed, 151 insertions(+), 62 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index bfe83f3..bfd7ca2 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -1,27 +1,66 @@
<view class="tree">
-
<t-collapse default-value="{{openIds}}" catchchange="handleChange">
- <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{item.id}}">
+ <t-collapse-panel
+ wx:for="{{treeList}}"
+ wx:for-item="item"
+ wx:for-index="index"
+ wx:key="id"
+ value="{{item.id}}"
+ >
<view slot="header" class="header-title">
<view class="title-checkBox" catchtap="catchTap">
- <t-checkbox icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catchchange="checkResourceTitle" wx:if="{{isShowCheck}}" />
+ <t-checkbox
+ icon="rectangle"
+ checked="{{item.checked}}"
+ data-item="{{item}}"
+ catchchange="checkResourceTitle"
+ wx:if="{{isShowCheck}}"
+ />
<!-- 绔犺妭鍚� -->
<view style="width: 100%">
- <text>{{item.name}} </text><text wx:if="{{item.sysType =='CmsFolder'}}">锛坽{item.children ? item.children.length : 0}}锛�</text>
+ <text>{{item.name}} </text
+ ><text wx:if="{{item.sysType =='CmsFolder'}}"
+ >锛坽{item.children ? item.children.length : 0}}锛�</text
+ >
</view>
</view>
</view>
- <view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex">
+ <view
+ class="list"
+ wx:for="{{item.children}}"
+ wx:for-item="citem"
+ wx:for-index="cindex"
+ wx:key="cindex"
+ >
<!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず -->
- <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}">
- <view class="itemsInfo" wx:if="{{citem.name}}" data-item="{{citem}}" data-index="{{cindex}}">
- <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}">
+ <view
+ class="listItems"
+ wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}"
+ >
+ <view
+ class="itemsInfo"
+ wx:if="{{citem.name}}"
+ data-item="{{citem}}"
+ data-index="{{cindex}}"
+ >
+ <view
+ class="contentBox"
+ bind:tap="goPlayer"
+ data-item="{{citem}}"
+ data-parent="{{item}}"
+ >
<!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 -->
- <view class="box-image" style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}">
- <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap">
+ <view
+ class="box-image"
+ style="{{ tab == 'jsek_teachingResources' ? 'width: 350rpx;' : 'width: 450rpx;'}}"
+ >
+ <view
+ class="checkBox"
+ wx:if="{{isShowCheck}}"
+ catchtap="catchTap"
+ >
<!-- 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}}" /> -->
-<<<<<<< Updated upstream
<t-checkbox
disabled="{{!citem.saleMethod[0].Id}}"
icon="rectangle"
@@ -29,55 +68,115 @@
data-item="{{citem}}"
catch:change="checkResource"
/>
-=======
- <t-checkbox icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" catch:change="checkResource" />
->>>>>>> Stashed changes
</view>
<!-- 鏁欏璧勬簮鍥炬爣 -->
<view class="teach-icon">
- <image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
- <image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
- <image wx:elif="{{citem.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" />
- <image wx:elif="{{citem.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" />
- <image wx:elif="{{citem.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" />
- <image wx:elif="{{citem.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" />
- <image wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" />
- <image wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" />
- <image wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" />
+ <image
+ wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}"
+ src="/static/images/bookService/detail/audioIcon.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
+ src="/static/images/bookService/detail/video.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'pdf'}}"
+ src="/static/images/bookService/detail/pdf.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'webpage'}}"
+ src="/static/images/bookService/detail/net.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'picture'}}"
+ src="/static/images/bookService/detail/picture.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'zip'}}"
+ src="/static/images/bookService/detail/zip.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}"
+ src="/static/images/bookService/detail/word.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}"
+ src="/static/images/bookService/detail/excel.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}"
+ src="/static/images/bookService/detail/PPT.png"
+ mode="aspectFill"
+ />
</view>
<!-- 浜戝涔犲浘鏍� -->
<view> </view>
<!-- 鍚嶇О -->
- <text class="name" style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}">{{citem.name}}</text>
+ <text
+ class="name"
+ style="{{ tab == 'jsek_teachingResources' ? 'width: 300rpx;' : 'width: 400rpx;'}}"
+ >{{citem.name}}</text
+ >
</view>
<!-- 鏁欏璧勬簮绫诲瀷 -->
<view class="teachClass"> {{citem.resourceClass}} </view>
- <view class="teach-btn" wx:if="{{tab == 'jsek_teachingResources'}}">
+ <view
+ class="teach-btn"
+ wx:if="{{tab == 'jsek_teachingResources'}}"
+ >
<!-- 涓嬭浇鎸夐挳 -->
-<<<<<<< Updated upstream
<!-- <image
src="/static/images/bookService/detail/download-icon.png"
class="download-image"
data-value="{{citem}}"
catchtap="downloadTeach"
></image> -->
-=======
- <image src="/static/images/bookService/detail/download-icon.png" class="download-image" data-value="{{citem}}" catchtap="downloadTeach"></image>
->>>>>>> Stashed changes
</view>
<view wx:if="{{tab == 'jsek_cloudLearning'}}">
<!-- 浜戝涔犺瘯鐪嬪浘鏍� -->
- <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image>
+ <image
+ src="/static/images/bookService/detail/shikan.png"
+ class="testSee"
+ wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"
+ ></image>
<!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 -->
- <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image>
+ <image
+ src="/static/images/bookService/detail/cart@2x.png"
+ wx:if="{{citem.isShopCar}}"
+ class="shopCar"
+ data-item="{{citem}}"
+ catch:tap="onCloudShoppingCart"
+ ></image>
<!-- 浜戝涔犺喘涔板浘鏍� -->
- <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image>
+ <image
+ src="/static/images/bookService/detail/need-buy.png"
+ class="need-buy"
+ wx:if="{{citem.isbuy }}"
+ ></image>
</view>
</view>
</view>
</view>
<!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 -->
- <tree wx:if="{{citem.childrenCount > 0 && citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openTeachids="{{openTeachids}}" openLearnids="{{openLearnids}}"></tree>
+ <tree
+ wx:if="{{citem.childrenCount > 0 && citem.sysType == 'CmsFolder' }}"
+ isShowCheck="{{isShowCheck}}"
+ bookInfo="{{bookInfo}}"
+ treeList="{{[citem]}}"
+ itemId="{{itemId}}"
+ tab="{{tab}}"
+ buyIds="{{buyIds}}"
+ openTeachids="{{openTeachids}}"
+ openLearnids="{{openLearnids}}"
+ ></tree>
</view>
<!-- 鏆傛棤鏁版嵁 -->
<view wx:if="{{!item.children || !item.children.length}}" class="noData">
@@ -91,8 +190,7 @@
</view>
</t-collapse-panel>
</t-collapse>
-
</view>
<web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view>
-<!-- <button bind:tap="sadd"> 65498</button> -->
\ No newline at end of file
+<!-- <button bind:tap="sadd"> 65498</button> -->
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index d3cea05..84fd0f7 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -805,7 +805,15 @@
},
};
const data = await app.MG.store.getProductDetail(query);
+ const flag = data.datas.cmsDatas[0].datas.findIndex(
+ (item) => item.sysType == "CmsItem"
+ );
data.datas.cmsDatas[0].datas.forEach((item) => {
+ if (item.sysType == "CmsFolder" && flag > -1) {
+ item.isShow = false;
+ } else {
+ item.isShow = true;
+ }
this.data.resourceClassList.forEach((type) => {
if (type.value == item.resourcesClassification)
item.resourceClass = type.name;
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 2c8f67f..2fc8e5b 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -236,7 +236,6 @@
style="{{tabPanelstyle}}"
>
<view wx:if="{{!loading && learn.length}}">
-<<<<<<< Updated upstream
<learn-resource
bind:getFreeResource="getFreeResource"
bind:allAddShoppiingCar="allAddShoppiingCar"
@@ -245,6 +244,7 @@
bookId="{{bookDetail.id}}"
isshowDrawBtn="{{isshowDrawBtn}}"
></learn-resource>
+
<tree
id="tree"
openIds="{{openLearnids}}"
@@ -253,14 +253,9 @@
treeList="{{learn}}"
buyIds="{{buyIdList}}"
openLearnids="{{openLearnids}}"
+ bind:updateShoppingCartHidden="updateShoppingCartHidden"
+ bind:updateCloudLearning="updateCloudLearning"
></tree>
-=======
- <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
-
- <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
-
-
->>>>>>> Stashed changes
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 347432a..d70c179 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -23,7 +23,7 @@
<view class="bookServices-list">
<view class="list-header">
<view class="header-scroll">
- <t-dropdown-menu style="width: 1000rpx">
+ <t-dropdown-menu style="width: 1200rpx">
<t-dropdown-item
disabled="{{disabledStair}}"
optionsColumns="2"
@@ -63,23 +63,6 @@
bind:confirm="changeNewText"
bind:reset="resetNewText"
/>
- </t-dropdown-menu>
- </view>
- <view class="header-sort">
- <!-- <text class="sort-name">鎺掑簭</text>
- <t-icon
- name="swap-left"
- size="28rpx"
- class="icon-right"
- color="{{sort == 'Asc' ? '#ff6c00' : ''}}"
- />
- <t-icon
- name="swap-left"
- size="28rpx"
- class="icon-left"
- color="{{sort == 'Desc' ? '#ff6c00' : ''}}"
- /> -->
- <t-dropdown-menu>
<t-dropdown-item
options="{{sortList.options}}"
value="{{sortList.value}}"
@@ -87,6 +70,11 @@
/>
</t-dropdown-menu>
</view>
+ <!-- <view class="header-sort">
+ <t-dropdown-menu>
+
+ </t-dropdown-menu>
+ </view> -->
</view>
<scroll-view
scroll-y="{{true}}"
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index b6b258c..b2464f3 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -103,7 +103,7 @@
.header-scroll {
height: 100%;
- width: 80vw;
+ width: 100vw;
overflow-x: auto;
}
--
Gitblit v1.9.1