From 067f0cb3d1132b4c35b8a4e1d822b43e9dbcc508 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 7 Mar 2023 15:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=B5=A0=E9=80=81=E7=9A=84=E9=92=BB=E7=9F=B3=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue | 45 +++++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 040fb04..5108070 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -56,7 +56,7 @@
 						</template>
 						<template v-else>
 							<template v-if="goodsSkuDetail.member_price > 0">
-								<view class="member-vip-wrap"><image :src="$util.img('public/uniapp/goods/member_vip.png')" mode="aspectFit"></image></view>
+								<!--<view class="member-vip-wrap"><image :src="$util.img('public/uniapp/goods/member_vip.png')" mode="aspectFit"></image></view>-->
 								<text class="price-symbol price-font">{{ $lang('common.currencySymbol') }}</text>
 								<text class="price price-font">
 									{{
@@ -73,7 +73,7 @@
 									}}
 								</text>
 								<view class="member-price-wrap">
-									<text class="unit price-font">原价</text>
+									<!--<text class="unit price-font">原价</text>-->
 									<text class="unit price-font">{{ $lang('common.currencySymbol') }}</text>
 									<text class="money price-font">{{ goodsSkuDetail.price }}</text>
 								</view>
@@ -95,13 +95,17 @@
 								</text>
 							</template>
 						</template>
-						<view class="market-price-wrap" v-if="goodsSkuDetail.market_price_show">
-							<text class="unit price-font" v-if="(showDiscount && goodsSkuDetail.price > 0) || goodsSkuDetail.market_price > 0">
-								{{ $lang('common.currencySymbol') }}
-							</text>
-							<text class="money price-font" v-if="showDiscount && goodsSkuDetail.price > 0">{{ goodsSkuDetail.price }}</text>
-							<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{ goodsSkuDetail.market_price }}</text>
-						</view>
+						<!--<view class="market-price-wrap" v-if="goodsSkuDetail.market_price_show">-->
+						<!--	<text class="unit price-font" v-if="(showDiscount && goodsSkuDetail.price > 0) || goodsSkuDetail.market_price > 0">-->
+						<!--		{{ $lang('common.currencySymbol') }}-->
+						<!--	</text>-->
+						<!--	<text class="money price-font" v-if="showDiscount && goodsSkuDetail.price > 0">{{ goodsSkuDetail.price }}</text>-->
+						<!--	<text class="money price-font" v-else-if="goodsSkuDetail.market_price > 0">{{ goodsSkuDetail.market_price }}</text>-->
+						<!--</view>-->
+            <view class="give-diamond" v-if="parseFloat(goodsSkuDetail.give_diamond) > 0">
+              <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
+              {{ parseFloat(goodsSkuDetail.give_diamond) }}颗钻石
+            </view>
 						<view class="follow-and-share">
 							<text class="follow iconfont icon-share" @click="openSharePopup()"></text>
 							<text class="share iconfont" @click="editCollection()" :class="whetherCollection == 1 ? 'icon-likefill color-base-text' : 'icon-guanzhu'"></text>
@@ -489,6 +493,29 @@ export default {
 <style lang="scss">
 @import '@/common/css/goods_detail.scss';
 @import './public/css/detail.scss';
+
+.give-diamond{
+  display: inline-flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  justify-content: center;
+  align-items: center;
+  border: 2rpx solid #f13453;
+  color: #f13453;
+  font-size: 24rpx;
+  height: 38rpx;
+  line-height: 38rpx;
+  padding: 0 15rpx;
+  border-radius: 60rpx;
+  margin-left: 30rpx;
+  .give-diamond-image{
+    width: 22rpx!important;
+    height: 22rpx!important;
+    margin-right: 5rpx;
+  }
+
+}
 </style>
 <style scoped>
 /deep/ .action-icon-wrap .iconfont.icon-shouye1 {