From 5109e97cb566608e443201204d07cbfc1c734e07 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 11 四月 2024 17:56:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packagePersonal/pages/activateProduct/index.wxml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/packagePersonal/pages/activateProduct/index.wxml b/packagePersonal/pages/activateProduct/index.wxml
index 3aab0ef..f1903b5 100644
--- a/packagePersonal/pages/activateProduct/index.wxml
+++ b/packagePersonal/pages/activateProduct/index.wxml
@@ -5,7 +5,7 @@
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <view class="pageInfo">
+ <view class="pageInfo" wx:if="{{!skeletonLoding}}">
<view class="activation">
<view class="title">
<view class="line"></view>
@@ -25,7 +25,7 @@
</view>
<view class="contentBox">
- <view class="list" wx:if="{{list.length > 0 && !skeletonLoding}}">
+ <view class="list" wx:if="{{list.length > 0}}">
<view class="content-item" wx:for="{{list}}" wx:for-item="items" wx:for-index="index" wx:key="index">
<view class="codeInfoBox">
<view>婵�娲荤爜锛歿{items.code}}</view>
@@ -53,7 +53,7 @@
</view>
</view>
</view>
- <view wx:if="{{list.length == 0 && !skeletonLoding}}" class="empyt">
+ <view wx:if="{{list.length == 0}}" class="empyt">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
<view class="bottom-loading" wx:if="{{bottomLoading}}">
@@ -62,11 +62,10 @@
<view class="bottom-loading" style="color: #ccc;font-size: 28rpx;" wx:if="{{isMoreData}}">
<text>娌℃湁鏇村浜�</text>
</view>
- <view class="body-loading" wx:if="{{skeletonLoding}}">
- <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" />
- </view>
</view>
</view>
</view>
</scroll-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