From 3bbd796a85724528e99bcb817b0538bf39ca76b2 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 12:40:53 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3477=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BC=80=E5=90=AF=E4=BA=86?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE=E7=9A=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=8C=BA=E5=9F=9F=E9=9C=80=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E3=80=90=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE=E3=80=91?=
 =?UTF-8?q?=EF=BC=88=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=90=9C=E7=B4=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=88=97=E8=A1=A8=E3=80=81=E5=95=86=E8=AF=A6=E9=A1=B5?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BA=93=E5=AD=98=E5=90=8E=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E8=A7=84=E6=A0=BC=E5=BC=B9=E7=AA=97=E3=80=81=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=95=86=E5=93=81=E6=94=B6=E8=97=8F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=81=E5=95=86=E5=93=81=E8=B6=B3=E8=BF=B9=E3=80=81?=
 =?UTF-8?q?=E6=96=87=E7=8E=A9=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ProductWindow.vue   | 7 ++++++-
 pages/shop/GoodsCon/index.vue  | 1 +
 pages/shop/GoodsList/index.vue | 3 ++-
 pages/user/History/index.vue   | 3 ++-
 pagesInn/inn/innHome.vue       | 3 ++-
 pkg_user/views/myFavorite.vue  | 3 ++-
 wenwan/views/goodsClass.vue    | 3 ++-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 63c57c0..5800a60 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -6,7 +6,7 @@
           <image :src="attrObj.productSelect.image" class="image" />
         </view>
         <view class="text">
-          <view class="money font-color-lightred v12-font-">
+          <view v-if="!isNegotiable" class="money font-color-lightred v12-font-">
             ￥
             <text class="num v12-font-40">{{ attrObj.productSelect.price }}</text>
             <text class="v12-ml-2 v12-font-weight-300 v12-font-22" style="color: #BBBBBB; text-decoration: line-through;">￥</text>
@@ -14,6 +14,7 @@
             <text class="v12-white-text v12-red v12-font-22 v12-radius-40 v12-px-1 v12-font-weight-400">会员价</text>
             <!-- <text class="stock">库存: {{ attrObj.productSelect.stock }}</text> -->
           </view>
+          <view class="v12-primary-text" v-else>价格面议</view>
           <view class="more-t">{{ attrObj.productSelect.store_name }}</view>
         </view>
         <view class="iconfont icon-guanbi" @click="closeAttr"></view>
@@ -90,6 +91,10 @@
 export default {
   name: "ProductWindow",
   props: {
+    isNegotiable: {
+      type: Boolean,
+      default: false
+    },
     isGift: {
       type: Boolean,
       default: false
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 8f38f0f..9623fcc 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -482,6 +482,7 @@
           :attr="attr"
           :cartNum="cart_num"
           @changeFun="changeFun"
+          :isNegotiable="storeInfo.isNegotiable === 1"
           @gift="gift"
           :isGift="isGift"
         />
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 2c5856c..d1149c6 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -73,7 +73,7 @@
           <view class="text">
             <view class="name more-t">{{ item.storeName }}</view>
             <view class="vip acea-row row-between-wrapper">
-              <view class="ai-end" :class="{'flex': force2Decimal(item.price).length < 6}">
+              <view v-if="!item.isNegotiable" class="ai-end" :class="{'flex': force2Decimal(item.price).length < 6}">
                 <view class="money">
                   ￥
                   <text class="num" v-if="item.vipPrice && item.vipPrice > 0">{{ force2Decimal(item.vipPrice) }}</text>
@@ -81,6 +81,7 @@
                 </view>
                 <view class="vip-money">￥{{ force2Decimal(item.otPrice) }}</view>
               </view>
+              <view v-else class="money">价格面议</view>
               <view class="" @click.stop="addToCart(item)">
                 <image class="logo" :src="webUrl+'/orderIcon/组 355.png'" mode="" style="margin-right:0; width: 34rpx; height:34rpx"/>
               </view>
diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
index ca89ea1..66a3887 100644
--- a/pages/user/History/index.vue
+++ b/pages/user/History/index.vue
@@ -45,7 +45,7 @@
                 </view>
                 <view class="more-t v12-font-20 v12-mt-2">{{ historyItem.storeName }}</view>
                 <view class="v12-justify-between v12-mt-2 price">
-                  <view class="v12-font-bold v12-primary-text" :class="{'v12-align-center': (historyItem.price).toString().length < 5 && (historyItem.otPrice).toString().length < 5 }">
+                  <view v-if="!historyItem.isNegotiable" class="v12-font-bold v12-primary-text" :class="{'v12-align-center': (historyItem.price).toString().length < 5 && (historyItem.otPrice).toString().length < 5 }">
                     <text class="v12-font-16">￥</text>
                     <text class="v12-font-24 v12-mr-1">{{ historyItem.price }}</text>
                     <view class="ot-price v12-font-weight-400">
@@ -54,6 +54,7 @@
                       <view class="under-line"></view>
                     </view>
                   </view>
+                  <view v-else class="v12-font-26 v12-primary-text v12-font-bold">价格面议</view>
                   <image
                     :src="webUrl+'/orderIcon/组 355.png'"
                     class="icon"
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 10c9fbe..765dad2 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -179,7 +179,7 @@
                   />
                   <view class="">
                     <view class="name more-t">{{ item.storeName }}</view>
-                    <view class="price-line flex ai-center">
+                    <view class="price-line flex ai-center" v-if="!item.isNegotiable">
                       <image
                         :src="webUrl + '/20221118104357701129.png'"
                         class="label"
@@ -187,6 +187,7 @@
                       />
                       <text>￥{{ item.price }}</text>
                     </view>
+                    <view class="v12-primary-text v12-font-26" v-else>价格面议</view>
                   </view>
                   <view class="sales-line flex ai-center">
                     <image
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index 9cf896e..2223e1e 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -86,11 +86,12 @@
           >{{ item['storeName'] }}</view>
           <view class="sub" @click="navToGoods(item)">规格:{{ item['sku'] }}</view>
           <view class="flex jc-between ai-end">
-            <view class="price flex ai-end" @click="navToGoods(item)">
+            <view v-if="!item.isNegotiable" class="price flex ai-end" @click="navToGoods(item)">
               <text style="color:#E92727">￥</text>
               <text style="color:#E92727;font-size: 32rpx;line-height: 48rpx">{{ item['price'] }}</text>
               <text style="margin-left: 10rpx;text-decoration:line-through">￥{{ item['otPrice'] }}</text>
             </view>
+            <view v-else class="v12-primary-text v12-font-26">价格面议</view>
             <view class="cart flex jc-center ai-center">
               <image :src="webUrl+'/20240107224527293534.png'" mode="scaleToFill" @click="addCart(item)"/>
             </view>
diff --git a/wenwan/views/goodsClass.vue b/wenwan/views/goodsClass.vue
index 1801127..3bf2919 100644
--- a/wenwan/views/goodsClass.vue
+++ b/wenwan/views/goodsClass.vue
@@ -52,7 +52,8 @@
 <!--              <text>单位:{{ item.unitName || "" }}</text>-->
             </view>
 <!--            <view class="info-line" style="margin-top: 4rpx">规格:{{ item.storeInfo || "" }}</view>-->
-            <view class="price-line">￥{{ item.price }}</view>
+            <view class="price-line" v-if="!item.isNegotiable">￥{{ item.price }}</view>
+            <view class="price-line" v-else>价格面议</view>
 
           </view>
         </view>