From 526122e42148b7f0acb10282a484834b17801488 Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Tue, 7 Mar 2023 16:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy-components/diy-goods-list.vue  | 33 ++++++++++++++++++-
 .../diy-components/diy-many-goods-list.vue    |  5 ++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/components/diy-components/diy-goods-list.vue b/components/diy-components/diy-goods-list.vue
index 93aa44f..a0adb1b 100644
--- a/components/diy-components/diy-goods-list.vue
+++ b/components/diy-components/diy-goods-list.vue
@@ -19,6 +19,10 @@
 						:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
 						{{ item.goods_name }}
 					</view>
+          <view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
+            <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
+            {{ parseFloat(item.give_diamond) }}颗钻石
+          </view>
 					<template v-if="goodsValue.tag">
 						<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
 							<text class="hollow-tag">{{ item.label_name }}</text>
@@ -106,6 +110,10 @@
 						:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
 						{{ item.goods_name }}
 					</view>
+          <view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
+            <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
+            {{ parseFloat(item.give_diamond) }}颗钻石
+          </view>
 					<template v-if="goodsValue.tag">
 						<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
 							<text class="hollow-tag">{{ item.label_name }}</text>
@@ -344,6 +352,29 @@
 </script>
 
 <style lang="scss" scoped>
+.give-diamond{
+  width: 145rpx;
+  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;
+  }
+
+}
 	.goods-list {
 		overflow: hidden;
 		.goods-item {
@@ -420,7 +451,7 @@
 
 			.buy-btn {
 				color: #fff;
-				background-color: $base-color;
+				background-color: #F13453;
 				color: var(--btn-text-color);
 				border-radius: 50rpx;
 				font-size: $font-size-tag;
diff --git a/components/diy-components/diy-many-goods-list.vue b/components/diy-components/diy-many-goods-list.vue
index b9288fb..64eed3a 100644
--- a/components/diy-components/diy-many-goods-list.vue
+++ b/components/diy-components/diy-many-goods-list.vue
@@ -14,7 +14,7 @@
 					<view class="split-line" v-if="index > 0"></view>
 					<view class="cate">
 						<view class="name">{{ item.title }}</view>
-						<view class="desc" :class="{ 'color-base-bg': index == cateIndex && item.desc }">{{ item.desc }}</view>
+						<view class="desc" :class="{ 'color-base-bg-red': index == cateIndex && item.desc }">{{ item.desc }}</view>
 					</view>
 				</view>
 			</view>
@@ -263,6 +263,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.color-base-bg-red {
+  background-color: #F13453 !important;
+}
 scroll-view {
 	width: 100%;
 	white-space: nowrap;