From b8e3dc3c89fcc278ed8fe409c09fe938bdda0e23 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 26 九月 2024 11:31:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/study/index.wxml | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/pages/study/index.wxml b/pages/study/index.wxml
index fdd6118..ca85916 100644
--- a/pages/study/index.wxml
+++ b/pages/study/index.wxml
@@ -1,24 +1,24 @@
<view class="container">
- <view class="top-content">
+ <view class="top-content" wx:if="{{!skeletonLoding}}">
<view class="boxStyle">
<view class="box-item">
<view>绱瀛︿範鏃堕暱</view>
<view class="result"><text class="num">{{learningDuration}}</text></view>
</view>
<view class="box-item">
- <view>涓婁竴娆＄櫥闄嗘椂闂�</view>
+ <view>涓婁竴娆＄櫥褰曟椂闂�</view>
<view class="result">{{lastLoginTime}}</view>
</view>
</view>
</view>
- <view class="tabOne">
+ <view class="tabOne" wx:if="{{!skeletonLoding}}">
<t-tabs t-class="t-tabs" value="{{active}}" split="{{false}}" bind:change="tabClick">
- <t-tab-panel label="{{titleBook}}" value="0" class="{{active == '2' ? 'oneBorder' : ''}}" />
+ <t-tab-panel label="{{titleBook}}" value="0" />
<t-tab-panel label="{{titleCourse}}" value="1" />
<t-tab-panel label="{{titleTextBook}}" value="2" />
</t-tabs>
</view>
- <view class="pageInfo">
+ <view class="pageInfo" wx:if="{{!skeletonLoding}}">
<scroll-view class="scroll content" bind:scroll="onPageScroll" model:scroll-top="{{setScrollValue}}" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom">
<view slot="refresher" class="refresh-container">
<view class="loading">
@@ -26,11 +26,13 @@
</view>
</view>
<view class="list" wx:if="{{list.length > 0}}">
- <view wx:if="{{active == '0'}}" class="listBox">
+ <view class="listBox">
<view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
<view class="book-img" bind:tap="goBookDetails" data-book="{{item}}">
- <t-image src="{{item.product.icon}}" width="105" height="145" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" />
- <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" wx:else />
+ <t-image src="{{item.product.icon}}" width="{{active == '1' ? 150 : 105}}" height="{{active == '1' ? 90 : 145}}" aria-label="{{item.product.name}}" wx:if="{{item.product.icon}}" mode="aspectFit" />
+ <t-image src="https://jsek.bnuic.com/home/image/courseIcon.png" width="150" height="90" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '1'}}"/>
+ <t-image src="/static/images/default-book-img.png" width="105" height="145" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '0'}}"/>
+ <t-image src="https://jsek.bnuic.com/home/image/textBookIcon.png" width="105" height="145" aria-label="{{item.product.name}}" mode="aspectFit" wx:if="{{!item.product.icon && active == '2'}}"/>
</view>
<view class="body-info" data-book="{{item}}" bindtap="goBookDetails">
<view class="name">{{item.product.name}}</view>
@@ -38,18 +40,9 @@
</view>
</view>
</view>
- <!-- <view wx:if="{{activeName == 'Favoriteclass'}}">
- <view class="content-item" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index">
- <view class="item-con">
- <view class="titleBox">
- <view class="item-title">{{item.name}}</view>
- </view>
- </view>
- </view>
- </view> -->
</view>
<view wx:if="{{list.length == 0}}" class="empyt">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <empty />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
<t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
@@ -60,4 +53,7 @@
</scroll-view>
</view>
-</view>
\ No newline at end of file
+</view>
+
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{skeletonLoding}}" />
\ No newline at end of file
--
Gitblit v1.9.1