From b1be73e000f9f07e90bbaacd38b4ef5315614367 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 8 Apr 2023 14:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=90=E7=A4=BA=E5=8F=8A?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/no-data/no-data.vue                | 37 +++++++++++++++++--
 pages/goods-detail/goods-detail.vue           | 16 +++++---
 pages/logout/logout.vue                       |  2 +-
 pages/personal/personal.vue                   |  2 +-
 pages/plugins/realstore/detail/detail.css     |  5 +--
 .../wallet/payment-code/payment-code.vue      |  2 +-
 pages/user-address-save/user-address-save.vue |  2 +-
 pages/user-address/user-address.vue           |  6 +--
 8 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue
index 3da697be..a345d9cc 100644
--- a/components/no-data/no-data.vue
+++ b/components/no-data/no-data.vue
@@ -1,16 +1,16 @@
 <template>
     <view>
         <!-- 1 加载中 -->
-        <view v-if="propStatus == 1" class="no-data-box no-data-loading">
-            <text>加载中...</text>
+        <view v-if="propStatus == 1" class="no-data-box no-data-loading loading-animation">
+            <text>{{title}}</text>
         </view>
-        
+
         <!-- 2 处理错误 -->
         <view v-else-if="propStatus == 2" class="no-data-box">
             <image :src="static_dir+'error.png'" mode="widthFix"></image>
             <view class="no-data-tips">{{propMsg || '处理错误'}}</view>
         </view>
-        
+
         <!-- 0 默认没有数据 -->
         <view v-else-if="propStatus == 0" class="no-data-box">
             <image :src="static_dir+'empty.png'" mode="widthFix"></image>
@@ -24,6 +24,7 @@
         data() {
             return {
                 static_dir: '/static/images/common/',
+                title: app.globalData.get_application_title(),
             };
         },
         components: {},
@@ -55,5 +56,33 @@
     }
     .no-data-loading text {
         color: #999;
+    }
+    .loading-animation {
+        background: #e7e7e7 -webkit-linear-gradient(left,#c6c6c6 0%, #c6c6c6 90%) no-repeat 0 0;
+        background-size: 20% 100%; 
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+        font-size: 80rpx;
+        font-weight: bold;
+    }
+    .loading-animation {
+        -webkit-animation: loading-animation 2s linear infinite;
+        animation: loading-animation 2s linear infinite;
+    }
+    @-webkit-keyframes loading-animation {
+        0% {
+            background-position: 0 0;
+        }
+        100% {
+            background-position: 100% 100%;
+        }
+    }
+    @keyframes loading-animation {
+        0% {
+            background-position: 0 0;
+        }
+        100% {
+            background-position: 100% 100%;
+        }
     }
 </style>
\ No newline at end of file
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index eaaac337..e7343b8a 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -812,9 +812,11 @@
 
             // 获取数据
             init() {
-                uni.showLoading({
-                    title: '加载中...'
-                });
+                if(this.load_status == 0) {
+                    uni.showLoading({
+                        title: '加载中...'
+                    });
+                }
                 this.setData({
                     data_list_loding_status: 1
                 });
@@ -825,7 +827,9 @@
                     dataType: 'json',
                     success: res => {
                         uni.stopPullDownRefresh();
-                        uni.hideLoading();
+                        if(this.load_status == 0) {
+                            uni.hideLoading();
+                        }
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             var goods = data.goods;
@@ -911,7 +915,9 @@
                     },
                     fail: () => {
                         uni.stopPullDownRefresh();
-                        uni.hideLoading();
+                        if(this.load_status == 0) {
+                            uni.hideLoading();
+                        }
                         this.setData({
                             data_bottom_line_status: false,
                             data_list_loding_status: 2,
diff --git a/pages/logout/logout.vue b/pages/logout/logout.vue
index 692ad5fc..e4a09531 100644
--- a/pages/logout/logout.vue
+++ b/pages/logout/logout.vue
@@ -82,7 +82,7 @@
                         } else {
                             this.setData({
                                 data_list_loding_status: 0,
-                                data_list_loding_msg: res.msg
+                                data_list_loding_msg: res.data.msg
                             });
                         }
                     },
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index ebd5b917..89e86781 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -143,7 +143,7 @@
                         } else {
                             this.setData({
                                 data_list_loding_status: 0,
-                                data_list_loding_msg: res.msg
+                                data_list_loding_msg: res.data.msg
                             });
                         }
                     },
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index 0b6dd445..6b9f1694 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -223,12 +223,11 @@
     z-index: 5;
 }
 .cart-content {
-    left: auto;
-    bottom: 130rpx;
+    left: 20rpx;
+    bottom: calc(130rpx + env(safe-area-inset-bottom));
     width: calc(100% - 40rpx);
     z-index: 6;
     max-width: calc(800px - 40rpx);
-    margin-left: 20rpx;
 }
 .cart-content .cart-list {
     max-height: 60vh;
diff --git a/pages/plugins/wallet/payment-code/payment-code.vue b/pages/plugins/wallet/payment-code/payment-code.vue
index 49fcc88c..37aab9eb 100644
--- a/pages/plugins/wallet/payment-code/payment-code.vue
+++ b/pages/plugins/wallet/payment-code/payment-code.vue
@@ -182,7 +182,7 @@
                         } else {
                             this.setData({
                                 data_list_loding_status: 0,
-                                data_list_loding_msg: res.msg,
+                                data_list_loding_msg: res.data.msg,
                                 is_to_login: 0
                             });
                         }
diff --git a/pages/user-address-save/user-address-save.vue b/pages/user-address-save/user-address-save.vue
index 6654770c..db9ff1db 100644
--- a/pages/user-address-save/user-address-save.vue
+++ b/pages/user-address-save/user-address-save.vue
@@ -102,7 +102,7 @@
 
                 <view class="bottom-fixed padding-main">
 					<view class="bottom-line-exclude oh">
-						<button class="bg-main br-main cr-white round text-size" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
+						<button class="bg-main br-main cr-white round text-size-sm" type="default" form-type="submit" hover-class="none" :disabled="form_submit_disabled_status">保存</button>
 					</view>
                 </view>
             </view>
diff --git a/pages/user-address/user-address.vue b/pages/user-address/user-address.vue
index fb2723f3..fd994780 100644
--- a/pages/user-address/user-address.vue
+++ b/pages/user-address/user-address.vue
@@ -44,12 +44,12 @@
 			<view class="bottom-line-exclude oh">
 				<block v-if="common_user_address_platform_import_list.length > 0 && common_user_address_platform_import_list.indexOf(client_value) != -1">
 					<view class="submit-list">
-						<button class="bg-main br-main cr-white round text-size dis-inline-block fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
-						<button class="bg-main-pair br-main-pair cr-white round text-size dis-inline-block fr" type="default" hover-class="none" @tap="choose_system_address_event">导入系统地址</button>
+						<button class="bg-main br-main cr-white round text-size-sm dis-inline-block fl" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
+						<button class="bg-main-pair br-main-pair cr-white round text-size-sm dis-inline-block fr" type="default" hover-class="none" @tap="choose_system_address_event">导入系统地址</button>
 					</view>
 				</block>
 				<block v-else>
-					<button class="bg-main br-main cr-white round text-size wh-auto" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
+					<button class="bg-main br-main cr-white round text-size-sm wh-auto" type="default" hover-class="none" @tap="address_add_event">添加新地址</button>
 				</block>
 			</view>
         </view>