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 |   93 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index e4f2ca0..a383338 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -111,10 +111,11 @@
 
       <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>
+          <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="鏆傛棤鏁版嵁" />
+              <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+              <empty />
             </view>
           </t-tab-panel>
           <!-- <t-tab-panel
@@ -126,7 +127,7 @@
         </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>
+              <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
@@ -139,7 +140,8 @@
               <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
             </view>
             <view wx:if="{{noResources && !loading}}" class="noData">
-              <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+              <!-- <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}}">
@@ -149,12 +151,13 @@
               <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 && !loading}}" class="noData">
-              <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+              <!-- <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}}" openIds="{{openLearnids}}" mockData="{{mockData}}" tab="{{tabValue}}" 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}}">
@@ -193,7 +196,7 @@
       </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>
@@ -203,10 +206,82 @@
     <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