From 61052ffdfbbb93dae84803c5bd966899c2afb684 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 10 一月 2025 17:49:40 +0800
Subject: [PATCH] 云学习购买
---
packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml | 37 +++++++------------------------------
packageBookService/pages/bookServices/detail/components/tree/index.js | 2 +-
packageBookService/pages/bookServices/detail/index.js | 9 ++++-----
3 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
index 2918849..9337036 100644
--- a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxml
@@ -1,10 +1,6 @@
<!--pages/bookServices/detail/components/learnResource/learnResource.wxml-->
-<view
- class="learnResource"
- theme="primary"
- style="justify-content: {{!isshowDrawBtn ? 'flex-end' : ''}};"
->
- <t-button
+<view class="learnResource" theme="primary" style="justify-content: {{!isshowDrawBtn ? 'flex-end' : ''}};">
+ <!-- <t-button
wx:if="{{isshowDrawBtn}}"
loading="{{receive}}"
class="btn"
@@ -17,42 +13,23 @@
<image src=" /static/images/bookService/detail/yijianlingqu.png" />
<text>棰嗗彇鏌ョ湅</text>
</view>
- </t-button>
- <t-button
- wx:if="{{isShowBuyCloundBtn}}"
- loading="{{buy}}"
- class="btn"
- theme="primary"
- bind:tap="goBuyResource"
- style="height: 72rpx; font-size: 28rpx;margin: {{!isshowDrawBtn ? '0 20rpx' : ''}}"
- >
+ </t-button> -->
+ <t-button wx:if="{{isShowBuyCloundBtn}}" loading="{{buy}}" class="btn" theme="primary" bind:tap="goBuyResource" style="height: 72rpx; font-size: 28rpx;margin: {{!isshowDrawBtn ? '0 20rpx' : ''}}">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/yijiangoumai.png" />
<text>璧勬簮璐拱</text>
</view>
</t-button>
- <t-button
- theme="primary"
- class="btn"
- style="height: 72rpx; font-size: 28rpx"
- bind:tap="buyCloudLearnClass"
- wx:if="{{isShowBuyCloundMenu}}"
- >
+ <t-button theme="primary" class="btn" style="height: 72rpx; font-size: 28rpx" bind:tap="buyCloudLearnClass" wx:if="{{isShowBuyCloundMenu}}">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/yijiangoumai.png" />
<text>鍏ㄩ儴璐拱</text>
</view>
</t-button>
- <t-button
- class="btn"
- theme="primary"
- style="height: 72rpx; font-size: 28rpx; margin: 0 20rpx"
- bind:tap="goLearnTask"
- wx:if="{{learnTaskData.name}}"
- >
+ <t-button class="btn" theme="primary" style="height: 72rpx; font-size: 28rpx; margin: 0 20rpx" bind:tap="goLearnTask" wx:if="{{learnTaskData.name}}">
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/renwudan锛廼con.png" />
<text>瀛︿範浠诲姟鍗�</text>
</view>
</t-button>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index d503e4e..cf3f46c 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -227,7 +227,7 @@
// 1.2 浜戝涔犳棤閿�鍞柟寮忥紝灏嗙埗绾х洰褰曞拰鏈韩鍔犲叆鏁扮粍
learn = this.handleTreeData(this.properties.learnList).filter(
(citem) => citem.saleMethod &&
- citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal') &&
+ citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal' && ditem.Price > 0) &&
new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').EndDate).getTime() >= new Date().getTime() &&
new Date(citem.saleMethod.find((ditem) => ditem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime() &&
item.productLinkPath.includes(citem.productLinkPath)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 6eae7bd..212bf12 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -1044,7 +1044,6 @@
res.datas.cmsDatas[0].datas.forEach((item) => {
// 浜戝涔犱笂鏈夐攢鍞柟寮忥紝鍘绘帀浜戝涔犱笅鎵�鏈夐攢鍞柟寮�
if (this.data.tabValue == "jsek_teachingResources") {
-
if (item.file || item.freeFile) {
let md5 = item.file ? item.file : item.freeFile
md5s.push(md5)
@@ -1053,7 +1052,7 @@
md5List: md5s,
});
}
- if (flags) item.saleMethod = []
+ if (flags && cloundSaleMethod.Price > 0) item.saleMethod = []
item.checked = false;
if (item.sysType == 'CmsItem') {
// 鏁欏璧勬簮 绫诲瀷鍚嶇О璧嬪��
@@ -1101,7 +1100,7 @@
new Date(item.saleMethod.find((citem) => citem.SaleType == 'Normal').BeginDate).getTime() <= new Date().getTime()
) || (flags && cloundSaleMethod.Price == 0)
// 鍒ゆ柇浜戝涔犲叏閮ㄨ喘涔版寜閽槸鍚︽樉绀�
- let isShowBuyCloundMenu = flags && cloundSaleMethod.Price >= 0 && !this.data.buyIdList.includes(cloundSaleMethod.Id)
+ let isShowBuyCloundMenu = flags && cloundSaleMethod.Price > 0 && !this.data.buyIdList.includes(cloundSaleMethod.Id)
// 鍒ゆ柇璧勬簮璐拱鎸夐挳鏄惁鏄剧ず
let isShowBuyCloundBtn = !flags && res.datas.cmsDatas[0].datas.some(citem => citem.saleMethod.length != 0)
// 鍒ゆ柇璐墿杞︽寜閽拰閿佹寜閽槸鍚︽樉绀�
@@ -1114,7 +1113,7 @@
isshowDrawBtn,
isShowBuyCloundMenu,
isShowBuyCloundBtn,
- isCloundHaveSaleMethod: flags,
+ isCloundHaveSaleMethod: flags && cloundSaleMethod.Price > 0,
learn: list,
loading: false,
openLearnids: result,
@@ -1673,7 +1672,7 @@
(item) => item == saleData.Id
);
// 宸茬粡璐拱
- if (isShow) return false
+ if (isShow || saleData.Price == 0) return false
// 鏈喘涔帮紝鏌ョ湅閿�鍞柟寮忔槸鍚﹁繃鏈�
if (!isShow) {
const flag = new Date(saleData.EndDate).getTime() >= new Date().getTime() &&
--
Gitblit v1.9.1