From 99dfeb5fc86bce593a5d3f43f45c26eedc00ab0a Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期二, 10 九月 2024 16:28:54 +0800 Subject: [PATCH] bug --- packageBookService/pages/bookServices/detail/index.wxml | 340 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 208 insertions(+), 132 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml index d04e4cc..a383338 100644 --- a/packageBookService/pages/bookServices/detail/index.wxml +++ b/packageBookService/pages/bookServices/detail/index.wxml @@ -3,108 +3,119 @@ <template is="skeleton" wx:if="{{pageLoading}}" /> <!-- pageLoading --> <!--瀵艰埅鍖哄煙 --> -<view class="page-bookService" wx:if="{{!pageLoading}}"> - <view style="width: 100%; height: {{barHeight}}px; "></view> - <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;"> - <view> - <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> - </view> - <view class="navbar-title">{{options.name}}</view> - </view> - <t-toast id="t-toast" /> - <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom"> - <!-- 鍥句功璇︽儏 --> - <view class="book-box"> - <view class="book-detail" id="book-detail"> - <view class="detail-left"> - <view class="book-img"> - <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" /> - </view> - <view class="book-use"> - <view class="collect" bind:tap="setCollect"> - <view> - <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" /> - <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" /> - </view> - <view class="use-title">鏀惰棌</view> - </view> - <view class="suggest" bind:tap="suggestBtn"> - <view> - <image loading="" src="/static/images/bookService/detail/suggest.png" /> - </view> - <view class="use-title">鎴戣寤鸿</view> - </view> - </view> - </view> - <view class="detail-right"> - <view class="book-name showTow">{{bookDetail.name}}</view> - <view class="book-message"> - <view class="message-li" wx:if="{{bookDetail.seriesName}}"> - <view class="li-title">涓涗功鍚嶏細</view> - <view class="li-content">{{bookDetail.seriesName}}</view> - </view> - <view class="message-li" wx:if="{{bookDetail.author}}"> - <view class="li-title">浣滆�咃細</view> - <view class="li-content">{{bookDetail.author}}</view> - </view> - <view class="message-li" wx:if="{{bookDetail.isbn}}"> - <view class="li-title">ISBN锛�</view> - <view class="li-content">{{bookDetail.isbn}}</view> - </view> - <view class="message-li" wx:if="{{bookDetail.publicationDate}}"> - <view class="li-title">鍑虹増鏃堕棿锛�</view> - <view class="li-content">{{bookDetail.publicationDate}}</view> - </view> - <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx"> - <view class="li-title">鍥句功鍒嗙被锛�</view> - <view class="class-name showTow">{{bookClass}}</view> - </view> - </view> - <image src="/static/images/bookService/detail/square.png" class="right-background" /> - </view> - </view> - <!-- 閿�鍞俊鎭� --> - <view class="book-sale"> - <view class="book-price"> - <!-- 鐢靛瓙涔﹀敭浠� --> - <view class="electron-price" wx:if="{{bookDetail.price}}"> - <view> - <image src="/static/images/bookService/detail/electon-price.png" /> - </view> - <view class="price"> - <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+ - bookDetail.price}}</view> - <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}} - </view> - </view> - <view> </view> - </view> - <!-- 绾歌川涔﹀敭浠� --> - <view class="paper-price" wx:if="{{bookDetail.paperPrice}}"> - <view> - <image src="/static/images/bookService/detail/paper-price.png" /> - </view> - <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : - '楼'+bookDetail.paperPrice}}</view> - </view> - </view> - <!-- 缃戝簵 --> - <view class="book-web"> - <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" /> - <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" /> - <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" /> - <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" /> - </view> - </view> - </view> - <view class="book-resource"> - <movable-area class="movable-area"> +<suggest-dialog class="suggest-dialog" showIndex="{{showIndex}}" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></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 scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom"> + <!-- 鍥句功璇︽儏 --> + <view class="book-box"> + <view class="book-detail" id="book-detail"> + <view class="detail-left"> + <view class="book-img"> + <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" /> + </view> + <view class="book-use"> + <view class="collect" bind:tap="setCollect"> + <view> + <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" /> + <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" /> + </view> + <view class="use-title">鏀惰棌</view> + </view> + <view class="suggest" bind:tap="suggestBtn"> + <view> + <image loading="" src="/static/images/bookService/detail/suggest.png" /> + </view> + <view class="use-title">鎴戣寤鸿</view> + </view> + </view> + </view> + <view class="detail-right"> + <view class="book-name showTow">{{bookDetail.name}}</view> + <view class="book-message"> + <view class="message-li" wx:if="{{bookDetail.seriesName}}"> + <view class="li-title">涓涗功鍚嶏細</view> + <view class="li-content">{{bookDetail.seriesName}}</view> + </view> + <view class="message-li" wx:if="{{bookDetail.author}}"> + <view class="li-title">浣滆�咃細</view> + <view class="li-content">{{bookDetail.author}}</view> + </view> + <view class="message-li" wx:if="{{bookDetail.isbn}}"> + <view class="li-title">ISBN锛�</view> + <view class="li-content">{{bookDetail.isbn}}</view> + </view> + <view class="message-li" wx:if="{{bookDetail.publicationDate}}"> + <view class="li-title">鍑虹増鏃堕棿锛�</view> + <view class="li-content">{{bookDetail.publicationDate}}</view> + </view> + <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx"> + <view class="li-title">鍥句功鍒嗙被锛�</view> + <view class="class-name showTow">{{bookClass}}</view> + </view> + </view> + <image src="/static/images/bookService/detail/square.png" class="right-background" /> + </view> + </view> + <!-- 閿�鍞俊鎭� --> + <view class="book-sale"> + <view class="book-price"> + <!-- 鐢靛瓙涔﹀敭浠� --> + <view class="electron-price" wx:if="{{bookDetail.price}}"> + <view> + <image src="/static/images/bookService/detail/electon-price.png" /> + </view> + <view class="price"> + <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+ + bookDetail.price}}</view> + <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}} + </view> + </view> + <view> </view> + </view> + <!-- 绾歌川涔﹀敭浠� --> + <view class="paper-price" wx:if="{{bookDetail.paperPrice}}"> + <view> + <image src="/static/images/bookService/detail/paper-price.png" /> + </view> + <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : + '楼'+bookDetail.paperPrice}}</view> + </view> + </view> + <!-- 缃戝簵 --> + <view class="book-web"> + <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" /> + <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" /> + <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" /> + <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" /> + </view> + </view> + </view> + + <view class="book-resource"> <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class"> - <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}"> - <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief> - <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData"> - <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> + <t-tab-panel 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 && !loading}}" class="noData"> + <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> --> + <empty /> </view> </t-tab-panel> <!-- <t-tab-panel @@ -116,8 +127,8 @@ </t-tab-panel> --> <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}"> <view wx:if="{{!loading && teach.length && !noResources && applyState}}"> - <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource> - <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree> + <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}" bind:uploadFile="uploadFile"></teach-resource> + <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" deadline="{{deadline}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree> </view> <!-- <t-loading theme="circular" @@ -126,34 +137,27 @@ loading="{{loading }}" /> --> <view wx:if="{{loading}}" style="width: 100%; height: min-content"> -<<<<<<< Updated upstream - <t-skeleton - row-col="{{rowCol}}" - theme="paragraph" - animation="gradient" - loading="{{loading}}" - ></t-skeleton> -======= - <t-skeleton row-col="{{[1,1,2,1,1,2]}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton> ->>>>>>> Stashed changes + <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton> </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 label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}"> <view wx:if="{{!loading && learn.length}}"> - <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource> + <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}" successOrderNumber="{{successOrderNumber}}" isGoBuyResource="{{isGoBuyResource}}"></learn-resource> <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></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 label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}"> <view wx:if="{{!loading}}"> - <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></test-resource> + <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" openIds="{{openLearnids}}" mockData="{{mockData}}" tab="{{tabValue}}" storeInfo="{{options.storeInfo}}" jslx="{{jslx}}" bind:buyMock="buyMock"></test-resource> </view> </t-tab-panel> <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}"> @@ -163,17 +167,17 @@ <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books> </t-tab-panel> </t-tabs> - <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all"> - <view class="applyBox" bindtap="goApply"> - <view class="box"> - <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" /> - <view class="num" wx:if="{{num > 0}}">{{num}}</view> - </view> - </view> - </movable-view> - </movable-area> - </view> - </scroll-view> + </view> + </scroll-view> + <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all"> + <view class="applyBox" bindtap="goApply"> + <view class="box"> + <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" /> + <view class="num" wx:if="{{num > 0}}">{{num}}</view> + </view> + </view> + </movable-view> + </movable-area> <!-- 鎴戣寤鸿寮圭獥 --> <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest> <!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 --> @@ -192,20 +196,92 @@ </view> <view class="btn-text">绾歌川鏍蜂功鐢宠</view> </view> - <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy}}"> + <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy || applicationState == 'overdue'}}"> <view> <t-image src="/static/images/bookService/detail/shidu.png"></t-image> </view> <view class="btn-text">璇曡</view> </view> - <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view> + <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view> <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view> <view class="buy receiveColor" bind:tap="buyBtn" 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> --> \ No newline at end of file -- Gitblit v1.9.1