From 650ac343e97897532929010ab2992a8c232d3315 Mon Sep 17 00:00:00 2001
From: xh-pan1 <xh-pan1@hnair.com>
Date: Mon, 19 Feb 2024 06:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvasShow/basics/classifyHeader/app/index.vue | 35 ++++++++++++--------
 pages/tabbar/index/component/FixedHead.vue         | 13 +++++++-
 pages/tabbar/index/index.vue                       | 38 ++++++++++++++++------
 3 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/components/canvasShow/basics/classifyHeader/app/index.vue b/components/canvasShow/basics/classifyHeader/app/index.vue
index 0def293..0a9257e 100644
--- a/components/canvasShow/basics/classifyHeader/app/index.vue
+++ b/components/canvasShow/basics/classifyHeader/app/index.vue
@@ -72,28 +72,37 @@ export default {
         display: flex;
         flex-wrap: nowrap;
         justify-content: space-between;
+		padding-left: 20upx;
+		padding-right: 20upx;
         .li{
           flex: 1 0 auto;
-          margin-left: 36upx;
+          margin-left: 5upx;
+		  margin-right: 5upx;
           font-size: 30upx;
-          color: #999999;
+          color: #252744;
           position: relative;
-          padding-bottom: 18upx;
+          padding-bottom: 15upx;
+		  padding-left: 27upx;
+		  padding-right: 27upx;
+		  padding-top: 15upx;
           text-align: center;
           &:first-child{
             margin-left: 0;
           }
           &.on{
-            &:after{
-              content: '';
-              width: 100%;
-              height: 4upx;
-              background: #C5AA7B;
-              position: absolute;
-              left: 0;
-              bottom: 0;
-            }
-            font-weight:bold;
+            // &:after{
+            //   content: '';
+            //   width: 100%;
+            //   height: 4upx;
+            //   background: #252744;
+            //   position: absolute;
+            //   left: 0;
+            //   bottom: 0;
+            // }
+			background: #252744;
+			box-shadow: 0upx 7upx 14upx 0upx #C5C8ED;
+			border-radius: 40upx;
+			color: white;
           }
         }
       }
diff --git a/pages/tabbar/index/component/FixedHead.vue b/pages/tabbar/index/component/FixedHead.vue
index d547497..d8ba07b 100644
--- a/pages/tabbar/index/component/FixedHead.vue
+++ b/pages/tabbar/index/component/FixedHead.vue
@@ -23,7 +23,12 @@
       >
         <!-- logo -->
         <view class="logo_box">
-          <image src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png" />
+          <!-- <image src="https://wechat.hnthee.com/ceres-local-file/image/logo_wechat.png" /> -->
+		  <image v-if="componentContent.logoType === 1" class="logo"
+		         :src="componentContent.imageUrl"
+		         mode="heightFix"></image>
+		  <view v-else class="h3" 
+		  :style="{fontSize:componentContent.fontSizeNum+'px',fontWeight:componentContent.textFontW,color:componentContent.titColor}">{{componentContent.title}}</view>
         </view>
         <!-- 右侧搜索 -->
         <template>
@@ -70,6 +75,11 @@ export default {
   components: {
     DefaultHead
   },
+  props: {
+    componentContent: {
+      type: Object,
+    },
+  },
   data() {
     return {
       // 头部对象
@@ -155,6 +165,7 @@ export default {
       .logo_box {
         width: 265rpx;
         height: 50rpx;
+		margin-left: 24rpx;
       }
 
       .search_box {
diff --git a/pages/tabbar/index/index.vue b/pages/tabbar/index/index.vue
index 44bb147..9eecf52 100644
--- a/pages/tabbar/index/index.vue
+++ b/pages/tabbar/index/index.vue
@@ -1,8 +1,9 @@
 <template>
   <div class="hom-page home_page_content">
     <!-- 头部 -->
-    <FixedHead v-if="isShowCavansHead">
-      <category-list @tabChange="tabChange"></category-list>
+    <FixedHead v-if="isShowCavansHead"
+	:componentContent="headComponentsData.componentContent">
+      <category-list @tabChange="tabChange" v-if="false"></category-list>
     </FixedHead>
     <!-- 首页画布骨架屏 -->
 
@@ -81,7 +82,24 @@ export default {
       terminal: API.terminal,
       activeTab: 0,
       componentsData: [],
-	  headComponentsData : {},
+	  headComponentsData : {
+				title: '',
+				iconClass: 'icon-dianputoubu',
+				type: 'header',
+				undraggable: true, // 不可拖动
+				onlyAdmin: true, // 平台端显示
+				onlyApp: true, // 只在app显示
+				componentContent: {
+				  logoType:1,
+				  imageUrl: '',
+				  title: '',
+				  fontSizeNum: '',
+				  textFontW: 'normal',
+				  titColor: '#CD5353',
+				  showTitle: 1,
+				  useSelfTitle : 2,
+				}
+			},
       typeId: 1,
       scrollTop: 0
     }
@@ -109,7 +127,12 @@ export default {
       if (JSON.stringify(data) !== '{}') {
         this.componentsData = JSON.parse(data.json)
 		let headIndex = this.componentsData.findIndex(item => item.type==='header')
-		if(headIndex < 0){
+		this.headComponentsData = {}
+		if(headIndex >= 0){
+			this.headComponentsData = this.componentsData[headIndex]
+			this.componentsData.splice(headIndex, 1)
+		}
+		if(!this.headComponentsData.title){
 			this.headComponentsData = {
 				title: '商城头部',
 				iconClass: 'icon-dianputoubu',
@@ -128,13 +151,8 @@ export default {
 				  useSelfTitle : 2,
 				}
 			}
-		}else{
-			this.headComponentsData = this.componentsData[headIndex]
-		}
-		if(this.headComponentsData == 2 && headIndex >= 0){
-			this.componentsData.splice(headIndex, 1)
 		}
-		this.isShowCavansHead = this.headComponentsData == 2
+		this.isShowCavansHead = true
         this.isFirst = false
         this.loading = false
       }