From 3e778610752d6ad3fbb96da18d39d171866613e3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 12 四月 2024 17:40:36 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/home/home.wxml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 4170fe9..204d392 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll">
+ <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝ｅ湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" bind:scroll="onScroll" wx:if="{{!loading}}">
<view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px">
<text class="text">浜笀E璇�</text>
</view>
@@ -13,7 +13,14 @@
</t-search>
</view>
<view class="swiper-wrap">
- <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{navigation}}" height="380rpx" bind:click="navToActivityDetail" />
+ <!-- <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">
+ <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="widthFix" class="img" />
+ </view>
+ </swiper-item>
+ </swiper>
</view>
</view>
<view class="home-page-menu">
@@ -111,7 +118,7 @@
<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" />
+ <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>
@@ -205,4 +212,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