From caa23b301f97ac0ffb0b893614a7927851da9b05 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 4 Nov 2023 11:52:36 +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

---
 components/signin/user-qrcode/user-qrcode.vue    | 10 +++++-----
 components/signin/user-signin/user-signin.vue    | 16 +++++++++-------
 pages/plugins/invoice/invoice/invoice.vue        |  4 ++--
 .../user-qrcode-detail/user-qrcode-detail.vue    |  3 ++-
 pages/plugins/signin/user/user.vue               |  4 ++--
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/components/signin/user-qrcode/user-qrcode.vue b/components/signin/user-qrcode/user-qrcode.vue
index bc7ebbdc..2da420f5 100644
--- a/components/signin/user-qrcode/user-qrcode.vue
+++ b/components/signin/user-qrcode/user-qrcode.vue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60">
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav '+((data_base || null) != null && (data_base.signin_desc || null) != null && data_base.signin_desc.length > 0 ? 'top-notice' : '')" lower-threshold="60">
             <view class="data-list" :class="(data_base || null) != null && (data_base.is_team || 0) == 1 ? '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">
@@ -13,8 +13,8 @@
                                 <block v-for="(fv, fi) in content_list" :key="fi">
                                     <view class="single-text margin-top-xs">
                                         <text class="cr-grey-9 margin-right-xl">{{ fv.name }}:</text>
-                                        <text class="fw-b">{{ item[fv.field] }}</text>
-                                        <text v-if="(fv.unit || null) != null" class="fw-b">{{ fv.unit }}</text>
+                                        <text class="cr-base">{{ item[fv.field] }}</text>
+                                        <text v-if="(fv.unit || null) != null" class="cr-grey">{{ fv.unit }}</text>
                                     </view>
                                 </block>
                             </navigator>
@@ -248,8 +248,8 @@
     };
 </script>
 <style scoped>
-    .scroll-box {
-        height: calc(100vh - 144rpx);
+    .scroll-box-ece-nav.top-notice {
+        height: calc(100vh - 154rpx);
     }
     .user-team-container button {
         height: 88rpx;
diff --git a/components/signin/user-signin/user-signin.vue b/components/signin/user-signin/user-signin.vue
index aefbe8ab..41723f25 100644
--- a/components/signin/user-signin/user-signin.vue
+++ b/components/signin/user-signin/user-signin.vue
@@ -1,6 +1,6 @@
 <template>
     <view>
-        <scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60">
+        <scroll-view :scroll-y="true" :class="'scroll-box-ece-nav '+((data_base || null) != null && (data_base.signin_desc || null) != null && data_base.signin_desc.length > 0 ? 'top-notice' : '')" lower-threshold="60">
             <view class="data-list">
                 <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">
@@ -38,7 +38,7 @@
             propScrollLower: {
                 type: Boolean,
                 default: false,
-            },
+            }
         },
         data() {
             return {
@@ -48,7 +48,8 @@
                 data_page: 1,
                 data_list_loding_status: 1,
                 data_bottom_line_status: false,
-                data_is_loading: 0,
+                data_is_loading: 0,
+                data_base: null,
                 content_list: [
                     { name: '奖励积分', field: 'integral' },
                     { name: '签到时间', field: 'add_time' },
@@ -151,7 +152,8 @@
                                         temp_data_list.push(temp_data[i]);
                                     }
                                 }
-                                this.setData({
+                                this.setData({
+                                    data_base: res.data.data.base || null,
                                     data_list: temp_data_list,
                                     data_total: res.data.data.total,
                                     data_page_total: res.data.data.page_total,
@@ -196,8 +198,8 @@
         },
     };
 </script>
-<style scoped>
-    .scroll-box {
-        height: calc(100vh - 144rpx);
+<style scoped>
+    .scroll-box-ece-nav.top-notice {
+        height: calc(100vh - 154rpx);
     }
 </style>
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
index a9da8812..dd727409 100644
--- a/pages/plugins/invoice/invoice/invoice.vue
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -5,13 +5,13 @@
             <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">
+        <view v-if="nav_status_list.length > 0" class="nav-base bg-white flex-row jc-sa align-c">
             <block v-for="(item, index) in nav_status_list" :key="index">
                 <view :class="'item tc cr-grey ' + (nav_status_index == index ? 'cr-main nav-active-line' : '')" :data-index="index" @tap="nav_event">{{ item.name }}</view>
             </block>
         </view>
         <!-- 列表 -->
-        <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">
+        <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">
diff --git a/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue b/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
index 50a93045..434db590 100644
--- a/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
+++ b/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.vue
@@ -114,7 +114,8 @@ export default {
                                 { name: "受邀人奖励", value: (data.data.reward_invitee || 0) + " 积分" },
                                 { name: "联系人姓名", value: data.data.name || "" },
                                 { name: "联系人电话", value: data.data.tel || "" },
-                                { name: "联系人地址", value: data.data.address || "" },
+                                { name: "联系人地址", value: data.data.address || "" },
+                                { name: "备注", value: data.data.note || "" },
                                 { name: "创建时间", value: data.data.add_time || "" },
                                 { name: "更新时间", value: data.data.upd_time || "" },
                             ],
diff --git a/pages/plugins/signin/user/user.vue b/pages/plugins/signin/user/user.vue
index d757bc16..5b78aa59 100644
--- a/pages/plugins/signin/user/user.vue
+++ b/pages/plugins/signin/user/user.vue
@@ -20,10 +20,10 @@
             <!-- 明细 -->
             <view class="nav-detail margin-bottom-lg">
                 <view v-if="current === 0">
-                    <component-user-signin :prop-pull-down-refresh="propPullDownRefresh" :prop-scroll-lower="scroll_lower_bool"></component-user-signin>
+                    <component-user-signin :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-signin>
                 </view>
                 <view v-if="current === 1">
-                    <component-user-qrcode :prop-pull-down-refresh="propPullDownRefresh" :prop-scroll-lower="scroll_lower_bool"></component-user-qrcode>
+                    <component-user-qrcode :propPullDownRefresh="propPullDownRefresh" :propScrollLower="scroll_lower_bool"></component-user-qrcode>
                 </view>
             </view>
         </view>