From ea385b4f8978b6009c0983d4c101328873f580d0 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 10 Jan 2023 18:23:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=BC=E5=9B=A2=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=81=E5=94=AE=E5=90=8E=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=A9=BA=E7=BD=AE=E9=A1=B5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/detail.vue |  6 +++---
 pages/order/aftersale/detail.vue  | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue
index 3d4adbe..2bcc52b 100644
--- a/pages/activity/groupon/detail.vue
+++ b/pages/activity/groupon/detail.vue
@@ -1,7 +1,7 @@
 <template>
-  <s-layout title="拼团详情" class="detail-wrap" navbar="inner" :onShareAppMessage="shareInfo">
+  <s-layout title="拼团详情" class="detail-wrap" :navbar="state.data && !state.loading ? 'inner': 'normal'" :onShareAppMessage="shareInfo">
     <view v-if="state.loading"></view>
-    <view v-else-if="state.data && !state.loading">
+    <view v-if="state.data && !state.loading">
       <view
         class="recharge-box"
         v-if="state.data.goods"
@@ -193,7 +193,7 @@
         />
       </view>
     </view>
-    <s-empty v-else-if="!state.data && !state.loading" icon="/static/goods-empty.png"> </s-empty>
+    <s-empty v-if="!state.data && !state.loading" icon="/static/goods-empty.png"> </s-empty>
   </s-layout>
 </template>
 
diff --git a/pages/order/aftersale/detail.vue b/pages/order/aftersale/detail.vue
index 23ce633..7571cb5 100644
--- a/pages/order/aftersale/detail.vue
+++ b/pages/order/aftersale/detail.vue
@@ -1,9 +1,8 @@
 <!-- 售后详情 -->
 <template>
-  <s-layout title="售后详情" navbar="inner">
-    <view class="content_box" v-if="JSON.stringify(state.info) != '{}'">
+  <s-layout title="售后详情" :navbar="!isEmpty(state.info) && state.loading?'inner': 'normal'">
+    <view class="content_box" v-if="!isEmpty(state.info) && state.loading">
       <!-- 步骤条 -->
-      <!-- TODO-jj: 步骤条样式 -->
       <view
         class="steps-box ss-flex"
         :style="[
@@ -100,8 +99,12 @@
         </view>
       </view>
     </view>
-    <s-empty v-if="state.info === null" icon="/static/order-empty.png" text="暂无该订单售后详情" />
-    <su-fixed bottom placeholder bg="bg-white" v-if="JSON.stringify(state.info) != '{}'">
+    <s-empty
+      v-if="isEmpty(state.info) && state.loading"
+      icon="/static/order-empty.png"
+      text="暂无该订单售后详情"
+    />
+    <su-fixed bottom placeholder bg="bg-white" v-if="!isEmpty(state.info)">
       <view class="foot_box">
         <button
           class="ss-reset-button btn"
@@ -127,6 +130,7 @@
   import sheep from '@/sheep';
   import { onLoad } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
+  import { isEmpty } from 'lodash';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const state = reactive({
@@ -141,6 +145,7 @@
         title: '处理中',
       },
     ],
+    loading: false,
   });
 
   function onApply(orderId) {
@@ -177,6 +182,7 @@
   };
   async function getDetail(id) {
     const { error, data } = await sheep.$api.order.aftersale.detail(id);
+    state.loading = true;
     if (error === 0) {
       state.info = data;
       if (state.info.aftersale_status === -2 || state.info.aftersale_status === -1) {