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/myOrder/index.wxml | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/packagePersonal/pages/myOrder/index.wxml b/packagePersonal/pages/myOrder/index.wxml
index fa854fd..61fed49 100644
--- a/packagePersonal/pages/myOrder/index.wxml
+++ b/packagePersonal/pages/myOrder/index.wxml
@@ -1,5 +1,5 @@
<view class="container">
- <view class="page-header">
+ <view class="page-header" wx:if="{{!skeletonLoding}}">
<view class="search">
<t-search model:value="{{searchText}}" shape="round" clearable="{{false}}" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" class="navBar-search" style="width: 90%" bind:submit="onSearchOrder" />
</view>
@@ -7,14 +7,14 @@
<t-tab-panel wx:for="{{tabList}}" wx:for-index="index" wx:key="index" label="{{item.label}}" value="{{index}}" />
</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">
<t-loading theme="circular" size="40rpx" text="姝ｅ湪鍒锋柊..." class="wrapper" />
</view>
</view>
- <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="order-cent">
<text class="order-cent-one">璁㈠崟鍙�: {{items.orderNumber}}</text>
@@ -58,7 +58,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}}">
@@ -67,10 +67,9 @@
<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>
</scroll-view>
</view>
</view>
-<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
\ No newline at end of file
+<t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top>
+<import src="index.skeleton.wxml" />
+<template is="skeleton" wx:if="{{skeletonLoding}}" />
\ No newline at end of file
--
Gitblit v1.9.1