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
---
packageBookService/pages/bookServices/detail/index.wxml | 71 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 28 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 1e52a33..86bf948 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -1,4 +1,7 @@
<!--pages/bookServices/detail/index.wxml-->
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{pageLoading}}" />
+<!-- pageLoading -->
<!--瀵艰埅鍖哄煙 -->
<view class="page-bookService" wx:if="{{!pageLoading}}">
<view style="width: 100%; height: {{barHeight}}px; "></view>
@@ -27,7 +30,7 @@
<image
loading=""
src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
- mode="aspectFill"
+ mode="aspectFit"
aria-label="{{bookDetail.name}}"
/>
</view>
@@ -65,27 +68,25 @@
<view class="li-title">涓涗功鍚嶏細</view>
<view class="li-content">{{bookDetail.seriesName}}</view>
</view>
- <view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.author}}">浣滆�咃細</view>
+ <view class="message-li" wx:if="{{bookDetail.author}}">
+ <view class="li-title">浣滆�咃細</view>
<view class="li-content">{{bookDetail.author}}</view>
</view>
<view class="message-li" wx:if="{{bookDetail.isbn}}">
<view class="li-title">ISBN锛�</view>
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
- <view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
- >鍑虹増鏃堕棿锛�</view
- >
+ <view class="message-li" wx:if="{{bookDetail.publicationDate}}">
+ <view class="li-title">鍑虹増鏃堕棿锛�</view>
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
<view
class="message-li"
- wx:if="{{bookDetail.class}}"
+ wx:if="{{bookClass.length}}"
style="height: 80rpx"
>
<view class="li-title">鍥句功鍒嗙被锛�</view>
- <view class="class-name showTow">{{bookDetail.class}}</view>
+ <view class="class-name showTow">{{bookClass}}</view>
</view>
</view>
<image
@@ -157,8 +158,9 @@
</view>
</view>
</view>
- <movable-area class="movable-area">
- <view class="book-resource">
+
+ <view class="book-resource">
+ <movable-area class="movable-area">
<t-tabs
value="{{tabValue}}"
bind:change="onTabsChange"
@@ -220,12 +222,20 @@
wx:if="{{teach.length}}"
></tree>
</view>
- <t-loading
+ <!-- <t-loading
theme="circular"
size="60rpx"
class="loading"
loading="{{loading }}"
- />
+ /> -->
+ <view wx:if="{{loading}}" style="width: 100%; height: min-content">
+ <t-skeleton
+ row-col="{{rowCol}}"
+ theme="paragraph"
+ animation="gradient"
+ loading="{{loading}}"
+ ></t-skeleton>
+ </view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
@@ -300,20 +310,25 @@
></related-books>
</t-tab-panel>
</t-tabs>
- </view>
- <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all">
- <view class="applyBox" bindtap="goApply">
- <view class="box">
- <t-image
- src="/static/images/home/yangshuForm1.png"
- mode="heightFix"
- class="img"
- />
- <view class="num" wx:if="{{num > 0}}">{{num}}</view>
+ <movable-view
+ class="movable-view"
+ :x="{{x}}"
+ :y="{{y}}"
+ direction="all"
+ >
+ <view class="applyBox" bindtap="goApply">
+ <view class="box">
+ <t-image
+ src="/static/images/home/yangshuForm1.png"
+ mode="heightFix"
+ class="img"
+ />
+ <view class="num" wx:if="{{num > 0}}">{{num}}</view>
+ </view>
</view>
- </view>
- </movable-view>
- </movable-area>
+ </movable-view>
+ </movable-area>
+ </view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
<suggest
@@ -383,6 +398,6 @@
</view>
</view>
-<view class="loading" wx:if="{{pageLoading}}">
+<!-- <view class="loading" wx:if="{{pageLoading}}">
<t-loading loading="{{pageLoading}}" size="40"></t-loading>
-</view>
+</view> -->
--
Gitblit v1.9.1