From 5dcba93841a0dadb81a74b55062e440af20ad9d3 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期三, 18 十二月 2024 12:03:28 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/index.wxml | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 9576f19..6288aa1 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -205,7 +205,7 @@
rejectCause="{{rejectCause}}"
deadline="{{deadline}}"
bind:applyResource="applyResource"
- treeList="{{teach}}"
+ md5List="{{md5List}}"
applyResourceLoading="{{applyResourceLoading}}"
bind:uploadFile="uploadFile"
></teach-resource>
@@ -225,12 +225,6 @@
bind:updateCloudLearning="updateCloudLearning"
></tree>
</view>
- <!-- <t-loading
- theme="circular"
- size="60rpx"
- class="loading"
- loading="{{loading }}"
- /> -->
<view wx:if="{{loading}}" style="width: 100%; height: min-content">
<t-skeleton
row-col="{{rowCol}}"
@@ -238,6 +232,9 @@
animation="gradient"
loading="{{loading}}"
></t-skeleton>
+ </view>
+ <view wx:if="{{noResources && !loading}}" class="noData">
+ <empty />
</view>
</t-tab-panel>
<t-tab-panel
@@ -257,6 +254,9 @@
successOrderNumber="{{successOrderNumber}}"
isGoBuyResource="{{isGoBuyResource}}"
isShowBuyCloundMenu="{{isShowBuyCloundMenu}}"
+ isShowBuyCloundBtn="{{isShowBuyCloundBtn}}"
+ bind:buyCloudLearnClass="buyCloudLearnClass"
+ learnTaskData="{{learnTaskData}}"
></learn-resource>
<tree
@@ -265,16 +265,18 @@
bookInfo="{{bookDetail}}"
tab="{{tabValue}}"
treeList="{{learn}}"
+ learnList="{{learn}}"
buyIds="{{buyIdList}}"
openLearnids="{{openLearnids}}"
cloundMenuIsBuy="{{cloundMenuIsBuy}}"
+ learnMenu="{{learnMenu}}"
+ isCloundHaveSaleMethod="{{isCloundHaveSaleMethod}}"
bind:updateShoppingCartHidden="updateShoppingCartHidden"
bind:updateCloudLearning="updateCloudLearning"
bind:getCloundIsBuy="getCloundIsBuy"
></tree>
</view>
<view wx:if="{{noResources && !loading}}" class="noData">
- <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
<empty />
</view>
</t-tab-panel>
@@ -288,6 +290,8 @@
<test-resource
id="test-resource"
list="{{test}}"
+ bankSaleData="{{bankSaleData}}"
+ isBuyBank="{{isBuyBank}}"
bookInfo="{{bookDetail}}"
openIds="{{openLearnids}}"
mockData="{{mockData}}"
@@ -295,6 +299,7 @@
storeInfo="{{options.storeInfo}}"
jslx="{{jslx}}"
bind:buyMock="buyMock"
+ bind:buyBank="buyBank"
></test-resource>
</view>
</t-tab-panel>
@@ -489,7 +494,7 @@
wx:if="{{!isShowUp && fileList.length > 0}}"
class="fileList"
>
- <text>{{fileList[0].name}}</text>
+ <text class="fileName">{{fileList[0].name}}</text>
<image
src="/static/images/bookService/detail/deleteHover.png"
class="deleteBtn"
--
Gitblit v1.9.1