From 09905b43ec2a249ef0e6057d148b8620cfaa1506 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期二, 26 三月 2024 10:47:38 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/home/home.wxml | 360 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 180 insertions(+), 180 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index ddd3ef8..ff43634 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,206 +1,206 @@
<view class="container">
-<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
- <text class="text">浜笀E璇�</text>
-</view>
-<t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
-<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}}">
- <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="{{navigation}}" bind:click="navToActivityDetail" />
- </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 iconOne">
- <view class="icon">
- <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
+ <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+ <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
+ <text class="text">浜笀E璇�</text>
+ </view>
+ <view class="home-page-header">
+ <view class="bg">
+ <image src="/static/images/home/home-bg.png" mode="heightFix" class="image" />
</view>
- <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex">
- <text class="more">鏇村</text>
- <t-icon name="chevron-right" size="32rpx" color="#ff6d00" />
+ <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}}">
+ <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="{{navigation}}" bind:click="navToActivityDetail" />
</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" bindtap="goSubjectDetail" data-book="{{item}}">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFill" class="img" />
+ <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 iconOne">
+ <view class="icon">
+ <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" />
</view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
- <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</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}} {{item.position}}</text>
- <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
- <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
- </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>
- <view class="tabCardPublic iconTwo">
- <view class="icon">
- <image src="/static/images/home/jingxuankecheng2.png" mode="aspectFit" 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" data-book="{{item}}" bindtap="goCourseDetail">
- <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 class="classHours">{{item.classHours}}璇炬椂</text>
+ <view class="listBox">
+ <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox">
+ <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}">
+ <view class="specialSubject-img">
+ <image src="{{item.icon}}" mode="aspectFill" class="img" />
</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="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ <view class="body-info">
+ <view class="name">{{item.name}}</view>
+ <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view>
+ <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</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}} {{item.position}}</text>
+ <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text>
+ <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text>
+ </view>
</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/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 class="tabCardPublic iconTwo">
+ <view class="icon">
+ <image src="/static/images/home/jingxuankecheng2.png" mode="aspectFit" 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="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" />
- </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" bind:tap="goReadBookDetail" data-book="{{item}}">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ <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" data-book="{{item}}" bindtap="goCourseDetail">
+ <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 class="classHours">{{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="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ </view>
+ </view>
+ </view>
+ </view>
</view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <view class="author">{{item.author}}</view>
+ <view class="empyt" wx:else>
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
</view>
</view>
- </view>
- </view>
- <view class="tabCardPublic iconTwo">
- <view class="icon">
- <image src="/static/images/home/shuzijiaocai2.png" mode="aspectFit" 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" bind:tap="goTextBookDetail" data-book="{{item}}">
- <view class="specialSubject-img">
- <image src="{{item.icon}}" mode="aspectFit" class="img" />
+ <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 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="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" />
+ </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" />
+ </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" bind:tap="goReadBookDetail" 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>
- <view class="empyt" wx:else>
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" />
- </view>
- </view>
- <view class="tabCardPublic">
- <view class="icon">
- <image src="/static/images/home/paihangbang2.png" mode="" 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="aspectFit" class="img" wx:if="{{item.icon}}" />
- <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
- </view>
- <view class="body-info">
- <view class="name">{{item.name}}</view>
- <!-- <view class="author">{{item.author}}</view> -->
- </view>
+ <view class="tabCardPublic iconTwo">
+ <view class="icon">
+ <image src="/static/images/home/shuzijiaocai2.png" mode="aspectFit" 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>
- </scroll-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" bind:tap="goTextBookDetail" 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="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="aspectFit" 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="tabCardPublic">
+ <view class="icon">
+ <image src="/static/images/home/paihangbang2.png" mode="" 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="aspectFit" class="img" wx:if="{{item.icon}}" />
+ <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else />
+ </view>
+ <view class="body-info">
+ <view class="name">{{item.name}}</view>
+ <!-- <view class="author">{{item.author}}</view> -->
+ </view>
+ </view>
+ </view>
+ </scroll-view>
+ </view>
+ </view>
</view>
- </view>
-</view>
-</t-pull-down-refresh>
+ </t-pull-down-refresh>
</view>
\ No newline at end of file
--
Gitblit v1.9.1