From 749e3901f8f870d4669941da0bbaeed18c0dcf74 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 10 Dec 2025 18:23:12 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E6=97=85=E5=B1=85=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 1f4ea5c0c89f9e5a2804e5ba08b3df92f1078681)
---
 api/qianxian.js                          |  7 ++++++
 pkg_product/views/famousQianxianShop.vue |  2 ++
 pkg_product/views/housekeeperDetail.vue  | 28 +++++++++++++++++++++---
 pkg_product/views/oldSojumStore.vue      | 17 ++++++++++++--
 pkg_product/views/sojoumStore.vue        | 19 +++++++++++++---
 utils/common.js                          |  2 ++
 6 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/api/qianxian.js b/api/qianxian.js
index ae02d43..9da7bd1 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -260,3 +260,10 @@ export function getJiaLouNewsList(params) {
 export function getShareHousekeeper(id) {
     return request.get('/travel/steward/poster/' + id, {login: true})
 }
+
+/**
+ * 管家详情
+ */
+export function getJiaLouStewardDetail(id) {
+    return request.get('/travel/steward/' + id, {}, {login: true})  
+}
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 1c88bd1..3373fa0 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -839,6 +839,7 @@ export default {
   onLoad(options) {
     const id = options.id || ''
     this.id = id
+    
     if (id) {
       this.partnerId = options.partnerId || null
     } else {
@@ -847,6 +848,7 @@ export default {
         const query = options ? decodeURIComponent(options.scene) : decodeURIComponent(obj.query.scene)
         this.partnerId = getUrlParam(query, 'partnerId') || null
         this.id = getUrlParam(query, 'id') || null
+        
       }
     }
     if (this.partnerId) cookie.set('spread', this.partnerId)
diff --git a/pkg_product/views/housekeeperDetail.vue b/pkg_product/views/housekeeperDetail.vue
index 144e2fa..1ecf647 100644
--- a/pkg_product/views/housekeeperDetail.vue
+++ b/pkg_product/views/housekeeperDetail.vue
@@ -75,8 +75,9 @@
 </template>
 
 <script>
-import { getShareHousekeeper } from '@/api/qianxian.js'
+import { getShareHousekeeper, getJiaLouStewardDetail } from '@/api/qianxian.js'
 import sharePopup from '@/components/sharePopup.vue'
+import {getUrlParam} from '@/utils/common.js'
 export default {
   name: 'HousekeeperDetail',
   components: {
@@ -90,12 +91,33 @@ export default {
   },
   
   onLoad(options) {
-    this.record = JSON.parse(decodeURIComponent(options.obj))
-    console.log(this.record);
+    // this.record = JSON.parse(decodeURIComponent(options.obj))
+    // console.log(this.record);
+    const id = options.id || ''
+    this.id = id
     
+    if (id) {
+      // this.partnerId = options.partnerId || null
+    } else {
+      let obj = uni.getEnterOptionsSync()
+      if (options.scene || obj.query.scene) {
+        const query = options ? decodeURIComponent(options.scene + '') : decodeURIComponent(obj.query.scene)
+        this.id = getUrlParam(query, 'id') || null
+      }
+    }
+    this.getJiaLouStewardDetail()
   },
   
   methods: {
+    getJiaLouStewardDetail() {
+      uni.showLoading()
+      getJiaLouStewardDetail(this.id).then(res => {
+        uni.hideLoading()
+        if(res.status === 200) {
+          this.record = res.data || {}
+        }
+      })
+    },
    shareHousekeeper() {
     uni.showLoading()
     getShareHousekeeper(this.record.id).then(res => {
diff --git a/pkg_product/views/oldSojumStore.vue b/pkg_product/views/oldSojumStore.vue
index 2f54720..f2e21a0 100644
--- a/pkg_product/views/oldSojumStore.vue
+++ b/pkg_product/views/oldSojumStore.vue
@@ -342,6 +342,7 @@ import {
   postJiaLouZan,
   postJiaLouShare
 } from '@/api/qianxian'
+import {getUrlParam} from '@/utils/common.js'
 import imgBox from '@/components/imageTypeSet/imagebox.vue'
 export default {
   components: {
@@ -375,8 +376,20 @@ export default {
   onPageScroll(e) {
     this.scrollData = e
   },
-  onLoad(opts) {
-    this.id = opts.id
+  onLoad(options) {
+    const id = options.id || ''
+    this.id = id
+    
+    if (id) {
+      // this.partnerId = options.partnerId || null
+    } else {
+      let obj = uni.getEnterOptionsSync()
+      if (options.scene || obj.query.scene) {
+        const query = options ? decodeURIComponent(options.scene + '') : decodeURIComponent(obj.query.scene)
+        this.id = getUrlParam(query, 'id') || null
+        
+      }
+    }
     this.getFarmerData()
   },
   methods: {
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index 4b94765..1b7ef88 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -355,6 +355,7 @@ import {
   getJiaLouStewardList,
   getJiaLouNewsList
 } from '@/api/qianxian'
+import {getUrlParam} from '@/utils/common.js'
 import imgBox from '@/components/imageTypeSet/imagebox.vue'
 export default {
   components: {
@@ -397,8 +398,20 @@ export default {
   onPageScroll(e) {
     this.scrollData = e
   },
-  onLoad(opts) {
-    this.id = opts.id
+  onLoad(options) {
+    const id = options.id || ''
+    this.id = id
+    
+    if (id) {
+      // this.partnerId = options.partnerId || null
+    } else {
+      let obj = uni.getEnterOptionsSync()
+      if (options.scene || obj.query.scene) {
+        const query = options ? decodeURIComponent(options.scene + '') : decodeURIComponent(obj.query.scene)
+        this.id = getUrlParam(query, 'id') || null
+        
+      }
+    }
     this.getFarmerData()
   },
   watch: {
@@ -432,7 +445,7 @@ export default {
     // 跳转管家详情
     goHousekeeperDetail(item) {
       uni.navigateTo({
-        url: '/pkg_product/views/housekeeperDetail?obj=' +JSON.stringify(item)
+        url: '/pkg_product/views/housekeeperDetail?id=' + item.id
       })
     },
     getJiaLouStewardList() {
diff --git a/utils/common.js b/utils/common.js
index 8cd1a6b..0d4e21e 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -73,8 +73,10 @@ module.exports = {
     },
 
     getUrlParam(url, name) {
+        url = decodeURIComponent(url)
         var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
         var r = url.match(reg);
+        console.log(r);
         if (r != null) return (r[2]);
         return null;
     }