From 4998e668fbf79914ed33c32a04f5dd4cdb6a2e7e Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 17 Nov 2023 16:01:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=86=E9=94=80=E6=96=B0=E5=A2=9E=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E5=A4=8D=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.vue  | 30 +++++++++++++-----------
 pages/plugins/distribution/user/user.css |  2 +-
 pages/plugins/distribution/user/user.vue | 27 ++++++++++++---------
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index e70573d9..b6d00b3c 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -22,7 +22,7 @@
                     </block>
                     <view class="category-container">
                         <!-- 分类内容 -->
-                        <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + search_height + 'px);'">
+                        <view :class="'category-content bs-bb pr ' + (category_show_level == 0 ? 'goods-model' : '')" :style="'height:calc(100vh - ' + (search_height + window_bottom_height) + 'px);'">
                             <block v-if="category_show_level == 1">
                                 <!-- 一级模式 -->
                                 <scroll-view scroll-y class="ht-auto" :show-scrollbar="false">
@@ -450,6 +450,8 @@
                 popup_status: false,
                 // 获取搜索框高度
                 search_height: 0,
+                // 底部tab高度 - 只有H5下有值
+                window_bottom_height: uni.getWindowInfo().windowBottom || 0,
             };
         },
 
@@ -583,18 +585,18 @@
                                 if (this.is_first == 1 && this.category_show_level == 0) {
                                     this.get_cart_data();
                                 }
-                            }
-
-                            // 计算更多分类弹窗的高度、由于页面元素渲染异步问题，这里加延时执行
-                            if(this.is_first == 1) {
-                                var self = this;
-                                var timer = setInterval(function() {
-                                    if(self.search_height == 0) {
-                                        self.search_height_computer();
-                                    } else {
-                                        clearInterval(timer);
-                                    }
-                                }, 500);
+                            }
+
+                            // 计算更多分类弹窗的高度、由于页面元素渲染异步问题，这里加延时执行
+                            if(this.is_first == 1) {
+                                var self = this;
+                                var timer = setInterval(function() {
+                                    if(self.search_height == 0) {
+                                        self.search_height_computer();
+                                    } else {
+                                        clearInterval(timer);
+                                    }
+                                }, 500);
                             }
 
                             // 是否首次记录
@@ -1260,7 +1262,7 @@
                     if ((res || null) != null) {
                         // 获取搜索框高度
                         this.setData({
-                            search_height: res.height + uni.getWindowInfo().windowBottom,
+                            search_height: res.height,
                         });
                     }
                 }).exec();
diff --git a/pages/plugins/distribution/user/user.css b/pages/plugins/distribution/user/user.css
index 55285b37..f36bf8c3 100644
--- a/pages/plugins/distribution/user/user.css
+++ b/pages/plugins/distribution/user/user.css
@@ -75,7 +75,7 @@
 }
 
 .anti-mercenary-count {
-    padding: 10rpx 40rpx;
+    padding: 20rpx 40rpx;
 }
 
 .promotion-size {
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index 5c84b185..eeb3beee 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -67,7 +67,7 @@
                                 <view v-if="stats_user_promotion_data_list.length > 0" class="margin-top-main oh tc flex-row jc-sa align-c">
                                     <block v-for="(item, index) in stats_user_promotion_data_list" :key="index">
                                         <view class="padding-main flex-1" :class="stats_user_promotion_data_list.length - 1 > index ? 'divider-r-f5' : ''">
-                                            <view class="single-text margin-top-sm" :data-value="'/pages/plugins/distribution/promotion-user/promotion-user?type='+item.to_value" @tap="url_event">
+                                            <view class="single-text margin-top-sm" :data-value="item.to_page" @tap="url_event">
                                                 <text class="fw-b promotion-size">{{ item.value }}</text>
                                                 <text v-if="(item.unit || null) != null" class="cr-grey-9 text-size-xs">人</text>
                                             </view>
@@ -78,20 +78,25 @@
                                 <!-- 基础统计 -->
                                 <view v-if="stats_base_data_list.length > 0" class="margin-top oh tc">
                                     <block v-for="(item, index) in stats_base_data_list_children" :key="index">
-                                        <view class="flex-row jc-sa align-c bg-grey-f5 border-radius-main" :class="stats_base_data_list_children.length - 1 > index ? 'spacing-mb' : ''">
+                                        <view class="flex-row jc-sa bg-grey-f5 border-radius-main" :class="stats_base_data_list_children.length - 1 > index ? 'spacing-mb' : ''">
                                             <block v-for="(child, i) in item" :key="i">
-                                                <view class="flex-width-half">
-                                                    <view class="padding-vertical-main padding-horizontal-xxxl flex-row jc-c align-c">
+                                                <view class="flex-width-half pr">
+                                                    <view class="padding-vertical-xxxl padding-left-xxxl padding-right-main flex-row jc-c align-c">
                                                         <image :src="child.icon" mode="widthFix" class="count-img" />
                                                         <view class="tl flex-1 flex-width padding-left-main">
                                                             <view class="text-size-xs single-text">{{ child.name }}</view>
-                                                            <view class="single-text margin-top-sm" :data-value="'/pages/plugins/distribution/promotion-user/promotion-user?type='+item.to_value" @tap="url_event">
+                                                            <view class="single-text margin-top-sm" :data-value="item.to_page" @tap="url_event">
                                                                 <text v-if="(child.first || null) != null" class="text-size-xs">{{ child.first }}</text>
                                                                 <text class="text-size-lg fw-b">{{ child.value }}</text>
                                                                 <text v-if="(child.unit || null) != null" class="cr-grey-9 text-size-xs">{{ child.unit }}</text>
                                                             </view>
                                                         </view>
                                                     </view>
+                                                    <view v-if="child.data" class="flex-row jc-c align-c padding-horizontal-xs padding-bottom-sm pa bottom-0 left-0 right-0">
+                                                        <view v-for="(cdata, ci) in child.data" :key="ci" class="padding-horizontal-sm">
+                                                            <view class="cr-grey-9 text-size-xss" :data-value="cdata.to_page" @tap="url_event">{{ cdata.name }}</view>
+                                                        </view>
+                                                    </view>
                                                 </view>
                                             </block>
                                         </view>
@@ -464,12 +469,12 @@
             // 页面滚动监听
             onPageScroll(res) {
                 uni.$emit('onPageScroll', res);
-            },
-
-            // url事件
-            url_event(e) {
-                app.globalData.url_event(e);
-            }
+            },
+
+            // url事件
+            url_event(e) {
+                app.globalData.url_event(e);
+            },
         },
     };
 </script>