From 7974f3266c323e4cd4fdff7d457fe75f39b8c199 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 25 九月 2024 15:59:06 +0800
Subject: [PATCH] 云学习跳转逻辑修改
---
packageBookService/pages/bookServices/detail/index.wxml | 193 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 164 insertions(+), 29 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 8507c3c..f28429c 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -1,8 +1,6 @@
<!--pages/bookServices/detail/index.wxml-->
<import src="index.skeleton.wxml" />
<template is="skeleton" wx:if="{{pageLoading}}" />
-<!-- pageLoading -->
-<!--瀵艰埅鍖哄煙 -->
<suggest-dialog
class="suggest-dialog"
@@ -12,20 +10,6 @@
></suggest-dialog>
<!-- <popup showIndex="{{showIndex}}"></popup> -->
<view class="page-bookService" wx:if="{{!pageLoading}}">
- <!-- <view style="width: 100%; height: {{barHeight}}px; "></view>
- <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
- <view>
- <t-icon
- name="chevron-left"
- size="30"
- data-name="{{item}}"
- bind:click="goBack"
- />
- </view>
- <view class="navbar-title" style="width: 100%">
- <text>{{options.name}}</text>
- </view>
- </view> -->
<t-toast id="t-toast" />
<movable-area class="movable-area">
<scroll-view
@@ -183,21 +167,23 @@
class="tab-class"
>
<t-tab-panel
- label="鍥句功绠�浠�"
+ label="鍥句功淇℃伅"
icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
value="brief"
style="{{tabPanelstyle}}"
>
<book-brief
content="{{bookDetail.content}}"
+ catalogue="{{bookDetail.catalogue}}"
authorIntroduction="{{bookDetail.authorIntroduction}}"
wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
></book-brief>
<view
- wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
+ wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}"
class="noData"
>
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+ <empty />
</view>
</t-tab-panel>
<!-- <t-tab-panel
@@ -213,15 +199,15 @@
value="jsek_teachingResources"
class="{{loading ? 'loading': ''}}"
>
- <view
- wx:if="{{!loading && teach.length && !noResources && applyState}}"
- >
+ <view wx:if="{{!loading && applyState}}">
<teach-resource
applyState="{{applyState}}"
rejectCause="{{rejectCause}}"
deadline="{{deadline}}"
bind:applyResource="applyResource"
+ treeList="{{teach}}"
applyResourceLoading="{{applyResourceLoading}}"
+ bind:uploadFile="uploadFile"
></teach-resource>
<tree
id="teach-tree"
@@ -253,9 +239,6 @@
loading="{{loading}}"
></t-skeleton>
</view>
- <view wx:if="{{noResources}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view>
</t-tab-panel>
<t-tab-panel
label="浜戝涔�"
@@ -273,6 +256,10 @@
isshowDrawBtn="{{isshowDrawBtn}}"
successOrderNumber="{{successOrderNumber}}"
isGoBuyResource="{{isGoBuyResource}}"
+ isShowBuyCloundMenu="{{isShowBuyCloundMenu}}"
+ isShowBuyCloundBtn="{{isShowBuyCloundBtn}}"
+ bind:buyCloudLearnClass="buyCloudLearnClass"
+ learnTaskData="{{learnTaskData}}"
></learn-resource>
<tree
@@ -281,14 +268,20 @@
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}}" class="noData">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <view wx:if="{{noResources && !loading}}" class="noData">
+ <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+ <empty />
</view>
</t-tab-panel>
<t-tab-panel
@@ -302,7 +295,11 @@
id="test-resource"
list="{{test}}"
bookInfo="{{bookDetail}}"
+ openIds="{{openLearnids}}"
mockData="{{mockData}}"
+ tab="{{tabValue}}"
+ storeInfo="{{options.storeInfo}}"
+ jslx="{{jslx}}"
bind:buyMock="buyMock"
></test-resource>
</view>
@@ -382,7 +379,7 @@
<view
class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}"
bind:tap="goRead"
- wx:if="{{!bookBuy}}"
+ wx:if="{{!bookBuy || applicationState == 'overdue'}}"
>
<view>
<t-image src="/static/images/bookService/detail/shidu.png"></t-image>
@@ -408,10 +405,148 @@
wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}"
>鍏嶈垂棰嗗彇</view
>
- <view class="buy read" bind:tap="goRead" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view>
+ <view
+ class="buy read"
+ bind:tap="goRead"
+ wx:if="{{bookBuy || applicationState == 'Normal'}}"
+ >绔嬪嵆鏌ョ湅</view
+ >
+ </view>
+</view>
+<view wx:if="{{dialogBox}}">
+ <view class="popup-box" bindtap="closeDialog"></view>
+ <view class="info-center">
+ <view>
+ <view class="row-info">
+ <view class="body">
+ <view class="dialog-title">鏂囦欢涓婁紶</view>
+ <view
+ style="width: 100%; height: 2rpx; background-color: #f4f4f4"
+ ></view>
+ <view class="from-item">
+ <view class="label"> <text class="icon">*</text>璧勬簮鍚嶇О: </view>
+ <view class="item-content">
+ <view class="inputBox1">
+ <t-input
+ placeholder="杈撳叆璧勬簮鍚嶇О"
+ borderless
+ value="{{resourceInfo.resourceName}}"
+ bindchange="onNameInput"
+ />
+ </view>
+ </view>
+ </view>
+ <view class="from-item">
+ <view class="label"> <text class="icon">*</text>璧勬簮绫诲瀷: </view>
+ <view class="item-content">
+ <!-- <view class="inputBox1">
+ <t-input placeholder="杈撳叆璧勬簮绫诲瀷" borderless value="{{resourceInfo.fileType}}" bindchange="onFileTypeInput" />
+ </view> -->
+ <t-cell
+ class="mb-16"
+ title=""
+ arrow
+ hover
+ note="{{resourceInfo.fileType}}"
+ bind:click="onResourcePicker"
+ />
+ <t-picker
+ visible="{{resourceVisible}}"
+ value="{{resourceValue}}"
+ data-key="resource"
+ title="閫夋嫨璧勬簮绫诲瀷"
+ cancelBtn="鍙栨秷"
+ confirmBtn="纭"
+ usingCustomNavbar
+ bindchange="onPickerChange"
+ bindcancel="onPickerCancel"
+ >
+ <t-picker-item options="{{fileTypeList}}" />
+ </t-picker>
+ </view>
+ </view>
+ <view class="from-item">
+ <view class="label">鏂囦欢鎻忚堪:</view>
+ <view class="item-content">
+ <view class="inputBox1">
+ <t-textarea
+ placeholder="璇疯緭鍏ユ枃浠舵弿杩�"
+ value="{{resourceInfo.description}}"
+ disableDefaultPadding="{{true}}"
+ autosize="{{true}}"
+ maxlength="300"
+ indicator
+ bind:change="textareaChange"
+ />
+ </view>
+ </view>
+ </view>
+ <view class="from-item">
+ <view class="label"> <text class="icon">*</text>涓婁紶鏂囦欢: </view>
+ <view class="item-content">
+ <t-button
+ size="small"
+ class="right-btn"
+ bind:tap="uploadPicture"
+ wx:if="{{isShowUp}}"
+ >鐐瑰嚮涓婁紶</t-button
+ >
+ <view
+ wx:if="{{!isShowUp && fileList.length > 0}}"
+ class="fileList"
+ >
+ <text>{{fileList[0].name}}</text>
+ <image
+ src="/static/images/bookService/detail/deleteHover.png"
+ class="deleteBtn"
+ data-md5="{{fileList[0].md5}}"
+ bind:tap="handleRemove"
+ />
+ </view>
+ </view>
+ <view class="tip">娉細鏂囦欢澶у皬涓嶅緱瓒呰繃50MB</view>
+ </view>
+ <view class="from-item">
+ <view class="protocolBox">
+ <t-checkbox
+ label="鍚屾剰"
+ icon="rectangle"
+ checked="{{resourceInfo.agree}}"
+ bind:change="onChange"
+ />
+ <text class="wait" bind:tap="getAgreement">銆婃巿鏉冨悓鎰忎功銆�</text>
+ </view>
+ </view>
+ </view>
+ <view class="row-btn">
+ <view class="left-btn" bindtap="closeDialog">鍙栨秷</view>
+ <view class="right-btn" bindtap="confirmM">纭</view>
+ </view>
+ </view>
+ </view>
</view>
</view>
+<view class="popupBox">
+ <t-popup
+ visible="{{protocolShow}}"
+ bind:visible-change="onVisibleChange"
+ placement="center"
+ >
+ <view class="block">
+ <view class="protocol">
+ <rich-text space="emsp" nodes="{{protocolTxt}}" class="content" />
+ </view>
+ <t-icon
+ t-class="close-btn"
+ name="close-circle"
+ size="32"
+ color="#fff"
+ bind:tap="onCloseProtocol"
+ />
+ </view>
+ </t-popup>
+</view>
<!-- <view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
</view> -->
--
Gitblit v1.9.1