From a86f495256ae7a0c2f2ca8427ffc4adfe08a948e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 07 九月 2024 15:45:57 +0800
Subject: [PATCH] bug

---
 packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxss |    1 +
 pages/digitalTextbooks/digitalTextbooksDetails/index.wxml                                |    6 ------
 pages/digitalTextbooks/digitalTextbooksDetails/index.wxss                                |    3 ---
 pages/digitalTextbooks/digitalTextbooksDetails/index.json                                |    1 -
 pages/bookExhibitionDetails/index.js                                                     |    7 +++++--
 services/home/home.js                                                                    |    1 -
 pages/bookExhibitionDetails/index.wxml                                                   |    6 ++----
 pages/bookExhibitionDetails/index.wxss                                                   |    4 ++--
 8 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxss b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxss
index 88206ab..0219df7 100644
--- a/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/learnResource/learnResource.wxss
@@ -18,6 +18,7 @@
   padding: 0;
   display: flex;
   align-items: center;
+  margin: 0;
 }
 
 .btn-content {
diff --git a/pages/bookExhibitionDetails/index.js b/pages/bookExhibitionDetails/index.js
index a8e7b80..11f9121 100644
--- a/pages/bookExhibitionDetails/index.js
+++ b/pages/bookExhibitionDetails/index.js
@@ -54,9 +54,10 @@
         }
       })
 
+    } else {
+      this.bookExhibitionGet(this.data.passId)
+      this.getBookExhibitionDetails()
     }
-    this.bookExhibitionGet(this.data.passId)
-    this.getBookExhibitionDetails()
     wx.setNavigationBarTitle({
       title: this.data.subtitleName
     });
@@ -164,6 +165,8 @@
       this.setData({
         bookExhibitionList: res.datas,
         totalSize: res.total,
+        loading: false,
+        hidden: false,
       })
     })
   },
diff --git a/pages/bookExhibitionDetails/index.wxml b/pages/bookExhibitionDetails/index.wxml
index ec3a5f7..e5accdf 100644
--- a/pages/bookExhibitionDetails/index.wxml
+++ b/pages/bookExhibitionDetails/index.wxml
@@ -1,9 +1,9 @@
 <!--pages/bookExhibitionDetails/index.wxml-->
 <import src="index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading && hidden}}" />
+<template is="skeleton" wx:if="{{loading}}" />
 
 
-<view hidden="{{!hidden && !loading}}" class="centerBox">
+<view wx:if="{{!loading}}" class="centerBox">
   <!-- <view class="tltiBox">
     <view style="width: 100%; height: {{barHeight}}px; "></view>
     <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;">
@@ -17,8 +17,6 @@
   </view> -->
 
   <view class="outsideHeadBox">
-
-
     <view class="headBox">
       <view class="titleBox">{{bookName}}</view>
       <view class="informationBox">
diff --git a/pages/bookExhibitionDetails/index.wxss b/pages/bookExhibitionDetails/index.wxss
index d84885e..b46eda0 100644
--- a/pages/bookExhibitionDetails/index.wxss
+++ b/pages/bookExhibitionDetails/index.wxss
@@ -138,12 +138,12 @@
 
 .centerBox {
   position: relative;
+  width: 100%;
+  height: 100vh;
 }
 
 .outsideHeadBox {
   margin-top: 20rpx;
-  margin-bottom: env(safe-area-inset-bottom);
-
 }
 
 .bottom-box {
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.json b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
index a12057b..9f8e188 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.json
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.json
@@ -5,7 +5,6 @@
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "t-image": "tdesign-miniprogram/image/image",
     "t-toast": "tdesign-miniprogram/toast/toast",
-    "t-empty": "tdesign-miniprogram/empty/empty",
     "t-button": "tdesign-miniprogram/button/button",
     "suggest": "/packageBookService/pages/bookServices/detail/components/suggest/suggest",
     "t-input": "tdesign-miniprogram/input/input",
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
index 78e1c2f..95b0b7d 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxml
@@ -97,7 +97,6 @@
             icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}"
             value="brief"
             label="鍩烘湰淇℃伅"
-            style="{{tabPanelstyle}}"
           >
             <view class="rubricBox">
               <view class="rubricimgBox">
@@ -112,7 +111,6 @@
               <rich-text nodes="{{digitalsData.content}}"></rich-text>
             </view>
             <view class="noDataBox" wx:else>
-              <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
               <empty />
             </view>
           </t-tab-panel>
@@ -120,7 +118,6 @@
             icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}"
             value="jsek_cloudLearning"
             label="璇佷功淇℃伅"
-            style="{{tabPanelstyle}}"
           >
             <view class="rubricBox">
               <view class="rubricimgBox">
@@ -150,7 +147,6 @@
             icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}"
             value="jsek_teachingResources"
             label="浣滆�呬俊鎭�"
-            style="{{tabPanelstyle}}"
           >
             <view class="rubricBox">
               <view class="rubricimgBox">
@@ -178,7 +174,6 @@
             icon="{{tabValue == 'catalogue' ? catalogueClickIcon : catalogue}}"
             value="catalogue"
             label="鐩綍"
-            style="{{tabPanelstyle}}"
           >
             <view class="rubricBox">
               <view class="rubricimgBox">
@@ -201,7 +196,6 @@
             icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}"
             value="questionBank"
             label="鐩稿叧鏁欐潗"
-            style="{{tabPanelstyle}}"
           >
             <view class="rubricBox">
               <view class="rubricimgBox">
diff --git a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
index 9b35f1c..f2c2bc4 100644
--- a/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
+++ b/pages/digitalTextbooks/digitalTextbooksDetails/index.wxss
@@ -362,9 +362,6 @@
   margin-right: 50rpx;
 }
 
-
-.noData {}
-
 .collection {
   width: 175rpx;
   display: flex;
diff --git a/services/home/home.js b/services/home/home.js
index a9919ea..bf3c094 100644
--- a/services/home/home.js
+++ b/services/home/home.js
@@ -29,7 +29,6 @@
           key: 3,
           icon: '/static/images/home/shuzijiaocai@2x.png',
           url: '/pages/digitalTextbooks/index',
-          // url: ''
         },
         {
           text: '涓撻娲诲姩',

--
Gitblit v1.9.1