From 266c7278841d2cbae5e9ab969ffd2efae1d0dda5 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 06 九月 2024 10:08:55 +0800
Subject: [PATCH] renwu

---
 pages/home/home.wxml |   94 ++++++++++++++++++++++++----------------------
 1 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 61a1f7a..ab41099 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,29 +1,27 @@
 <view class="container">
-  <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+  <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" wx:if="{{!loading}}" bind:scroll="onScroll">
     <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
-      <text class="text">浜笀E璇�</text>
+      <text class="text">浜笀鏅烘暀</text>
     </view>
     <view class="home-page-header">
       <view class="bg">
         <image src="/static/images/home/home-bg.png" mode="heightFix" class="image" />
       </view>
       <view class="search">
-        <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}">
+        <image class="icon" src="/static/images/home/nav_icon_scan.png" bindtap="onIconScanTap" />
+        <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}">
           <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}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{ { type: 'dots' } }}" height="380rpx" bind:click="navToActivityDetail" /> -->
-        <swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper" wx:if="{{bannerList.length > 0}}">
+        <swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper">
           <swiper-item wx:for="{{bannerList}}" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="navToActivityDetail">
             <view class="swiperItem">
-              <image src="{{item.value}}" mode="aspectFill" class="img" />
+              <image src="{{item.value}}" mode="widthFix" class="img" />
             </view>
           </swiper-item>
         </swiper>
-        <view class="body-loading" wx:else="">
-          <t-loading theme="circular" size="40rpx" class="wrapper" />
-        </view>
       </view>
     </view>
     <view class="home-page-menu">
@@ -37,7 +35,7 @@
           <view class="icon">
             <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
           </view>
-          <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
+          <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center">
             <text class="more">鏇村</text>
             <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
           </view>
@@ -60,6 +58,39 @@
                 </view>
               </view>
             </view>
+          </view>
+        </view>
+        <view class="tabCardPublic iconTwo">
+          <view class="icon">
+            <image src="/static/images/home/tushufuwu2.png" mode="aspectFit" 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}}" position="{{'home'}}" 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 ? item.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" class="img" aria-label="{{item.name}}" />
+                </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" /> -->
+            <empty />
           </view>
         </view>
         <view class="tabCardPublic iconTwo">
@@ -99,41 +130,11 @@
             </view>
           </view>
           <view class="empyt" wx:else>
-            <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+            <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
+            <empty />
           </view>
         </view>
-        <view class="tabCardPublic iconTwo">
-          <view class="icon">
-            <image src="/static/images/home/tushufuwu2.png" mode="aspectFit" 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}}" position="{{'home'}}" 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="aspectFit" 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 iconTwo">
           <view class="icon">
             <image src="/static/images/home/shuziyuedu2.png" mode="aspectFit" class="iconImage" />
@@ -186,7 +187,8 @@
             </view>
           </view>
           <view class="empyt" wx:else>
-            <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
+            <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> -->
+            <empty />
           </view>
         </view>
         <view class="tabCardPublic">
@@ -195,7 +197,7 @@
           </view>
         </view>
         <view class="rankingList">
-          <scroll-view class="srcolbox" scroll-x scroll-with-animation='true'>
+          <scroll-view class="srcolbox" scroll-x scroll-with-animation="true">
             <view class="booksListBox">
               <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}}">
@@ -215,4 +217,6 @@
       </view>
     </view>
   </t-pull-down-refresh>
-</view>
\ No newline at end of file
+</view>
+<import src="home.skeleton.wxml" />
+<template is="skeleton" wx:if="{{loading}}" />
\ No newline at end of file

--
Gitblit v1.9.1