From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/digitalCourses/index.wxml |  125 ++++++++++++++++++++++++++++-------------
 1 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/pages/digitalCourses/index.wxml b/pages/digitalCourses/index.wxml
index c8e87c7..e01e897 100644
--- a/pages/digitalCourses/index.wxml
+++ b/pages/digitalCourses/index.wxml
@@ -1,23 +1,49 @@
 <import src="index.skeleton.wxml" />
 <template is="skeleton" wx:if="{{loading}}" />
-<view wx:else="">
+<view wx:else>
   <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 class="back-icon">
+      <!-- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> -->
+      <image
+        src="/static/images/digitalTextbooks/chevron-left.png"
+        bind:tap="goBack"
+        mode="aspectFit"
+      />
     </view>
-    <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ヨ绋嬪悕绉�/ISBN/璇剧▼璐熻矗浜�" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" />
+    <t-search
+      model:value="{{searchValue}}"
+      shape="round"
+      placeholder="璇疯緭鍏ヨ绋嬪悕绉�/ISBN/璇剧▼璐熻矗浜�"
+      class="navBar-search"
+      style="width: 464rpx"
+      bind:submit="searchBook"
+    />
   </view>
   <view class="heardTab">
     <view class="tabBox">
-      <t-tabs defaultValue="{{active}}" bind:change="onTabsChange" t-class="custom-tabs">
-        <t-tab-panel wx:for="{{tabList}}" wx:key="index" wx:for-item="item" label="{{item.name}}" value="{{index}}">
+      <t-tabs
+        defaultValue="{{active}}"
+        bind:change="onTabsChange"
+        t-class="custom-tabs"
+      >
+        <t-tab-panel
+          wx:for="{{tabList}}"
+          wx:key="index"
+          wx:for-item="item"
+          label="{{item.name}}"
+          value="{{index}}"
+        >
         </t-tab-panel>
       </t-tabs>
     </view>
     <view class="dropdown">
       <t-dropdown-menu>
-        <t-dropdown-item options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" />
+        <t-dropdown-item
+          options="{{sorter.options}}"
+          default-value="{{sorter.value}}"
+          bindchange="onSort"
+        />
       </t-dropdown-menu>
     </view>
   </view>
@@ -25,43 +51,62 @@
     <view class="titleBox">
       <view class="frameBox"></view>
       <view class="titleTextBox">
-        <image src="/static/images/digitalCourses/zhuantitaolun@2x.png" mode="aspectFit" />
+        <image
+          src="/static/images/digitalCourses/zhuantitaolun@2x.png"
+          mode="aspectFit"
+        />
       </view>
     </view>
-    <scroll-view scroll-y="{{true}}" class="outsideContentBox" bindscrolltolower="onScrollToLower">
-      <view class="ExternalInformationBox">
-        <view class="informationBox" wx:for="{{courseList}}" wx:key="index" wx:for-item="item" data-item="{{item}}">
-          <view class="book-img" bind:tap="courseDetail" data-item="{{item}}">
-            <image src="{{item.icon}}" mode="aspectFit" />
+  </view>
+  <t-skeleton
+    theme="paragraph"
+    animation="gradient"
+    loading="{{contentLoading}}"
+    class="content-loading"
+    wx:if="{{contentLoading}}"
+  ></t-skeleton>
+  <scroll-view
+    scroll-y="{{true}}"
+    class="outsideContentBox"
+    bindscrolltolower="onScrollToLower"
+    wx:if="{{!contentLoading}}"
+  >
+    <view class="ExternalInformationBox">
+      <view
+        class="informationBox"
+        wx:for="{{courseList}}"
+        wx:key="index"
+        wx:for-item="item"
+        data-item="{{item}}"
+      >
+        <view class="book-img" bind:tap="courseDetail" data-item="{{item}}">
+          <image
+            src="{{item.icon ? item.icon : 'https://jsek.bnuic.com/home/image/courseIcon.png'}}"
+            mode="aspectFit"
+          />
+        </view>
+        <view class="book-Info">
+          <view class="book-name" bind:tap="courseDetail" data-item="{{item}}">
+            {{item.name}}
           </view>
-          <view class="book-Info">
-            <view class="book-name" bind:tap="courseDetail" data-item="{{item}}">
-              {{item.name}}
-            </view>
-            <view class="viewCount">
-              {{item.viewCount }}娆$偣鍑�
-            </view>
-            <view class="author">
-              <view>
-                {{ item.courseLeader}}
-              </view>
-              <view>
-                {{ item.classHours}}璇炬椂
-              </view>
-            </view>
-            <view class="money">
-              <view wx:if="{{item.price != 0}}">锟{item.price }}</view>
-              <view wx:else> 鍏嶈垂</view>
-              <view bind:tap="addCart" data-item="{{item}}">
-                <t-icon name="cart" size="16" />
-              </view>
+          <view class="viewCount"> {{item.viewCount }}娆$偣鍑� </view>
+          <view class="author">
+            <view class="courseLeader"> {{ item.courseLeader}} </view>
+            <view> {{ item.classHours}}璇炬椂 </view>
+          </view>
+          <view class="money">
+            <view wx:if="{{item.price != 0}}">锟{item.price }}</view>
+            <view wx:else> 鍏嶈垂</view>
+            <view bind:tap="addCart" data-item="{{item}}">
+              <t-icon name="cart" size="16" />
             </view>
           </view>
         </view>
       </view>
-      <view wx:if="{{courseList.length <= 0}}" class="noDataBox">
-        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
-      </view>
-    </scroll-view>
-  </view>
-</view>
\ No newline at end of file
+    </view>
+    <view wx:if="{{noData}}" class="noDataBox">
+      <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
+      <empty />
+    </view>
+  </scroll-view>
+</view>

--
Gitblit v1.9.1