From ffc510fc08ee0cbc135aee2387f84077d62b05ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Mon, 18 Aug 2025 17:02:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E5=8F=8A?=
 =?UTF-8?q?=E6=B9=96=E7=95=94=E5=A5=BD=E5=BA=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/localLife/classify/index.css | 29 +++++++++++++++++++++++++--
 packages/localLife/classify/index.vue | 19 +++++++++++++++++-
 packages/payTheFees/index/index.css   |  1 -
 pages.json                            |  1 +
 pages/index/index.vue                 | 16 +++++++++++----
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/packages/localLife/classify/index.css b/packages/localLife/classify/index.css
index 154e925b..52bb7839 100644
--- a/packages/localLife/classify/index.css
+++ b/packages/localLife/classify/index.css
@@ -2,8 +2,15 @@ page {
     background-color: #fff;
 }
 
-.container {
-    /* padding-top: 100rpx; */
+.header {
+    display: flex;
+    align-items: center;
+}
+
+.header_tit {
+    width: 100%;
+    position: absolute;
+    text-align: center;
 }
 
 .local {
@@ -336,4 +343,22 @@ page {
     font-size: 24rpx;
     color: #999999;
     margin-top: 14rpx;
+}
+
+.empty {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    font-weight: normal;
+    font-size: 28rpx;
+    color: #999999;
+    margin-top: 110rpx;
+    width: 100%;
+}
+
+.empty image {
+    width: 366rpx;
+    height: 226rpx;
+    margin-bottom: 27rpx;
 }
\ No newline at end of file
diff --git a/packages/localLife/classify/index.vue b/packages/localLife/classify/index.vue
index a778ab54..a9e5576f 100644
--- a/packages/localLife/classify/index.vue
+++ b/packages/localLife/classify/index.vue
@@ -1,5 +1,9 @@
 <template>
   <view class="container">
+    <view class="header" :style="{ paddingTop: top + 'px', height: localHeight + 'px' }">
+      <u-icon bold color="#000" size="40" name="arrow-left" @click="back"></u-icon>
+      <view class="header_tit">{{ headerTitle }}</view>
+    </view>
     <view class="local">
       <image id="local" src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/local_localIcon.png"
         mode="aspectFill"></image>
@@ -14,7 +18,7 @@
         <input type="text" placeholder="请输入您想搜索的内容" />
       </view>
     </view>
-    <view class="merchantList">
+    <view class="merchantList" v-if="merchatList.length > 0">
       <view class="merchantItem" v-for="item in merchatList" :key="item.id" @click="Info(item)">
         <view class="merchantItem_left">
           <image :src="picUrl + item.bigImg[0]" mode="aspectFill"></image>
@@ -55,6 +59,14 @@
         </view>
       </view>
     </view>
+    <view v-else>
+      <view class="empty">
+        <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_nearbyList_empty.png"
+          mode="aspectFill"></image>
+        暂无数据
+      </view>
+    </view>
+
 
     <view class="btnList">
       <view class="btn_left">
@@ -90,6 +102,7 @@ import { apiArr } from "../../../api/v2local";
 export default {
   data() {
     return {
+      headerTitle: "",
       picUrl,
       top: "",
       localHeight: "",
@@ -108,6 +121,7 @@ export default {
   },
   onLoad(options) {
     this.changeId = JSON.parse(options.item).id;
+    this.headerTitle = JSON.parse(options.item).cate_name;
     const meun = menuButtonInfo();
     this.top = meun.top;
     // this.top = meun.height + meun.top;
@@ -125,6 +139,9 @@ export default {
   },
 
   methods: {
+    back() {
+      NavgateTo("1");
+    },
     swiperChange(e) {
       this.currentIndex = e.detail.current;
     },
diff --git a/packages/payTheFees/index/index.css b/packages/payTheFees/index/index.css
index 9025c33c..13b0350f 100644
--- a/packages/payTheFees/index/index.css
+++ b/packages/payTheFees/index/index.css
@@ -4,7 +4,6 @@ page {
 
 .pay-container {
   padding: 30rpx;
-  min-height: 100vh;
 }
 
 .header {
diff --git a/pages.json b/pages.json
index 1a9159da..32b710e2 100644
--- a/pages.json
+++ b/pages.json
@@ -506,6 +506,7 @@
 					"path": "classify/index",
 					"style": {
 						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
 						"navigationBarBackgroundColor": "#fff"
 					}
 				},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 807b8d4e..c6c11919 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -496,12 +496,14 @@ export default {
       });
     },
 
-    headerServerClick2(e) {
+    async headerServerClick2(e) {
       if (e.title == '更多') {
         NavgateTo('/packages/localLife/index/index')
       }
       const cate_id = this.categoryList.find(item => item.cate_name == e.title)?.id;
-      if (cate_id) { this.switchCategory(cate_id) }
+      if (cate_id) {
+        await this.switchCategory(cate_id);
+      }
       return
     },
 
@@ -991,12 +993,18 @@ export default {
       this.hotWord = res.search_hot_word.split(/[,，]/)
     },
 
-    switchCategory(id) {
+    async switchCategory(id) {
       this.currentCategoryId = id;
       this.activeCategoryId = `category-${id}`;
-      this.getMechantList()
+      await this.getMechantList(); // 等待数据加载完成
 
       this.showDropdown = false;
+      this.$nextTick(() => {
+        uni.pageScrollTo({
+          scrollTop: 1000,
+          duration: 300
+        });
+      });
     },
 
     toggleDropdown() {