From 5ff8f5f76fb1001af570bdbc4408410be77b1ba2 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Mon, 28 Oct 2024 23:35:59 +0800
Subject: [PATCH] =?UTF-8?q?Task(=E5=8D=83=E5=8E=BF=E5=90=8D=E5=93=81)?=
 =?UTF-8?q?=EF=BC=9A=E5=95=86=E9=93=BA=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/inn.js                               |  5 +++++
 pkg_product/views/famousQianxianShop.vue | 23 ++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/api/inn.js b/api/inn.js
index 18429b5..9af877d 100644
--- a/api/inn.js
+++ b/api/inn.js
@@ -236,3 +236,8 @@ export function getHotelShareBackgroundImage(id) {
 export function hotelNewsView(data) {
     return request.post("/api/hotelNews/view", data, {login: true})
 }
+
+
+export function getFarmerShop(id) {
+    return request.get("/api/countyFamous/farmerShop/" + id)
+}
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 2d13207..94788d5 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -543,7 +543,7 @@
                 <view class="focus-img">
                   <image :src="item.productImage"  class="img"></image>
                 </view>
-                <view class="more-t v12-pt-2" style="height: 84rpx">{{ item.productName }}</view>
+                <view class="more-t v12-pt-2 v12-font-bold v12-font-28" style="height: 84rpx">{{ item.productName }}</view>
                 <view class="v12-justify-between v12-algin-center v12-pt-2">
                   <view>
                     <text class="v12-font-bold v12-primary-text v12-font-24">￥</text>
@@ -565,12 +565,12 @@
                     class="mark-img"
                   />
                 </view>
-                <view class="more-t v12-pt-2" style="height: 84rpx">{{ item.name }}</view>
-                <view class="v12-justify-start v12-align-center v12-pt-2">
+                <view class="more-t v12-pt-2 v12-font-bold  v12-font-28" style="height: 84rpx">{{ item.content }}</view>
+                <view class="v12-justify-start v12-align-center v12-pt-2 ">
                   <view class="btn v12-mr-2">
                     <image :src="item.logo" class="img v12-radius-100"></image>
                   </view>
-                  <view class="one-t v12-font-24 v12-dark1-text" style="width:230rpx">{{ item.ownerName }}/{{ inn.name }}</view>
+                  <view class="one-t v12-font-24 v12-dark1-text" style="width:230rpx">{{ item.name }}/{{ inn.name }}</view>
                 </view>
               </view>
             </view>
@@ -724,11 +724,16 @@ export default {
   },
   methods: {
     goStore(item) {
-      this.$yrouter.push({
-        path: '/pagesInn/inn/innHome',
-        query: {
-          id: item.farmerShopId
-        }
+      if (item.farmerShopId === 0) {
+        uni.showToast({
+          title: '店铺装修中~',
+          icon: 'none',
+          duration: 3000
+        })
+        return
+      }
+      uni.navigateTo({
+        url: '/pagesInn/inn/innHome?id=' + item.farmerShopId + '&isQianxian=1'
       })
     },
     load() {