companyProjecet.git

			@@ -104,13 +104,16 @@
			<view class="d-s-c pr ww100 mb16">
			<view class="new-price theme-price">
			<text class="fn mr10" v-if="detail.is_user_grade">会员价</text>
			<text>¥</text>
			<text class="num">{{ detail.product_sku.product_price }}</text>
			<text class="num" v-if="detail.spec_type == 20 && detail.product_sku.product_price != detail.product_max_price">
			-{{ detail.product_max_price }}
			</text>
			<text v-if="detail.is_price_negotiable">价格面议</text>
			<template v-else>
			<text>¥</text>
			<text class="num">{{ detail.product_sku.product_price }}</text>
			<text class="num" v-if="detail.spec_type == 20 && detail.product_sku.product_price != detail.product_max_price">
			-{{ detail.product_max_price }}
			</text>
			</template>
			</view>
			<text v-if="underline_price_show" class="old-price ">¥{{ detail.product_sku.line_price }}</text>
			<text v-if="underline_price_show && !detail.is_price_negotiable" class="old-price ">¥{{ detail.product_sku.line_price }}</text>
			<!--分享-->
			<view class="share-box">
			<button @click="showShare">
			@@ -313,9 +316,9 @@
			<button class="add-cart-no" style="border-radius: 40rpx;margin-right: 20rpx;">暂未开始售卖</button>
			</template>
			<template v-else>
			<button v-if="!room_id == true && !is_virtual && !ispresale" class="add-cart" @click="openPopup('card')">加入购物车</button>
			<button v-if="!room_id == true && !is_virtual && !ispresale" class="add-cart" @click="handlePriceNegotiableAction('card')">加入购物车</button>
			<button v-else class="add-cart-no">加入购物车</button>
			<button class="buy" v-if="!ispresale" @click="openPopup('order')">立即购买</button>
			<button class="buy" v-if="!ispresale" @click="handlePriceNegotiableAction('order')">立即购买</button>
			<button class="buy ispresale" v-else @click="openPopup('deposit')">
			<template v-if="activeName == 'advance'">
			<view class="f28">支付定金</view>
			@@ -846,6 +849,27 @@
			}
			},

			/处理价格面议商品的操作/
			handlePriceNegotiableAction(actionType) {
			// 如果是价格面议商品，提示联系客服
			if (this.detail.is_price_negotiable) {
			uni.showModal({
			title: '温馨提示',
			content: '该商品为价格面议商品，请联系客服咨询具体价格',
			confirmText: '联系客服',
			cancelText: '取消',
			success: (res) => {
			if (res.confirm) {
			this.openService();
			}
			}
			});
			} else {
			// 非价格面议商品，正常执行原逻辑
			this.openPopup(actionType);
			}
			},

			/关闭客服/
			closeMpservice() {
			this.isMpservice = false;
			@@ -860,6 +884,7 @@
			if(store_id){
			this.gotoPage('pages2/goodstore/detail?store_id=' + store_id);
			}else{
			uni.setStorageSync('shop_supplier_id',self.shop_supplier_id)
			self.gotoPage('/pages/shop/shop?shop_supplier_id=' + self.shop_supplier_id);
			}

			@@ -1092,7 +1117,8 @@
			border-top-left-radius: 40rpx;
			border-bottom-left-radius: 40rpx;
			margin-left: 17rpx;
			@include font_color('text_color2') @include background_linearmore('cart_left1', 'cart_left2', 'left_deg', 0%, 100%);
			@include font_color('text_color2');
			@include background_linearmore('cart_left1', 'cart_left2', 'left_deg', 0%, 100%);
			}

			.btns-wrap button.add-cart-no {
			@@ -1115,7 +1141,8 @@
			border-top-right-radius: 40rpx;
			border-bottom-right-radius: 40rpx;
			margin-right: 30rpx;
			@include font_color('text_color1') @include background_linearmore('cart_right1', 'cart_right2', 'right_deg', 0%, 100%);
			@include font_color('text_color1');
			@include background_linearmore('cart_right1', 'cart_right2', 'right_deg', 0%, 100%);
			}
			.btns-wrap button.buy.ispresale {
			line-height: 1;