From 3405b5f7b937c7b89a83b7bb1c2bbc4d7aa1db09 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 11 Dec 2023 00:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/realstore-cart/realstore-cart.vue |  9 ++++++---
 pages/goods-category/goods-category.vue      |  2 +-
 pages/plugins/realstore/detail/detail.vue    | 12 +++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue
index 97edae31..f7b8632f 100644
--- a/components/realstore-cart/realstore-cart.vue
+++ b/components/realstore-cart/realstore-cart.vue
@@ -122,7 +122,7 @@
                 info: null,
                 // 结算按钮
                 settlement_btn_status: false,
-                settlement_btn_text: '先选购',
+                settlement_btn_text: '加载中',
                 // 临时操作数据
                 temp_opt_data: null,
                 // 下单类型
@@ -231,15 +231,18 @@
                                 is_first: 0,
                             });
 
-                            this.settlement_btn_handle();
-
                             // 购物车获取成功回调
                             this.$emit('CartDataBackEvent', this.cart);
                         } else {
                             app.globalData.showToast('请求失败，请重试！');
                         }
+                        
+                        // 结算按钮处理
+                        this.settlement_btn_handle();
                     },
                     fail: () => {
+                        // 结算按钮处理
+                        this.settlement_btn_handle();
                         app.globalData.showToast('网络开小差了哦~');
                     },
                 });
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 91c1e798..f5989855 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -805,8 +805,8 @@
                     data_content: temp_data_content,
                     data_three_content: temp_data_three_content,
                     data_page: 1,
+                    data_list: [],
                     data_list_loding_status: 1,
-                    data_list: [],
                     popup_status: false,
                 });
 
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index db630c8d..ea6743c3 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -7,7 +7,7 @@
             <view class="header pr z-i">
                 <component-nav-back :prop-fixed="false" prop-color="#333">
                     <template slot="right" :class="is_mp_env ? 'top-search-width' : 'flex-1 flex-width'">
-                        <view :class="'va-m padding-left-main ' + (is_realstore_top_nav_back == 1 ? 'nav-search' : 'wh-auto')">
+                        <view v-if="(info || null) != null" :class="'va-m padding-left-main ' + (is_realstore_top_nav_back == 1 ? 'nav-search' : 'wh-auto')">
                             <!-- #ifndef H5 -->
                             <component-search
                                 @onsearch="search_button_event"
@@ -480,12 +480,6 @@
                     data_is_loading: 1,
                 });
 
-                // 加载loding
-                uni.showLoading({
-                    title: '加载中...',
-                    mask: true,
-                });
-
                 // 请求参数
                 var post_data = {
                     id: this.info.id || 0,
@@ -512,7 +506,6 @@
                     data: this.$refs.realstore_cart.request_params_merge(post_data, 'data'),
                     dataType: 'json',
                     success: (res) => {
-                        uni.hideLoading();
                         uni.stopPullDownRefresh();
                         if (res.data.code == 0) {
                             var data = res.data.data;
@@ -561,7 +554,6 @@
                         }
                     },
                     fail: () => {
-                        uni.hideLoading();
                         uni.stopPullDownRefresh();
                         this.setData({
                             data_list_loding_status: 2,
@@ -838,6 +830,8 @@
                     nav_active_index: e.currentTarget.dataset.index,
                     nav_active_item_index: e.currentTarget.dataset.itemindex,
                     data_page: 1,
+                    data_list: [],
+                    data_list_loding_status: 1,
                 });
                 this.reset_scroll();
                 this.get_data_list(1);