From 4a6d2d8ad47076d500eeac486445e5983dbbfecf Mon Sep 17 00:00:00 2001
From: wanpan <wanpan96@163.com>
Date: Sun, 17 Jul 2022 00:52:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(loading):=20=E4=BF=AE=E5=A4=8Dtext?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E5=AE=9E=E9=99=85=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=8E=E8=A7=86=E8=A7=89=E5=A4=A7=E5=B0=8F=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #618
---
 src/loading/loading.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml
index 527ef84f3..e526314f9 100644
--- a/src/loading/loading.wxml
+++ b/src/loading/loading.wxml
@@ -33,7 +33,7 @@
         ></view>
       </block>
     </view>
-    <view class="{{prefix}}-class-text">
+    <view class="{{prefix}}-class-text" wx:if="{{text}}">
       <view wx:if="{{theme === 'error'}}">
         <span>加载失败</span>
         <span class="{{classPrefix}}__refresh-btn" bind:tap="refreshPage">刷新</span>

From 7495d62f91d5086de3ca3658249bc6fb28ee4cd9 Mon Sep 17 00:00:00 2001
From: wanpan <wanpan96@163.com>
Date: Sun, 17 Jul 2022 14:09:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#618
---
 src/loading/loading.wxml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml
index e526314f9..9ad8fbfc7 100644
--- a/src/loading/loading.wxml
+++ b/src/loading/loading.wxml
@@ -33,12 +33,12 @@
         ></view>
       </block>
     </view>
-    <view class="{{prefix}}-class-text" wx:if="{{text}}">
+    <view class="{{prefix}}-class-text">
       <view wx:if="{{theme === 'error'}}">
         <span>加载失败</span>
         <span class="{{classPrefix}}__refresh-btn" bind:tap="refreshPage">刷新</span>
       </view>
-      <view class="{{classPrefix}}__text" wx:else>
+      <view class="{{classPrefix}}__text" wx:if="{{text}}">
         {{text}}
         <slot name="text" />
       </view>

From e888cf00b4a449ad8306dbfbb4d398ca30a81d27 Mon Sep 17 00:00:00 2001
From: wanpan <wanpan96@163.com>
Date: Mon, 18 Jul 2022 14:15:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(loading):=20fix(loading):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#618
---
 src/loading/loading.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml
index 9ad8fbfc7..8ba0baa67 100644
--- a/src/loading/loading.wxml
+++ b/src/loading/loading.wxml
@@ -39,7 +39,7 @@
         <span class="{{classPrefix}}__refresh-btn" bind:tap="refreshPage">刷新</span>
       </view>
       <view class="{{classPrefix}}__text" wx:if="{{text}}">
-        {{text}}
+        <view wx:if="{{text !== 'slot'}}"> {{text}} </view>
         <slot name="text" />
       </view>
     </view>

From 4970951f285e335dd364402c09822356b21b93be Mon Sep 17 00:00:00 2001
From: wanpan <wanpan96@163.com>
Date: Mon, 18 Jul 2022 14:18:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(loading):=20fix(loading):=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=86=85=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#618
---
 src/loading/loading.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml
index 8ba0baa67..e998f4e21 100644
--- a/src/loading/loading.wxml
+++ b/src/loading/loading.wxml
@@ -39,7 +39,7 @@
         <span class="{{classPrefix}}__refresh-btn" bind:tap="refreshPage">刷新</span>
       </view>
       <view class="{{classPrefix}}__text" wx:if="{{text}}">
-        <view wx:if="{{text !== 'slot'}}"> {{text}} </view>
+        <text wx:if="{{text !== 'slot'}}"> {{text}} </text>
         <slot name="text" />
       </view>
     </view>