From 4bc1c36faeec2f90e5acfa836732e49fe0b245e9 Mon Sep 17 00:00:00 2001 From: yiming <m13691596795@163.com> Date: 星期五, 12 四月 2024 20:47:03 +0800 Subject: [PATCH] 云学习11 --- packageBookService/pages/bookServices/detail/index.wxml | 65 +++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 22 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml index e48ce1d..d04e4cc 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> @@ -15,7 +18,7 @@ <view class="book-detail" id="book-detail"> <view class="detail-left"> <view class="book-img"> - <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFill" aria-label="{{bookDetail.name}}" /> + <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" /> </view> <view class="book-use"> <view class="collect" bind:tap="setCollect"> @@ -40,21 +43,21 @@ <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}}" style="height: 80rpx"> + <view class="message-li" 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 src="/static/images/bookService/detail/square.png" class="right-background" /> @@ -94,8 +97,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" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class"> <t-tab-panel label="鍥句功绠�浠�" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}"> <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief> @@ -113,9 +117,26 @@ <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}"> <view wx:if="{{!loading && teach.length && !noResources && applyState}}"> <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource> - <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree> + <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree> </view> - <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading }}" /> + <!-- <t-loading + theme="circular" + size="60rpx" + class="loading" + loading="{{loading }}" + /> --> + <view wx:if="{{loading}}" style="width: 100%; height: min-content"> +<<<<<<< Updated upstream + <t-skeleton + row-col="{{rowCol}}" + theme="paragraph" + animation="gradient" + loading="{{loading}}" + ></t-skeleton> +======= + <t-skeleton row-col="{{[1,1,2,1,1,2]}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton> +>>>>>>> Stashed changes + </view> <view wx:if="{{noResources}}" class="noData"> <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> </view> @@ -142,16 +163,16 @@ <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></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 class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest> @@ -185,6 +206,6 @@ </view> </view> -<view class="loading" wx:if="{{pageLoading}}"> +<!-- <view class="loading" wx:if="{{pageLoading}}"> <t-loading loading="{{pageLoading}}" size="40"></t-loading> -</view> \ No newline at end of file +</view> --> \ No newline at end of file -- Gitblit v1.9.1