From a56c66446326a5f1fd5695073719f47f1d5786fc Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 4 Nov 2023 11:15:04 +0800
Subject: [PATCH] =?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

---
 pages/plugins/ask/user-detail/user-detail.vue | 83 +++++++++----------
 pages/plugins/invoice/invoice/invoice.css     |  4 +-
 pages/plugins/invoice/invoice/invoice.vue     | 10 +--
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/pages/plugins/ask/user-detail/user-detail.vue b/pages/plugins/ask/user-detail/user-detail.vue
index e535e05c..21c4d957 100644
--- a/pages/plugins/ask/user-detail/user-detail.vue
+++ b/pages/plugins/ask/user-detail/user-detail.vue
@@ -1,46 +1,48 @@
 <template>
     <view>
-        <component-nav-back></component-nav-back>
-        <view v-if="Object.keys(detail_data.length !== 0)" class="weixin-nav-padding-top">
-            <view class="padding-top-xxxl">
-                <view class="pa top-0 left-0 right-0 nav-top pa-w">
-                    <image mode="widthFix" :src="ask_static_url + 'nav-top.png'" class="wh-auto"></image>
-                </view>
-                <view class="padding-main pr margin-top-xxxl">
-                    <view class="bg-white border-radius-main padding-main text-size">
-                        <view class="fw-b text-size-lg spacing-mb">提问详情</view>
-                        <view v-if="detail_data.user && detail_data.user.user_name_view" class="spacing-mb">
-                            <view class="cr-grey-9">联系人</view>
-                            <view class="margin-top-xs">{{ detail_data.user.user_name_view }}</view>
-                        </view>
-                        <view v-if="detail_data.tel" class="spacing-mb">
-                            <view class="cr-grey-9">联系电话</view>
-                            <view class="margin-top-xs">{{ detail_data.tel }}</view>
-                        </view>
-                        <view v-if="detail_data.title" class="spacing-mb">
-                            <view class="cr-grey-9">标题</view>
-                            <view class="margin-top-xs">{{ detail_data.title }}</view>
-                        </view>
-                        <view v-if="detail_data.content" class="spacing-mb">
-                            <view class="cr-grey-9">内容</view>
-                            <view class="margin-top-xs">{{ detail_data.content }}</view>
-                        </view>
-                        <view v-if="detail_data.reply" class="spacing-mb">
-                            <view class="cr-grey-9">回复内容</view>
-                            <view class="margin-top-xs">{{ detail_data.reply }}</view>
-                        </view>
-                        <view v-if="detail_data.reply_time_time" class="spacing-mb">
-                            <view class="cr-grey-9">回复时间</view>
-                            <view class="margin-top-xs">{{ detail_data.reply_time_time }}</view>
-                        </view>
-                        <view v-if="detail_data.add_time_time" class="spacing-mb">
-                            <view class="cr-grey-9">创建时间</view>
-                            <view class="margin-top-xs">{{ detail_data.add_time_time }}</view>
+        <block v-if="data_list_loding_status != 1 && Object.keys(detail_data.length !== 0)">
+            <component-nav-back></component-nav-back>
+            <view class="weixin-nav-padding-top">
+                <view class="padding-top-xxxl">
+                    <view class="pa top-0 left-0 right-0 nav-top pa-w">
+                        <image mode="widthFix" :src="ask_static_url + 'nav-top.png'" class="wh-auto"></image>
+                    </view>
+                    <view class="padding-main pr margin-top-xxxl">
+                        <view class="bg-white border-radius-main padding-main text-size">
+                            <view class="fw-b text-size-lg spacing-mb">提问详情</view>
+                            <view v-if="detail_data.user && detail_data.user.user_name_view" class="spacing-mb">
+                                <view class="cr-grey-9">联系人</view>
+                                <view class="margin-top-xs">{{ detail_data.user.user_name_view }}</view>
+                            </view>
+                            <view v-if="detail_data.tel" class="spacing-mb">
+                                <view class="cr-grey-9">联系电话</view>
+                                <view class="margin-top-xs">{{ detail_data.tel }}</view>
+                            </view>
+                            <view v-if="detail_data.title" class="spacing-mb">
+                                <view class="cr-grey-9">标题</view>
+                                <view class="margin-top-xs">{{ detail_data.title }}</view>
+                            </view>
+                            <view v-if="detail_data.content" class="spacing-mb">
+                                <view class="cr-grey-9">内容</view>
+                                <view class="margin-top-xs">{{ detail_data.content }}</view>
+                            </view>
+                            <view v-if="detail_data.reply" class="spacing-mb">
+                                <view class="cr-grey-9">回复内容</view>
+                                <view class="margin-top-xs">{{ detail_data.reply }}</view>
+                            </view>
+                            <view v-if="detail_data.reply_time_time" class="spacing-mb">
+                                <view class="cr-grey-9">回复时间</view>
+                                <view class="margin-top-xs">{{ detail_data.reply_time_time }}</view>
+                            </view>
+                            <view v-if="detail_data.add_time_time" class="spacing-mb">
+                                <view class="cr-grey-9">创建时间</view>
+                                <view class="margin-top-xs">{{ detail_data.add_time_time }}</view>
+                            </view>
                         </view>
                     </view>
                 </view>
             </view>
-        </view>
+        </block>
         <view v-else>
             <!-- 提示信息 -->
             <component-no-data :propStatus="data_list_loding_status"></component-no-data>
@@ -71,7 +73,7 @@
         onLoad(params) {
             if (params) {
                 this.setData({
-                    params: params.id,
+                    params: params,
                 });
             }
         },
@@ -118,13 +120,10 @@
                 uni.request({
                     url: app.globalData.get_request_url('detail', 'ask', 'ask'),
                     method: 'POST',
-                    data: {
-                        id: this.params,
-                    },
+                    data: this.params,
                     dataType: 'json',
                     success: (res) => {
                         uni.stopPullDownRefresh();
-                        console.log(res.data.data);
                         if (res.data.code == 0) {
                             this.setData({
                                 detail_data: res.data.data || {},
diff --git a/pages/plugins/invoice/invoice/invoice.css b/pages/plugins/invoice/invoice/invoice.css
index 301f4101..d1fa993a 100644
--- a/pages/plugins/invoice/invoice/invoice.css
+++ b/pages/plugins/invoice/invoice/invoice.css
@@ -1,8 +1,8 @@
 /*
 * 导航
 */
-.scroll-box-ece-nav {
-    height: calc(100vh - 140rpx);
+.scroll-box-ece-nav.top-notice {
+    height: calc(100vh - 154rpx);
 }
 
 /*
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
index 4cb659ad..a9da8812 100644
--- a/pages/plugins/invoice/invoice/invoice.vue
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -1,8 +1,8 @@
 <template>
     <view>
         <!-- 公告 -->
-        <view v-if="data_base.length > 0 && data_base" class="padding-horizontal-main padding-vertical-sm bg-white">
-            <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="data_base.join('')" background-color="transparent" color="#666" />
+        <view v-if="(data_base || null) != null && (data_base.invoice_desc || null) != null && data_base.invoice_desc.length > 0" class="padding-horizontal-main padding-vertical-sm bg-white">
+            <uni-notice-bar class="padding-0 margin-0" show-icon scrollable :text="data_base.invoice_desc.join('')" background-color="transparent" color="#666" />
         </view>
         <!-- 导航 -->
         <view class="nav-base bg-white flex-row jc-sa align-c">
@@ -11,7 +11,7 @@
             </block>
         </view>
         <!-- 列表 -->
-        <scroll-view :scroll-y="true" class="scroll-box-ece-nav" @scrolltolower="scroll_lower" lower-threshold="60">
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav '+((data_base || null) != null && (data_base.invoice_desc || null) != null && data_base.invoice_desc.length > 0 ? 'top-notice' : '') " @scrolltolower="scroll_lower" lower-threshold="60">
             <view class="page-bottom-fixed">
                 <view v-if="data_list.length > 0" class="data-list padding-horizontal-main padding-top-main">
                     <view v-for="(item, index) in data_list" :key="index" class="item padding-main border-radius-main oh bg-white spacing-mb">
@@ -62,7 +62,7 @@
     export default {
         data() {
             return {
-                data_base: [],
+                data_base: null,
                 data_list: [],
                 data_total: 0,
                 data_page_total: 0,
@@ -150,7 +150,7 @@
                         if (res.data.code == 0) {
                             var data = res.data.data;
                             this.setData({
-                                data_base: data.base.invoice_desc || [],
+                                data_base: data.base || null,
                                 nav_status_list: data.nav || [],
                                 data_list_loding_status: 0,
                                 data_bottom_line_status: false,