From f332295ba5592f3c1781fd72266d99b6c5a7e882 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 19 Jan 2022 14:26:35 +0800
Subject: [PATCH] 自定义卡项模版修改

---
 components/diy_serviceCard/diy_serviceCard.js   | 35 ++++++++++++++++++++++++++++++++---
 components/diy_serviceCard/diy_serviceCard.wxml |  3 ++-
 components/diy_serviceCard/diy_serviceCard.wxss |  7 +++++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/components/diy_serviceCard/diy_serviceCard.js b/components/diy_serviceCard/diy_serviceCard.js
index 7b93b05..5d74dd5 100644
--- a/components/diy_serviceCard/diy_serviceCard.js
+++ b/components/diy_serviceCard/diy_serviceCard.js
@@ -55,6 +55,7 @@ Component({
 
 	lifetimes: {
 		attached: function() {
+			let myStyle = '';
 			//要兼容性的写法，因为有些商家都还未更新商品分组的最新的效果~~3.0公众号的html页面所以不用兼容写法	
 			var nav_item = this.data.object;
 			var nav_list = this.data.object.nav_list;
@@ -102,12 +103,40 @@ Component({
 			if (this.data.object.goodsnum) hei += 80;
 
 			if (this.data.object.title_color) {
-				this.data.title_class = `color:${this.data.object.title_color};`
+				// this.data.title_class = `color:${this.data.object.title_color};`
 			}
 
-			if (this.data.object.title_font_size) {
-				this.data.title_class = this.data.title_class.concat(`font-size:${this.data.object.title_font_size}px;`)
+			if (this.data.object.font_size) {
+				this.data.title_class = this.data.title_class.concat(`font-size:${this.data.object.font_size}px;`);
 			}
+			
+			if (this.data.object.font_color) {
+				this.data.title_class = this.data.title_class.concat(`color:${this.data.object.font_color};`);
+			}
+			
+			if (this.data.object.acitve_font_color) {
+				this.setData({
+					myStyle: `
+						--border-color:${this.data.object.acitve_font_color};
+						--font-color:${this.data.object.acitve_font_color};
+					`,
+				});	
+			}
+			
+			if (this.data.object.list_border_type == 0) {
+				this.data.title_class = this.data.title_class.concat('border-radius: 80rpx;');
+			}
+			
+			if (this.data.object.list_border_type == 1) {
+				this.data.title_class = this.data.title_class.concat('border-radius: 0;');
+			}
+			
+			if (this.data.object.list_border_type == 2) {
+				this.data.title_class = this.data.title_class.concat('border-width: 0;');
+			}
+			
+			
+			
 			this.setData({
 				swiper_hei: hei,
 				title_class: this.data.title_class,
diff --git a/components/diy_serviceCard/diy_serviceCard.wxml b/components/diy_serviceCard/diy_serviceCard.wxml
index 0ef3365..92b3ec9 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxml
+++ b/components/diy_serviceCard/diy_serviceCard.wxml
@@ -12,8 +12,9 @@
 </block> -->
 
 <!-- 服务卡项顶部标题 -->
+<!-- class="scroll-view-item {{index == title_index ? 'active':''}}" -->
 <scroll-view scroll-x="true" enhanced="true" fast-deceleration="true" show-scrollbar="false" wx:if="{{is_nav}}">
-	<view class="flex fs28">
+	<view class="flex" style="{{myStyle}}">
 		<view
 		wx:for="{{nav_list}}"
 		data-index="{{index}}"
diff --git a/components/diy_serviceCard/diy_serviceCard.wxss b/components/diy_serviceCard/diy_serviceCard.wxss
index 19c0859..bf5ddd8 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxss
+++ b/components/diy_serviceCard/diy_serviceCard.wxss
@@ -1,4 +1,7 @@
 /* pages/diy_zs/diy_zs.wxss */
+:root {
+	
+}
 
 .zwp_3 {
   margin-top: 10rpx;
@@ -920,8 +923,8 @@ top: 10rpx;
 }
 
 .scroll-view-item.active {
-	color: #f2270c;
-	border-color: #f2270c !important;
+	color: var(--font-color) !important;
+	border-color: var(--border-color) !important;
 }
 
 
--
libgit2 0.21.4