From cb6bb8bda31df75afe5a5bd50fe8e3ff6a3d34e2 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 15 四月 2024 09:31:39 +0800
Subject: [PATCH] 详情页bug修改,资源购买页添加骨架屏

---
 packageBookService/pages/bookServices/detail/index.wxml |  309 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 261 insertions(+), 48 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index ab938b2..13787b6 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -3,34 +3,69 @@
 <template is="skeleton" wx:if="{{pageLoading}}" />
 <!-- pageLoading -->
 <!--瀵艰埅鍖哄煙 -->
+
+<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: 70%; height: {{navBarHeight}}px;">
+  <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
     <view>
-      <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+      <t-icon
+        name="chevron-left"
+        size="30"
+        data-name="{{item}}"
+        bind:click="goBack"
+      />
     </view>
-    <view class="navbar-title">{{options.name}}</view>
+    <view class="navbar-title" style="width: 100%">
+      <text>{{options.name}}</text>
+    </view>
   </view>
   <t-toast id="t-toast" />
-  <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom">
+  <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}}" />
+            <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}}" />
+                <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" />
+                <image
+                  loading=""
+                  src="/static/images/bookService/detail/suggest.png"
+                />
               </view>
               <view class="use-title">鎴戣寤鸿</view>
             </view>
@@ -55,12 +90,19 @@
               <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="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" />
+          <image
+            src="/static/images/bookService/detail/square.png"
+            class="right-background"
+          />
         </view>
       </view>
       <!-- 閿�鍞俊鎭� -->
@@ -69,12 +111,17 @@
           <!-- 鐢靛瓙涔﹀敭浠� -->
           <view class="electron-price" wx:if="{{bookDetail.price}}">
             <view>
-              <image src="/static/images/bookService/detail/electon-price.png" />
+              <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 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>
@@ -84,26 +131,68 @@
             <view>
               <image src="/static/images/bookService/detail/paper-price.png" />
             </view>
-            <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
-              '楼'+bookDetail.paperPrice}}</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}}" />
+          <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">
-        <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-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="鏆傛棤鏁版嵁" />
             </view>
           </t-tab-panel>
@@ -114,10 +203,36 @@
           style="{{tabPanelstyle}}"
         >
         </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>
+          <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>
             </view>
             <!-- <t-loading
               theme="circular"
@@ -126,38 +241,100 @@
               loading="{{loading }}"
             /> -->
             <view wx:if="{{loading}}" style="width: 100%; height: min-content">
-              <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton>
+              <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>
           </t-tab-panel>
-          <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
+          <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}}"
+              ></learn-resource>
 
-              <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
+              <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>
           </t-tab-panel>
-          <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}">
+          <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}}"
+                mockData="{{mockData}}"
+                bind:buyMock="buyMock"
+              ></test-resource>
             </view>
           </t-tab-panel>
-          <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}">
+          <t-tab-panel
+            label="浜戠瑪璁�"
+            icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}"
+            value="jsek_note"
+            style="{{tabPanelstyle}}"
+          >
             <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note>
           </t-tab-panel>
-          <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}">
-            <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books>
+          <t-tab-panel
+            label="鐩稿叧鍥句功"
+            icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}"
+            value="related_books"
+            style="{{tabPanelstyle}}"
+          >
+            <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">
+        <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" />
+              <t-image
+                src="/static/images/home/yangshuForm1.png"
+                mode="heightFix"
+                class="img"
+              />
               <view class="num" wx:if="{{num > 0}}">{{num}}</view>
             </view>
           </view>
@@ -166,37 +343,73 @@
     </view>
   </scroll-view>
   <!-- 鎴戣寤鸿寮圭獥 -->
-  <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
+  <suggest
+    class="suggest-component"
+    id="suggest-component"
+    bookIcon="{{bookDetail.icon}}"
+    bookName="{{bookDetail.name}}"
+  ></suggest>
   <!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
-  <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
+  <t-dialog
+    class="teachDownloadDialog"
+    visible="{{isShowTeachDownload}}"
+    title="鎻愮ず"
+    content="璇峰墠寰�PC绔笅杞�"
+    confirm-btn="{{ confirmBtn }}"
+    bind:confirm="closeTeachDownload"
+  />
   <!-- 璐拱鎸夐挳 -->
   <view class="box-bottom">
     <view class="bottom-btn" bind:tap="appplyElectronicBook">
       <view>
-        <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
+        <t-image
+          loading=""
+          src="/static/images/bookService/detail/ebook.png"
+        ></t-image>
       </view>
       <view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
     </view>
     <view class="bottom-btn" bind:tap="appplyPaperBook">
       <view>
-        <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
+        <t-image
+          src="/static/images/bookService/detail/paper-book.png"
+        ></t-image>
       </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}}"
+    >
       <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="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="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>
 </view>
 
 <!-- <view class="loading" wx:if="{{pageLoading}}">
   <t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view> -->
\ No newline at end of file
+</view> -->

--
Gitblit v1.9.1