From e03417edfeaf52c017e4a5539f3b41ad0204a2f0 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 05 三月 2024 19:03:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/jsek-applet

---
 pages/home/home.wxml |   59 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index f9b7583..d96f714 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,7 +1,13 @@
 <view style="text-align: center; color: #b9b9b9" wx:if="{{pageLoading}}">
   <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." inherit-color />
 </view>
+<view class="background {{ isWhite ? 'white':''}}">
+  <text class="text">浜笀E璇�</text>
+</view>
 <view class="home-page-header">
+  <view class="bg">
+    <image src="/static/images/home/home-bg@2x.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="">
       <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="navToSearchPage" />
@@ -22,13 +28,13 @@
       <view class="icon">
         <t-image src="/static/images/home/zhuantitaolun.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
+      <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" bindtap="toList" data-info="{{item}}" class="listItemBox">
+      <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" />
@@ -51,7 +57,7 @@
       <view class="icon">
         <t-image src="/static/images/home/jingxuankecheng@2x.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
+      <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex">
         <text class="more">鏇村</text>
         <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
       </view>
@@ -63,7 +69,7 @@
     </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" bindtap="toList" data-info="{{item}}" class="listItemBox">
+        <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" />
@@ -77,7 +83,7 @@
               <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" />
+                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
               </view>
             </view>
           </view>
@@ -91,7 +97,7 @@
       <view class="icon">
         <t-image src="/static/images/home/tushufuwu@2x.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
+      <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex">
         <text class="more">鏇村</text>
         <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
       </view>
@@ -103,8 +109,8 @@
     </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" bindtap="toList" data-info="{{item}}" class="booksListItemBox">
-          <view class="listItem">
+        <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>
@@ -123,13 +129,13 @@
       <view class="icon">
         <t-image src="/static/images/home/shuziyuedu1@2x.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
+      <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" bindtap="toList" data-info="{{item}}" class="booksListItemBox">
+      <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" />
@@ -145,14 +151,14 @@
       <view class="icon">
         <t-image src="/static/images/home/shuzijiaocai1@2x.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
+      <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}}" class="listBox3">
-        <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" class="textbooksItemBox">
+        <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" />
@@ -164,7 +170,7 @@
               <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" />
+                <image src="/static/images/home/home-cart.png" mode="aspectFill" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
               </view>
             </view>
           </view>
@@ -178,23 +184,22 @@
       <view class="icon">
         <t-image src="/static/images/home/paihangbang@2x.png" mode="heightFix" class="iconImage" />
       </view>
-      <view bindtap="onMoreGuide" class="flex">
-        <text class="more">鏇村</text>
-        <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
-      </view>
     </view>
-    <view class="listBox2 rankingList flex">
-      <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" bindtap="toList" data-info="{{item}}" 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 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>
     </view>
   </view>
   <load-more list-is-empty="{{!goodsList.length}}" status="{{goodsListLoadStatus}}" bind:retry="onReTry" />

--
Gitblit v1.9.1