From dd8ef90009ff67a7379b50e2861f917579f0f855 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 18 三月 2024 15:07:52 +0800
Subject: [PATCH] jiaoshi

---
 pages/home/home.wxml |  299 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 150 insertions(+), 149 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 21fbf69..d1cf891 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -13,104 +13,126 @@
       <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
     </t-search>
   </view>
-  <view class="swiper-wrap">
-    <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" current="{{current}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" bind:click="navToActivityDetail" />
+  <view class="home-page-menu">
+    <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
+      <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
+    </t-grid>
   </view>
-</view>
-<view class="home-page-menu">
-  <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}">
-    <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" />
-  </t-grid>
-</view>
-<view class="home-page-container">
-  <view class="home-page-list">
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/zhuantitaolun.png" mode="heightFix" class="iconImage" />
-      </view>
-      <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
-      </view>
-    </view>
-    <view class="listBox">
-      <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
-        <view class="listItem">
-          <view class="specialSubject-img">
-            <image src="{{item.icon}}" mode="aspectFill" class="img" />
-          </view>
-          <view class="body-info">
-            <view class="name">{{item.name}}</view>
-            <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛�<text>{{item.liveTime}}</text></view>
-            <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細<text>{{ item.startTime }}</text></view>
-            <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
-            <view class="flex jc-sb">
-              <text class="author">{{item.lecturer}}</text>
-              <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
-              <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
-            </view>
-          </view>
+  <view class="home-page-container">
+    <view class="home-page-list">
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/zhuantitaolun.png" mode="heightFix" class="iconImage" />
+        </view>
+        <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
+          <text class="more">鏇村</text>
+          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
         </view>
       </view>
-    </view>
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/jingxuankecheng@2x.png" mode="heightFix" class="iconImage" />
-      </view>
-      <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
-      </view>
-    </view>
-    <view class="home-page-tabs">
-      <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
-        <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
-      </t-tabs>
-    </view>
-    <view class="listBox1">
-      <view wx:if="{{courseList.length>0}}">
-        <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
-          <view class="listItem flex">
+      <view class="listBox">
+        <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
+          <view class="listItem">
             <view class="specialSubject-img">
               <image src="{{item.icon}}" mode="aspectFill" class="img" />
             </view>
             <view class="body-info">
               <view class="name">{{item.name}}</view>
+              <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛�<text>{{item.liveTime}}</text></view>
+              <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細<text>{{ item.startTime }}</text></view>
+              <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view>
               <view class="flex jc-sb">
-                <text class="author">{{item.courseLeader}}</text>
-                <text>{{item.classHours}}璇炬椂</text>
-              </view>
-              <view class="priceBox flex jc-sb">
+                <text class="author">{{item.lecturer}}</text>
                 <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
                 <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
-                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
               </view>
             </view>
           </view>
         </view>
       </view>
-      <view class="empyt" wx:else>
-        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/jingxuankecheng@2x.png" mode="heightFix" class="iconImage" />
+        </view>
+        <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
+          <text class="more">鏇村</text>
+          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
+        </view>
       </view>
-    </view>
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/tushufuwu@2x.png" mode="heightFix" class="iconImage" />
+      <view class="home-page-tabs">
+        <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle">
+          <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+        </t-tabs>
       </view>
-      <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
+      <view class="listBox1">
+        <view wx:if="{{courseList.length>0}}">
+          <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
+            <view class="listItem flex">
+              <view class="specialSubject-img">
+                <image src="{{item.icon}}" mode="aspectFill" class="img" />
+              </view>
+              <view class="body-info">
+                <view class="name">{{item.name}}</view>
+                <view class="flex jc-sb">
+                  <text class="author">{{item.courseLeader}}</text>
+                  <text>{{item.classHours}}璇炬椂</text>
+                </view>
+                <view class="priceBox flex jc-sb">
+                  <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
+                  <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+                  <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="empyt" wx:else>
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+        </view>
       </view>
-    </view>
-    <view class="home-page-tabs">
-      <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
-        <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
-      </t-tabs>
-    </view>
-    <view class="listBox2">
-      <view wx:if="{{booksList.length > 0}}" class="flex">
-        <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
-          <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/tushufuwu@2x.png" mode="heightFix" class="iconImage" />
+        </view>
+        <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
+          <text class="more">鏇村</text>
+          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
+        </view>
+      </view>
+      <view class="home-page-tabs">
+        <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick">
+          <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" />
+        </t-tabs>
+      </view>
+      <view class="listBox2">
+        <view wx:if="{{booksList.length > 0}}" class="flex">
+          <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+            <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
+              <view class="specialSubject-img">
+                <image src="{{item.icon}}" mode="aspectFill" class="img" />
+              </view>
+              <view class="body-info">
+                <view class="name">{{item.name}}</view>
+                <view class="author">{{item.author}}</view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="empyt" wx:else>
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+        </view>
+      </view>
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/shuziyuedu1@2x.png" mode="heightFix" class="iconImage" />
+        </view>
+        <view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
+          <text class="more">鏇村</text>
+          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
+        </view>
+      </view>
+      <view class="listBox2 flex">
+        <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+          <view class="listItem">
             <view class="specialSubject-img">
               <image src="{{item.icon}}" mode="aspectFill" class="img" />
             </view>
@@ -121,86 +143,65 @@
           </view>
         </view>
       </view>
-      <view class="empyt" wx:else>
-        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
-      </view>
-    </view>
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/shuziyuedu1@2x.png" mode="heightFix" class="iconImage" />
-      </view>
-      <view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
-      </view>
-    </view>
-    <view class="listBox2 flex">
-      <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
-        <view class="listItem">
-          <view class="specialSubject-img">
-            <image src="{{item.icon}}" mode="aspectFill" class="img" />
-          </view>
-          <view class="body-info">
-            <view class="name">{{item.name}}</view>
-            <view class="author">{{item.author}}</view>
-          </view>
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/shuzijiaocai1@2x.png" mode="heightFix" class="iconImage" />
+        </view>
+        <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
+          <text class="more">鏇村</text>
+          <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
         </view>
       </view>
-    </view>
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/shuzijiaocai1@2x.png" mode="heightFix" class="iconImage" />
-      </view>
-      <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
-      </view>
-    </view>
-    <view class="listBox3">
-      <view wx:if="{{textbookList.length > 0}}">
-        <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
-          <view class="listItem flex">
-            <view class="specialSubject-img">
-              <image src="{{item.icon}}" mode="aspectFill" class="img" />
-            </view>
-            <view class="body-info">
-              <view class="name">{{item.name}}</view>
-              <view class="introduction">{{item.description}}</view>
-              <view class="author">{{item.author}}</view>
-              <view class="priceBox flex jc-sb">
-                <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
-                <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
-                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+      <view class="listBox3">
+        <view wx:if="{{textbookList.length > 0}}">
+          <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox">
+            <view class="listItem flex">
+              <view class="specialSubject-img">
+                <image src="{{item.icon}}" mode="aspectFill" class="img" />
+              </view>
+              <view class="body-info">
+                <view class="name">{{item.name}}</view>
+                <view class="introduction">{{item.description}}</view>
+                <view class="author">{{item.author}}</view>
+                <view class="priceBox flex jc-sb">
+                  <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
+                  <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+                  <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+                </view>
               </view>
             </view>
           </view>
         </view>
+        <view class="empyt" wx:else>
+          <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+        </view>
       </view>
-      <view class="empyt" wx:else>
-        <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+      <view class="tabCardPublic">
+        <view class="icon">
+          <t-image src="/static/images/home/paihangbang@2x.png" mode="heightFix" class="iconImage" />
+        </view>
       </view>
-    </view>
-    <view class="tabCardPublic">
-      <view class="icon">
-        <t-image src="/static/images/home/paihangbang@2x.png" mode="heightFix" class="iconImage" />
-      </view>
-    </view>
-    <view class="rankingList">
-      <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
-        <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
-          <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
-            <view class="specialSubject-img">
-              <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
-              <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else />
-            </view>
-            <view class="body-info">
-              <view class="name">{{item.name}}</view>
-              <view class="author">{{item.author}}</view>
+      <view class="rankingList">
+        <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
+          <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox">
+            <view class="listItem" bind:tap="goDetail" data-book="{{item}}">
+              <view class="specialSubject-img">
+                <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" />
+                <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else />
+              </view>
+              <view class="body-info">
+                <view class="name">{{item.name}}</view>
+                <!-- <view class="author">{{item.author}}</view> -->
+              </view>
             </view>
           </view>
-        </view>
-      </scroll-view>
+        </scroll-view>
+      </view>
     </view>
+    <load-more list-is-empty="{{!goodsList.length}}" status="{{goodsListLoadStatus}}" bind:retry="onReTry" />
+    <t-toast id="t-toast" />
   </view>
-  <t-toast id="t-toast" />
+  <<<<<<< Updated upstream <t-toast id="t-toast" />
+  =======
+  >>>>>>> Stashed changes
 </view>
\ No newline at end of file

--
Gitblit v1.9.1