Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tongli_WeChat

compoents/cartData.vue

@@ -444,7 +444,7 @@
 			font-weight: 400;
 			font-size: 34rpx;
 			color: #FFFFFF;
-			line-height: 42rpx;
+			line-height: 47rpx;
 			text-align: center;
 		}
 		.ctrl.disabled{

pages.json

@@ -65,7 +65,7 @@
 			{
 				"path": "techan/detail",
 				"style": {
-					"navigationBarTitleText": "文创特产详情"
+					"navigationBarTitleText": "水市风物"
 				}
 			},
 			{

subPackages/hotelHomestay/detail.vue

@@ -571,7 +571,7 @@
 		.phone-container{
 			width: 93rpx;
 			height: 107rpx;
-			background: #E8F6EB;
+			background: #F2F2F2;
 			border-radius: 20rpx;
 			font-family: PingFang SC;
 			font-weight: 500;

subPackages/hotelHomestay/order.vue

@@ -689,7 +689,7 @@
 			font-weight: 400;
 			font-size: 34rpx;
 			color: #FFFFFF;
-			line-height: 42rpx;
+			line-height: 47rpx;
 			text-align: center;
 		}
 		.ctrl.disabled{

subPackages/hotelHomestay/selectCalendar.vue

@@ -3,7 +3,7 @@
 
 		<!--如果需要solt-->
 		<!--用法二：当mode=2、3的模式下分别为（酒店\往返）的离开日期-->
-		<Calendar @click="tip" :is-show="true" :start-date="startDate" :end-date="endDate" mode="2" :title="'日期选择'"
+		<Calendar class="custom-calendar" @click="tip" :is-show="true" :start-date="startDate" :end-date="endDate" mode="2" :title="'日期选择'"
 			@callback="getDate" :transition="'slide'" :theme-color="'#515150'" />
 		<div class="btn" @click="determine()">
 			确定
@@ -55,7 +55,7 @@
 		}
 	}
 </script>
-<style scoped>
+<style scoped lang="scss">
 	.btn {
 		width: 697rpx;
 		height: 80rpx;
@@ -74,4 +74,14 @@
 		left: 50%;
 		transform: translate(-348.5rpx, 0);
 	}
+	
+	/deep/ .custom-calendar {
+		.calendar-tz{
+			padding: 0 10rpx;
+		}
+		.tips {
+			display: none;
+		}
+	}
+	
 </style>

subPackages/techan/order.vue

@@ -105,7 +105,7 @@
 				</view>
 				<view class="num-box">
 					<!-- <image src="https://yjdtadmin.sz-trip.com/uploads/20231225/4b61998e657784d08c8dfdb08da84553.png" mode="aspectFill" class="ctrl" @click="reduce()"></image> -->
-					<view :class="['ctrl',sku.skuInfo.buyNum>1&&info.goods.length>1?'':'disabled']" @click="reduce(sku.skuInfo,index)">-</view>
+					<view :class="['ctrl',sku.skuInfo.buyNum>1||info.goods.length>1?'':'disabled']" @click="reduce(sku.skuInfo,index)">-</view>
 					<input class="num" type="text" v-model="sku.skuInfo.buyNum" :disabled='true' />
 					<view :class="['ctrl']" @click="plus(sku.skuInfo)">+</view>
 				</view>
@@ -881,7 +881,7 @@ view {
 			font-weight: 400;
 			font-size: 34rpx;
 			color: #FFFFFF;
-			line-height: 42rpx;
+			line-height: 47rpx;
 			text-align: center;
 		}
 		.ctrl.disabled{

subPackages/techan/techanList.vue

@@ -446,7 +446,7 @@
 			width: 100%;
 			height: 66rpx;
 			padding: 4rpx;
-			background: #EAF6F9;
+			background: #F2F2F2;
 			border-radius: 13rpx;
 			border: 1px solid #525251;
 			
@@ -738,7 +738,7 @@
 			height: 78rpx;
 			text-align: center;
 			line-height: 78rpx;
-			background: linear-gradient(-90deg, #F84A56, #FF9834);
+			background: #C3282E;
 			border-radius: 40rpx;
 					
 			font-size: 34rpx;

subPackages/ticketBooking/detail.vue

@@ -1006,4 +1006,13 @@
 		}
 	}
 	
+	/deep/ .uni-calendar-item--checked{
+		background: #12293C !important;
+		border-radius: 50%;
+		
+		.uni-calendar-item--extra{
+			color: white !important;
+		}
+	}
+
 </style>

subPackages/ticketBooking/order.vue

@@ -1788,4 +1788,25 @@
 		}
 	}
 	
+	/deep/ .uni-calendar-item--extra{
+		color: #333 !important;
+	}
+	/deep/ .uni-calendar-item--isDay{
+		background: #12293C !important;
+		border-radius: 50%;
+		
+		.uni-calendar-item--extra{
+			color: white !important;
+		}
+	}
+	
+	/deep/ .uni-calendar-item--checked{
+		background: #12293C !important;
+		border-radius: 50%;
+		
+		.uni-calendar-item--extra{
+			color: white !important;
+		}
+	}
+	
 </style>