From c96612e8a63ecef9590be0f8b5199277ec94e5b9 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 18 九月 2024 18:43:12 +0800
Subject: [PATCH] 云学习购买目录,修改bug

---
 pages/digitalCourses/digitalCoursesDetails/index.wxml |  125 +++++++++++++++++++++++++++--------------
 1 files changed, 83 insertions(+), 42 deletions(-)

diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml
index ea1cde4..c9f44e8 100644
--- a/pages/digitalCourses/digitalCoursesDetails/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml
@@ -6,42 +6,50 @@
       <view class="book-box">
         <view class="digitalCoursesDetailsTitle">
           <view class="imageBox">
-            <image src="{{digitalsData.icon}}" mode="aspectFit" />
+            <image src="{{digitalsData.icon ? digitalsData.icon : 'https://jsek.bnuic.com/home/image/courseIcon.png'}}" mode="aspectFit" />
           </view>
           <view class="nameBox">{{digitalsData.name}}</view>
           <view>
             <viwe class="styleCssBox">
-              <view style="width: 200rpx;"> ISBN锛� </view>
+              <view style="width: 200rpx"> ISBN锛� </view>
               <view wx:if="{{digitalsData.isbn}}"> {{digitalsData.isbn}} </view>
               <view wx:else>-</view>
             </viwe>
 
             <viwe class="styleCssBox">
-              <view style="width: 200rpx;">璇剧▼璐熻矗浜猴細</view>
-              <view wx:if="{{digitalsData.courseLeader}}"> {{digitalsData.courseLeader }}</view>
+              <view style="width: 200rpx">璇剧▼璐熻矗浜猴細</view>
+              <view wx:if="{{digitalsData.courseLeader}}">
+                {{digitalsData.courseLeader }}
+              </view>
               <view wx:else>-</view>
             </viwe>
             <viwe class="styleCssBox">
-              <view style="width: 200rpx;">璇剧▼璐熻矗浜哄崟浣嶏細</view>
-              <view wx:if="{{digitalsData.affiliatedUnit}}"> {{ digitalsData.affiliatedUnit}}</view>
+              <view style="width: 200rpx">璇剧▼璐熻矗浜哄崟浣嶏細</view>
+              <view wx:if="{{digitalsData.affiliatedUnit}}">
+                {{ digitalsData.affiliatedUnit}}
+              </view>
               <view wx:else>-</view>
             </viwe>
             <viwe class="styleCssBox">
-              <view style="width: 200rpx;">鍑虹増鍗曚綅锛�</view>
-              <view wx:if="{{digitalsData.publishingUnit}}"> {{publishingUnit}} </view>
+              <view style="width: 200rpx">鍑虹増鍗曚綅锛�</view>
+              <view wx:if="{{digitalsData.publishingUnit}}">
+                {{publishingUnit}}
+              </view>
               <view wx:else>-</view>
             </viwe>
             <viwe class="styleCssBox">
-              <view style="width: 200rpx;">鍑虹増鏃堕棿锛�</view>
-              <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}} </view>
+              <view style="width: 200rpx">鍑虹増鏃堕棿锛�</view>
+              <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}}
+              </view>
               <view wx:else>-</view>
             </viwe>
-            <image src="/static/images/bookService/detail/square.png" class="right-background" />
+            <image src="/static/images/bookService/detail/square.png" mode="aspectFit" class="right-background" />
           </view>
         </view>
         <view class="certificate">
-          <view style="margin-left: 30rpx;">浠锋牸锛� <text>锟{digitalsData.price}}</text></view>
-          <view style="margin-right: 30rpx;">鍏�<text>{{ digitalsData.classHours ? digitalsData.classHours : '0'}}</text>璇炬椂</view>
+          <view style="margin-left: 30rpx">浠锋牸锛� <text>锟{digitalsData.price}}</text> <text class="old-price" wx:if="{{digitalsData.oldPrice != '0.00'}}">锟{ digitalsData.oldPrice }}</text> </view>
+          <view style="margin-right: 30rpx">鍏�<text>{{ digitalsData.classHours ? digitalsData.classHours :
+              '0'}}</text>璇炬椂</view>
         </view>
       </view>
     </view>
@@ -50,7 +58,7 @@
         <t-tab-panel icon="{{ tabValue == '0' ? briefIconClick : briefIcon}}" label="鍩烘湰淇℃伅" value="0">
           <view class="rubricBox">
             <view class="rubricimgBox">
-              <image src="/static/images/bookService/detail/label.png" mode="" />
+              <image src="/static/images/bookService/detail/label.png" mode="aspectFit" />
             </view>
             <view class="basic"> 璇剧▼浠嬬粛</view>
           </view>
@@ -63,31 +71,32 @@
           </view>
           <view class="rubricBox">
             <view class="rubricimgBox">
-              <image src="/static/images/bookService/detail/label.png" mode="" />
+              <image src="/static/images/bookService/detail/label.png" mode="aspectFit" />
             </view>
             <view class="basic"> 涓昏鑰佸笀</view>
           </view>
-          <view class="course-content">
+          <view class="course-content" wx:if="{{lecturerList.length> 0}}">
             <view class="lecturer" wx:for="{{lecturerList}}" wx:key="index" wx:for-item="item">
               <view class="lecturerImangBox">
-                <image src="{{item.icon}}" mode="aspectFit" />
+                <image src="{{item.icon}}" mode="aspectFit" wx:if="{{item.icon}}" />
+                <image src="/static/images/lecturer.png" mode="aspectFit" wx:else />
               </view>
               <view class="lecturerInformation">
                 <view class="lecturerName">
-                  <view class="name">
-                    {{item.name}}
-                  </view>
-                  <view class="title">{{item.title}}</view>
+                  <view class="name"> {{item.name}} <text class="positionalTitle" wx:if="{{item.positionalTitle}}">({{item.positionalTitle}})</text></view>
                 </view>
                 <view class="lecturerContent">{{item.description}}</view>
               </view>
             </view>
           </view>
+          <view wx:if="{{lecturerList.length == 0}}" class="noDataBox">
+            <empty />
+          </view>
         </t-tab-panel>
         <t-tab-panel icon="{{ tabValue == '1' ?  learnResourceClickIcon : learnResourceIcon}}" label="璇佷功淇℃伅" value="1">
           <view class="rubricBox">
             <view class="rubricimgBox">
-              <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="" />
+              <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="aspectFit" />
             </view>
             <view class="basic"> 璇佷功淇℃伅</view>
           </view>
@@ -97,22 +106,46 @@
                 <image src="{{cbzsImg}}" mode="" />
               </view>
               <view class="chart" bind:tap="onClick2">
-                <image src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" />
+                <image src="{{rzzsImg}}" mode="" />
               </view>
             </view>
           </view>
-          <canvas canvas-id="myCanvas" style="height:845px;width:595px" wx:if="{{pubCertificateHide}}"></canvas>
+          <canvas canvas-id="myCanvas" style="height: 845px; width: 595px" wx:if="{{pubCertificateHide}}"></canvas>
           <view id="pubCertificate" class="my_canvas" wx:if="{{pubCertificateHide}}">
-            <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="" class="bgImg" />
+            <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="" class="bgImg my_draw_canvas" />
             <view class="certificateInfo my_draw_canvas">
               <view class="bookName my_draw_canvas" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view>
               <view class="author my_draw_canvas" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view>
               <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.affiliatedUnit}}">{{digitalsData.affiliatedUnit || '-'}}</view>
-              <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.isbn}}"> {{ digitalsData.isbn || '-'}}</view>
+              <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.isbn}}">
+                {{ digitalsData.isbn || '-'}}
+              </view>
               <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}}</view>
               <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit}}</view>
               <view class="website my_draw_canvas" data-type="text" data-text="{{website}}">{{website}}</view>
               <view class="codeBox"></view>
+            </view>
+          </view>
+          <canvas canvas-id="myCanvas1" style="height:845px;width:595px" wx:if="{{pubCertificateHide}}"></canvas>
+          <view id="textCertificate" class="my_canvas1" wx:if="{{pubCertificateHide}}">
+            <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/kczs.jpg" src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" class="bgImg my_draw_canvas1" />
+            <view class="certificateInfo my_draw_canvas1">
+              <view class="userIcon my_draw_canvas1">
+                <view class="hexagon my_draw_canvas1">
+                  <image src="{{userPicture}}" class="img my_draw_canvas1" />
+                </view>
+              </view>
+              <view class="userName my_draw_canvas1" data-type="text" data-text="{{userName}}">{{userName}}</view>
+              <view class="bookName my_draw_canvas1" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view>
+              <view class="author my_draw_canvas1" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view>
+              <view class="classHours my_draw_canvas1" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours || '-' }}</view>
+              <view class="affiliatedUnit my_draw_canvas1" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit || '-'}}</view>
+              <view class="studyTime my_draw_canvas1" data-type="text" data-text="{{digitalsData.classHours}}">{{digitalsData.classHours}}</view>
+              <view class="website my_draw_canvas1" data-type="text" data-text="{{website}}">{{website}}</view>
+              <view class="codeBox my_draw_canvas1"></view>
+              <view class="updateDate my_draw_canvas1" wx-if="{{isCertificate}}">
+                {{ moment(isCertificate.updateDate).format('YYYY骞碝M鏈�') }}
+              </view>
             </view>
           </view>
         </t-tab-panel>
@@ -134,8 +167,13 @@
                     <view>{{isTextBookBuy ? '闃呰' : '璇曠湅'}}</view>
                   </view>
                 </view>
-                <tree id="test-tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" treeList="{{learnList}}">
-                </tree>
+                <view wx:if="{{learnList.length > 0}}">
+                  <tree id="test-tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" treeList="{{learnList}}" isBuy="{{isBuy}}">
+                  </tree>
+                </view>
+                <view wx:if="{{learnList.length == 0}}" class="noData">
+                  <empty />
+                </view>
               </view>
               <view wx:if="{{selectActive == 'test'}}">
                 <view class="testBtnBox">
@@ -147,16 +185,18 @@
                         <text class="note-btn-text">鎴戠殑閿欓</text>
                       </view>
                     </t-button>
-                    <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="collectQuestion" style="width: 220rpx;margin-left:10rpx;">
+                    <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="collectQuestion" style="width: 220rpx; margin-left: 10rpx">
                       <view slot="content" class="btn-content">
                         <image src="/static/images/bookService/detail/wodeshoucang.png" />
                         <text class="note-btn-text">鎴戠殑鏀惰棌</text>
                       </view>
                     </t-button>
-
                   </view>
                 </view>
-                <testTree id="tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" tab="{{tab}}" treeList="{{testList}}"></testTree>
+                <testTree id="tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" tab="{{tab}}" treeList="{{testList}}" isBuy="{{isBuy}}"></testTree>
+                <view wx:if="{{testList.length == 0}}" class="noData">
+                  <empty />
+                </view>
               </view>
             </view>
           </view>
@@ -212,7 +252,7 @@
         <t-tab-panel icon="{{tabValue == '5' ? testResourceClickIocn : testResourceIocn}}" value="5" label="鐩稿叧璇剧▼" style="{{tabPanelstyle}}">
           <view class="rubricBox">
             <view class="rubricimgBox">
-              <image src="/static/images/digitalTextbooks/Link@3x.png" mode="" />
+              <image src="/static/images/digitalTextbooks/Link@3x.png" mode="aspectFit" />
             </view>
             <view class="basic"> 鐩稿叧璇剧▼</view>
           </view>
@@ -220,9 +260,9 @@
             <empty />
           </view>
           <view class="correlation" wx:else>
-            <view style="margin-bottom: 30rpx;" wx:for="{{relatedBookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onCorrelationBook">
+            <view style="margin-bottom: 30rpx" wx:for="{{relatedBookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onCorrelationBook">
               <view class="correlationImage">
-                <image src="{{item.icon}}" mode="" />
+                <image src="{{item.icon}}" mode="aspectFit" />
                 <img wx:if="{{item.icon == ''}}" src="/static/images/default-book-img.png" alt="" />
               </view>
               <view class="correlationName">{{item.name}}</view>
@@ -235,21 +275,22 @@
     <view class="box-bottom">
       <view class="bottom-btn" bind:tap="setCoolect">
         <view class="collectionImage">
-          <image wx:if="{{!digitalsData.isFavourite}}" src="/static/images/digitalTextbooks/wodeshoucang@2x.png" mode="" />
-          <image wx:else src="/static/images/bookService/detail/collecting.png" mode="" />
+          <image wx:if="{{!digitalsData.isFavourite}}" src="/static/images/digitalTextbooks/wodeshoucang@2x.png" />
+          <image wx:else src="/static/images/bookService/detail/collecting.png" />
         </view>
         <view class="btn-text">
           鏀惰棌
         </view>
       </view>
-      <view class="bottom-btn" bind:tap="onCertificate">
+      <view class="bottom-btn" bind:tap="onCertificate" wx:if="{{!isCertificate.state || isCertificate.state == 'Reject'}}">
         <view class="applicationImageBox">
-          <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" mode="" />
+          <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" />
         </view>
-        <view>璇佷功鐢宠</view>
+        <view class="btn-text">璇佷功鐢宠</view>
       </view>
-      <view class="bottom-btn shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy}}">鍔犲叆璐墿杞�</view>
-      <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy}}">绔嬪嵆璐拱</view>
+      <view class="bottom-btn shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy && digitalsData.price != '0.00' }}">鍔犲叆璐墿杞�</view>
+      <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy &&  digitalsData.price != '0.00'}}">绔嬪嵆璐拱</view>
+      <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy &&  digitalsData.price == '0.00'}}"> 鍏嶈垂棰嗗彇</view>
     </view>
     <t-toast id="t-toast" />
   </scroll-view>
@@ -262,7 +303,7 @@
       <view class="row-info">
         <view class="body">
           <view class="dialog-title">瀛︿範璇佷功鐢宠</view>
-          <view style="width: 100%; height: 2rpx; background-color: #F4F4F4;"></view>
+          <view style="width: 100%; height: 2rpx; background-color: #f4f4f4"></view>
           <view class="input-box">
             <t-input class="input" borderless placeholder="璇疯緭鍏ョ湡瀹炲鍚�" value="{{userInfo.fullName}}" bind:change="onFullNameInput"></t-input>
           </view>

--
Gitblit v1.9.1