zhengkaixin 5 hónapja
szülő
commit
25ec4cc0f0

+ 15 - 15
App.vue

@@ -89,20 +89,20 @@
 		text-align: center;
 		border-radius: 1px;
 	}
-	@media screen and (min-width: 320px) {
-	   /deep/.u-tabbar__content {
-			height: 45px!important;
-	   }
-	}
-	@media screen and (min-width: 375px) {
-	   /deep/.u-tabbar__content {
-			height: 55px!important;
-	   }
-	}
-	@media screen and (min-width: 425px) {
-	   /deep/.u-tabbar__content {
-			height: 65px!important;
-	   }
-	}
+	// @media screen and (min-width: 320px) {
+	//    /deep/.u-tabbar__content {
+	// 		height: 45px!important;
+	//    }
+	// }
+	// @media screen and (min-width: 375px) {
+	//    /deep/.u-tabbar__content {
+	// 		height: 55px!important;
+	//    }
+	// }
+	// @media screen and (min-width: 425px) {
+	//    /deep/.u-tabbar__content {
+	// 		height: 65px!important;
+	//    }
+	// }
 
 </style>

BIN
assets/img/spring/2025/index1.jpg


BIN
assets/img/spring/2025/index2.png


BIN
assets/img/spring/2025/index3.png


BIN
assets/img/spring/2025/index4.png


BIN
assets/img/spring/2025/index5.png


+ 26 - 8
components/Tabbar.vue

@@ -1,25 +1,23 @@
 <template >
 	<view >
 		<u-tabbar 
-		
+		:class="{
+			springclass:spring
+		}"
 		v-model="myCurrent" :list="tabbarList" 
 		:inactiveColor="inColor" :bgColor="bgColor"
-		:before-switch="beforeSwitch" :activeColor="acColor" :height="elderStatus ? '110rpx' : '100rpx'" :icon-size="elderStatus ? '56rpx' : '40rpx'"></u-tabbar>
+		:before-switch="beforeSwitch" :activeColor="acColor" :height="spring?('120rpx' ):(elderStatus ? '120rpx' : '110rpx')" :icon-size="elderStatus ? '56rpx' : '40rpx'"></u-tabbar>
 		
 	</view>
 </template>
 
 <script>
-	var img1=require('@/assets/img/riLine-vip-crown-2-line.svg')
-	var img2=require('@/assets/img/riFill-vip-crown-2-fill.svg')
 	
-	var img3=require('@/assets/img/buy/riFill-gift-fill.svg')
-	var img4=require('@/assets/img/buy/riLine-gift-line.svg')
-	 
 	 
  	export default {
 		name:"tabbarJob",
 		props:{
+			spring:false,
 			current: 0,
 			elderStatus: false,
 			bgColor: {
@@ -106,7 +104,27 @@
 			},
 			
 		},mounted(){
-			
+			console.log("mountedmountedmountedmountedmounted")
+			if(this.spring){
+				var img1=require('@/assets/img/spring/2025/index2.png')
+				var img2=require('@/assets/img/spring/2025/index3.png')
+				
+				var img3=require('@/assets/img/spring/2025/index4.png')
+				var img4=require('@/assets/img/spring/2025/index5.png')
+				 
+				this.tabbarList[0].iconPath=img1
+				this.tabbarList[0].selectedIconPath=img1
+				this.tabbarList[1].iconPath=img2
+				this.tabbarList[1].selectedIconPath=img2
+				this.tabbarList[2].iconPath=img3
+				this.tabbarList[2].selectedIconPath=img3
+				this.tabbarList[3].iconPath=img4
+				this.tabbarList[3].selectedIconPath=img4
+				this.acColor="red"
+				
+				
+				
+			}
 		},destroyed(){
 			
 		}

+ 1 - 1
config/.env.dev.ud.js

@@ -24,7 +24,7 @@ const UNI_APP = {
 	openId:"oSruR6YkhP7QDroLnZGxWis43Kn0",//zkx
 	//openId:"oSruR6dsG6wrbiQCwyftfgnp5690",//sz
 	//openId:"oSruR6dZcmSM4ATuweZ5fjHGQsiA",//ys
-	openId:"oSruR6RWLdQp-HGmcQgXEy2tNUmw",//家桩
+	//openId:"oSruR6RWLdQp-HGmcQgXEy2tNUmw",//家桩
 	//openId:"oSruR6fYa0yzdMsDinzNOlePTotk",//zq
 	//小鹏管家appid
 	//VUE_APP_WXAPPID:"wx7e70eb62a8459869",

+ 19 - 6
pages/index/activity.vue

@@ -45,10 +45,9 @@
 			</view>
 			
 			
-			<Tabbar v-if="indexStyle.spring" class="springClass" bgColor="" inColor="#fff" acColor="#f9d79e" :current="1"
-				ref="tabbarMain" ></Tabbar>
+		 
 			
-			<Tabbar v-else :current="1" ref="tabbarMain"></Tabbar>
+			<Tabbar  :spring="indexStyle.spring" :current="1" ref="tabbarMain"></Tabbar>
 			
 	</view>
 </template>
@@ -102,9 +101,9 @@
 			spring() {
 				this.springShow=false;
 				try{
-					if(this.carhelp.getConfig().spring2024){
-						var spring2024=this.carhelp.getConfig().spring2024
-						var sz=spring2024.split(',')
+					if(this.carhelp.getConfig().spring2025){
+						var spring2025=this.carhelp.getConfig().spring2025
+						var sz=spring2025.split(',')
 						if(sz&&sz.length==2){
 							var time1=new Date(sz[0])
 							var time2=new Date(sz[1])
@@ -343,4 +342,18 @@
 			}
 		}
 	}
+	/deep/.springclass{
+		.u-tabbar__content__item{
+			.u-icon__img {
+			  width:56rpx !important;
+			  height:56rpx !important
+			}
+		}
+		.u-tabbar__content__item:nth-child(2){
+			.u-icon__img {
+			  width:72rpx !important;
+			  height:72rpx !important
+			}
+		}
+	}
 </style>

+ 29 - 10
pages/index/index.vue

@@ -839,10 +839,9 @@
 			</view>
 		</u-modal>
 
-		<Tabbar v-if="indexStyle.spring" class="springClass" bgColor="" inColor="#fff" acColor="#f9d79e" :current="0"
-			ref="tabbarMain" ></Tabbar>
+		
 
-		<Tabbar v-else :current="0" ref="tabbarMain" ></Tabbar>
+		<Tabbar  :spring="indexStyle.spring" :current="0" ref="tabbarMain" ></Tabbar>
 	</view>
 </template>
 
@@ -936,7 +935,7 @@
 					noticeBarBgColor: "#fff",
 					noticeBarColor: "#FF3D00",
 					backgroundClass: "background",
-					spring: false,
+					spring: true,
 				}
 			}
 		},
@@ -1089,15 +1088,17 @@
 			spring() {
 				this.springShow=false;
 				try{
-					if(this.carhelp.getConfig().spring2024){
-						var spring2024=this.carhelp.getConfig().spring2024
-						var sz=spring2024.split(',')
+					if(this.carhelp.getConfig().spring2025){
+						var spring2025=this.carhelp.getConfig().spring2025
+						var sz=spring2025.split(',')
 						if(sz&&sz.length==2){
 							var time1=new Date(sz[0])
 							var time2=new Date(sz[1])
 							var time0=new Date()
+							
 							if(time0>time1&&time0<time2){
 								this.springShow=true;
+								
 							}
 						}
 					}
@@ -1113,7 +1114,8 @@
 				this.indexStyle.noticeBarBgColor = "#C00000"
 				this.indexStyle.noticeBarColor = "#FFD695"
 				this.indexStyle.backgroundClass = "background-spring"
-				this.indexStyle.spring = true;
+				this.indexStyle.spring = true;
+				
 				if (this.activityList.length) {
 					this.activityList.forEach(item => {
 						if (item.clickUrl == '#/pages/discountCard/productDetails') {
@@ -2362,7 +2364,7 @@
 		//padding-top: 28rpx;
 
 		.backgroundClass {
-			background-image: url('@/assets/img/spring/indexBg.png');
+			background-image: url('@/assets/img/spring/2025/index1.jpg');
 
 			padding-top: 50rpx;
 
@@ -3487,5 +3489,22 @@
 		to {
 			transform: rotate(360deg);
 		}
-	}
+	}
+	
+	/deep/.springclass{
+		.u-tabbar__content__item{
+			.u-icon__img {
+			  width:56rpx !important;
+			  height:56rpx !important
+			}
+		}
+		.u-tabbar__content__item:nth-child(1){
+			.u-icon__img {
+			  width:72rpx !important;
+			  height:72rpx !important
+			}
+		}
+	}
+	
+	
 </style>

+ 19 - 7
pages/searchPile/searchPile.vue

@@ -494,11 +494,9 @@
 		</view>
 
 		
-		<Tabbar v-if="indexStyle.spring" class="springClass" bgColor="" inColor="#fff" 
-		acColor="#f9d79e" :current="2"
-			ref="tabbarMain" ></Tabbar>
+	 
 		
-		<Tabbar v-else :current="2" ref="tabbarMain" ></Tabbar>
+		<Tabbar  :spring="indexStyle.spring" :current="2" ref="tabbarMain" ></Tabbar>
 	</view>
 </template>
 
@@ -732,9 +730,9 @@ import {
 			spring() {
 				this.springShow=false;
 				try{
-					if(this.carhelp.getConfig().spring2024){
-						var spring2024=this.carhelp.getConfig().spring2024
-						var sz=spring2024.split(',')
+					if(this.carhelp.getConfig().spring2025){
+						var spring2025=this.carhelp.getConfig().spring2025
+						var sz=spring2025.split(',')
 						if(sz&&sz.length==2){
 							var time1=new Date(sz[0])
 							var time2=new Date(sz[1])
@@ -1829,5 +1827,19 @@ import {
 				margin-top: 12rpx;
 			}
 		}
+	}
+	/deep/.springclass{
+		.u-tabbar__content__item{
+			.u-icon__img {
+			  width:56rpx !important;
+			  height:56rpx !important
+			}
+		}
+		.u-tabbar__content__item:nth-child(3){
+			.u-icon__img {
+			  width:72rpx !important;
+			  height:72rpx !important
+			}
+		}
 	}
 </style>

+ 20 - 6
pages/user/index.vue

@@ -398,10 +398,9 @@
 			</view>
 		</u-mask>
 
-		<Tabbar v-if="indexStyle.spring" class="springClass" bgColor="" inColor="#fff" acColor="#f9d79e" :current="3"
-			ref="tabbarMain"></Tabbar>
+		
 
-		<Tabbar v-else :current="3" ref="tabbarMain"></Tabbar>
+		<Tabbar  :spring="indexStyle.spring" :current="3" ref="tabbarMain"></Tabbar>
 
 	</view>
 </template>
@@ -598,9 +597,9 @@
 			spring() {
 				this.springShow = false;
 				try {
-					if (this.carhelp.getConfig().spring2024) {
-						var spring2024 = this.carhelp.getConfig().spring2024
-						var sz = spring2024.split(',')
+					if (this.carhelp.getConfig().spring2025) {
+						var spring2025 = this.carhelp.getConfig().spring2025
+						var sz = spring2025.split(',')
 						if (sz && sz.length == 2) {
 							var time1 = new Date(sz[0])
 							var time2 = new Date(sz[1])
@@ -1561,5 +1560,20 @@
 		justify-content: center;
 		height: 100%;
 
+	}
+	
+	/deep/.springclass{
+		.u-tabbar__content__item{
+			.u-icon__img {
+			  width:56rpx !important;
+			  height:56rpx !important
+			}
+		}
+		.u-tabbar__content__item:nth-child(4){
+			.u-icon__img {
+			  width:72rpx !important;
+			  height:72rpx !important
+			}
+		}
 	}
 </style>