From e559765260dabcbab3d86378ade4bfc42dddda38 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Fri, 17 Oct 2025 00:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=20Task:=E5=8D=83=E5=8E=BF=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/qianxian.js                          | 19 ++++++++++++++++---
 pkg_product/views/famousQianxianShop.vue | 12 ++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/api/qianxian.js b/api/qianxian.js
index 2d9813a..56ff6c2 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -105,9 +105,9 @@ export function getSaleList(params) {
 }
 
 // 旅居列表
-export function getJiaLouList(params) {
-    return request.get('/countyFamous/sojourn', params, {login: true})
-}
+// export function getJiaLouList(params) {
+//     return request.get('/countyFamous/sojourn', params, {login: true})
+// }
 
 // 旅居详情
 export function getJiaLouDetail(id) {
@@ -152,4 +152,17 @@ export function postJiaLouNewsZan(data) {
 // 分享旅居
 export function postJiaLouShare(id) {
     return request.get('/countyFamous/sojourn/poster/' + id, {login: true})
+}
+
+/**
+ * 获取旅居列表
+ * countyId int 县城ID
+    shopType string 所属板块（countyFamous-千县；wellness-康养）
+    wellnessPlaceCateId int 康养圣地分类ID
+    name string 名称
+    page int 页码
+    limit int 每页数量
+ */
+export function getJiaLouList(params) {
+    return request.get('/travel/merchantList', params, {login: true})
 }
\ No newline at end of file
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index fdda67a..4d92ed2 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -503,7 +503,7 @@
                         </view>
                         <view class="name-wrap">
                           <image
-                            :src="jiaLou.logo"
+                            :src="jiaLou.avatar"
                             class="logo"
                           />
                           <view class="name one-t">
@@ -731,7 +731,7 @@ import {
   getCountyFamousCityDetail,
   getShareImg,
   getSaleList,
-  getJiaLouList,
+  getJiaLouList
 } from '@/api/qianxian'
 import ProductWindow from '@/components/ProductWindow'
 import goCartMixin from '@/mixins/goCartMixins'
@@ -815,6 +815,7 @@ export default {
       rightList: [],
       videoPlayers:[],
       jiaLouList: [],
+      countyId: null,
     }
   },
   // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
@@ -1074,6 +1075,7 @@ export default {
       getCountyFamousCityDetail(this.id).then(res => {
         const { success, data } = res
         if (success) {
+          this.countyId = data.countyId
           const products = data.products || []
           const farmerShops = data.farmerShops || []
           this.leftList = this.newSort(products, farmerShops)
@@ -1438,11 +1440,13 @@ export default {
       this.industryTabIndex = index
       if(index === 2) {
         const params = {
-          countyFamousDataId: this.id,
+          countyId: this.countyId,
+          shopType: 'countyFamous',
+          name: '',
           page: 1,
           limit: 9999
         }
-        console.log(params);
+        console.log(this.inn);
         
         getJiaLouList(params).then(res => {
           this.jiaLouList = res.data.records || []