1

App.vue

@@ -14,4 +14,8 @@
 
 <style>
 	/*每个页面公共css */
+	.commonBtn{
+		background: #EC0F0A !important;
+		color: #ffffff !important;
+	}
 </style>

components/timeSelect/timeSelect.vue

@@ -28,7 +28,7 @@
 					  <view style="height: 120rpx;"></view>
 				    </view>
 				  </view>
-				  <view  class="time-select-popup-body-button fenxiang newcsbtn" style="width: 100%" :style="{background:'#'+themeColor}" @click="handleSelect">完成</view>
+				  <view  class="time-select-popup-body-button fenxiang newcsbtn commonBtn" style="width: 100%"  @click="handleSelect">完成</view>
 				</view>
 			</view>
 			

pages/activity/jkDetail.vue

@@ -141,7 +141,7 @@
 					<view class="shareTxt">分享</view>
 				</button> -->
 				<!-- 状态1未开始 2进行中3已结束 -->
-				<view class="bottomBtn" v-if="info.state==2&&info.groupType!=1" @click="signUp" :style="{background:'#'+themeColor}">
+				<view class="bottomBtn commonBtn" v-if="info.state==2&&info.groupType!=1" @click="signUp" >
 				  <span v-if="info.payType==1">￥{{info.money}} &nbsp; 立即抢购</span>
 				  <span v-else>立即报名</span>
 				</view>
@@ -188,7 +188,7 @@
 				</view>
 				<view class="bmTtnBox">
 					<view style="height: 1rpx;"></view>
-					<view class="bmBtn" @click="submitOrder" :style="{background:'#'+themeColor}">
+					<view class="bmBtn commonBtn" @click="submitOrder" >
 						<span v-if="groupOwner">
 							￥{{info.groupMoney}} &nbsp;  {{groupOwner==1?'发起拼团':'立即拼团'}}  
 						</span>

pages/index/confirmRescue.vue

@@ -98,7 +98,7 @@
 		<view class="heji">
 		  <!-- <span>合计</span> <span  style="font-size: 22rpx;color: #EC0F0A;">￥</span> <span style="font-size: 32rpx;color: #EC0F0A;" >759</span> -->
 		</view>
-	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="submitOrder">提交订单</view>
+	  <view  class="newyyBotbutton commonBtn" @click="submitOrder">提交订单</view>
 	  <!-- yuyue 老预约-->
 	</view>
 	

pages/index/confirmYuyue.vue

@@ -57,7 +57,7 @@
 			<view class="bottom-container-price"><span class="qianhaospan" v-if="totalPrice" >￥</span> {{totalPrice}} <span></span></view>
 			<view class="ckj">参考价格（到店支付）</view>
 		</view>
-	  <view  class="newyyBotbutton" :style="{background:'#'+themeColor}" @click="yuyue">立即预约</view>
+	  <view  class="newyyBotbutton commonBtn"  @click="yuyue">立即预约</view>
 	</view>
 	<timeSelect ref="timeSelect" :stationID="stationID" :timedata="timedata" :themeColor="themeColor" @changeTime="changeTime"></timeSelect>
 </view>

pages/index/index.vue

@@ -1980,7 +1980,7 @@ color: #EC0F0A;margin-right: 10rpx; border-radius: 6rpx;
 		padding-left: 10rpx;
 	}
 	.bxlineMs2{
-		line-height: 38rpx;
+		line-height: 40rpx;
 		color: #999999;
 		font-size: 24rpx;
 		padding-left: 10rpx;

pages/index/onlineBooking.vue

@@ -124,7 +124,7 @@
 
 			</view>
 
-			<view href="javascript:;" :style="{background:'#'+themeColor}" class=" newbottom-container-button"
+			<view href="javascript:;"  class=" newbottom-container-button commonBtn"
 				@click="yuyue">立即预约</view>
 		</view>
 

pages/index/paint.vue

@@ -3,9 +3,13 @@
 		<view class="top" @click="goCarlist">
 			<view class="left">
 				<image :src="carInfo.brandLogo" mode="widthFix" class="brandLogo" v-if="carInfo.brandLogo">
-					<img src="../../static/timg/nocar.png" alt="" class="brandLogo" v-else>
+				<img src="../../static/timg/nocar.png" alt="" class="brandLogo" v-else>
+				<view>
+					<view class="plateNumber">{{carInfo.plateNumber}}</view>
 					<view class="car" v-if="carInfo.carModel">{{carInfo.carModel}}</view>
 					<view class="car" v-else>暂无</view>
+				</view>	
+					
 				</image>
 			</view>
 			<image src="../../static/img/big_rightArrow.png" mode=""
@@ -80,7 +84,7 @@
 					<view class="hejiMs">合计数量：{{selectItemList.length}}</view>
 				</view>
 			</view>
-			<view class="settlement" :style="{background:'#'+themeColor}" @click="sure">确定</view>
+			<view class="settlement commonBtn"  @click="sure">确定</view>
 		</view>
 
 		<view class="caidanTk" v-show="qingdanShow" @click="qingdanShow=false">
@@ -129,6 +133,20 @@
 		},
 		onShow() {
 			this.carInfo = this.$store.state.carInfo
+			if(!this.carInfo){
+				uni.showModal({
+					title: '提示',
+					content: '请先选择车辆',
+					showCancel:false,
+					success: function (res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '../user/addCar/cailist'
+							})
+						} 
+					}
+				});
+			}
 			console.log("车=", this.carInfo);
 		},
 		onLoad() {
@@ -884,4 +902,9 @@
 		display: flex;
 		align-items: center;
 	}
+	.plateNumber{
+		line-height: 40rpx;
+		    margin-left: 10rpx;
+			    font-size: 28rpx;
+	}
 </style>

pages/index/paintSure.vue

@@ -81,7 +81,7 @@
 				<view class="bottomLeftLine">合计 <span>￥</span> <span class="bottomPrice">{{totalMoney}}</span> </view>
 				
 			</view>
-			<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="submit">提交订单</view>
+			<view class="bottomBtn commonBtn"  @click="submit">提交订单</view>
 		</view>
 		
 		<timeSelect ref="timeSelect" :stationID="StationID" :timedata="timedata" @changeTime="changeTime"></timeSelect>

pages/integral/integralConfirm.vue

@@ -26,7 +26,7 @@
 	 	<view class="ktyong"><view>合计 <span class="ktyong1">{{goodsnum*jfgoodsDetail.integral}}</span><span class="ktyong2">积分</span>   </view> 
 	 	   <view class="kyNum">可用积分：{{avaIntegral}}</view>
 	 	</view>
-	 	<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="goBuy">提交订单</view>
+	 	<view class="bottomBtn commonBtn"  @click="goBuy">提交订单</view>
 	 </view>
  </view>
 </template>

pages/integral/integralgoodsDetail.vue

@@ -36,7 +36,7 @@
 	
 	<view class="bottomBox">
 		<view class="ktyong" style="padding-top: 46rpx;">可用 <span class="ktyong1" style="font-weight: 500;">{{avaIntegral}}</span><span class="ktyong2">积分</span> </view>
-		<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="ljbuy">立即兑换</view>
+		<view class="bottomBtn commonBtn"  @click="ljbuy">立即兑换</view>
 		
 	</view>
 	
@@ -99,7 +99,7 @@
 				<view class="ktyong"><view>合计 <span class="ktyong1" style="font-weight: 500;">{{totalIntegral}}</span><span class="ktyong2">积分</span>   </view> 
 				   <view class="kyNum">可用积分：{{avaIntegral}}</view>
 				</view>
-				<view class="bottomBtn" @click="goBuy" :style="{background:'#'+themeColor}">立即兑换</view>
+				<view class="bottomBtn commonBtn" @click="goBuy" >立即兑换</view>
 			</view>
 			
 		</view>

pages/shop/confirm.vue

@@ -73,7 +73,7 @@
 			<view class="bottomLeftLine">合计 <span>￥</span> <span class="bottomPrice">{{totalMoney}}</span> </view>
 			<view class="bottomLeftLine2">总优惠：¥{{yhMoney}}</view>
 		</view>
-		<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="submit">提交订单</view>
+		<view class="bottomBtn commonBtn"  @click="submit">提交订单</view>
 	</view>
 </view>
 </template>

pages/shop/goodsDetail.vue

@@ -128,8 +128,8 @@
 				<image src="../../static/timg/share.png" mode="" class="bottomImg"></image>
 				<view class="bottomTxt">分享</view>
 			</button> -->
-			<view class="bottomBtn"  :style="{background:'#'+themeColor}" @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
-			<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn commonBtn"   @click="ljbuy" v-if="!activityEnd&&info.goodsDownTime">立即购买</view>
+			<view class="bottomBtn commonBtn"  @click="ljbuy" v-if="activityEnd&&!info.goodsDownTime">立即购买</view>
 			<view class="bottomBtn2"  v-if="activityEnd&&info.goodsDownTime">抢购结束</view>
 		</view>
 	</view>
@@ -185,7 +185,7 @@
 			</view>
 			
 			<view class="buybtnBox">
-				<view class="buyBtn" @click="goBuy" :style="{background:'#'+themeColor}">立即购买</view>
+				<view class="buyBtn commonBtn" @click="goBuy" >立即购买</view>
 			</view>
 			
 		</view>

pages/subPack/feedBack.vue

@@ -29,7 +29,7 @@
 		</view>
 
 		<view class="bottom">
-			<view class="shoreDz" :style="{background:'#'+themeColor}"  @click="submit">提交</view>
+			<view class="shoreDz" @click="submit">提交</view>
 		</view>
 	</view>
 </template>

pages/subPack/maintain.vue

@@ -126,14 +126,16 @@
 				</view>
 			</view>
 		</view>
-		<view class="bottomBtn"  @click="goSubmit">立即购买</view>
+		<view class="bottomBtn commonBtn"  @click="goSubmit">立即购买</view>
 	</view>
  </view>
  <!-- 提交订单弹框-->
  <view class="tkBox" v-if="tkShow">
 	 <view class="tkCont">
 		 <view class="tkTop">
-			 <image class="tkImg" src="../../static/timg/noimg.png" mode=""></image>
+			 
+			 <image class="tkImg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode=""></image>
+			 <image class="tkImg" v-else src="../../static/timg/noimg.png" mode=""></image>
 			 <view class="tkNameBox">
 				 <view class="tkName">{{itemDefault.goodsname}}</view>
 				 <view class="goodsPrice">
@@ -166,7 +168,7 @@
 		 </view>
 		 
 		 <view class="tkBottom">
-			 <view class="tkBottomBtn" @click="goSubmit">立即购买</view>
+			 <view class="tkBottomBtn commonBtn" @click="goSubmit">立即购买</view>
 		 </view>
 		 
 	 </view>
@@ -233,7 +235,7 @@
 				this.tkShow=true;
 			},
 			qdTkclose(){
-			  this.qdTkclose=false	
+			  this.tkShow=false	
 			},
 			selectItem(v,item){
 				this.list.forEach(item=>{
@@ -246,6 +248,10 @@
 			  this.itemDefault=v
 			  this.lineItem=item
 			  this.qdNum=1
+			  this.itemDefault.goodsname=this.lineItem.title
+			  this.itemDefault.itemId=this.lineItem.id
+			  this.itemDefault.mainImgUrl=this.lineItem.mainImgUrl
+			  
 			},
 			goCkcar(){
 				uni.navigateTo({
@@ -437,6 +443,7 @@
 .line{
 	background: #FFFFFF;padding: 24rpx;
 	border-radius: 16rpx;margin-bottom: 20rpx;
+	padding-bottom: 4rpx;
 }
 .lineImg{
 	width: 162rpx;
@@ -487,6 +494,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	border: 1px solid #E0E0E0;
 	width: 316rpx;
 	height: 138rpx;
+	    margin-bottom: 20rpx;
 }
 .tcName{
 	font-weight: 500;
@@ -494,6 +502,10 @@ color: #EC0F0A;margin-right: 10rpx;
 	color: #435B6E;
 	line-height: 40rpx;
 	padding-left: 25rpx;padding-top: 24rpx;
+	white-space: nowrap;      /* 确保文本在一行内显示 */
+	  overflow: hidden;         /* 超出容器部分隐藏 */
+	  text-overflow: ellipsis;
+	  max-width: 170rpx;
 }
 .tcTitle{
 	display: flex;
@@ -521,7 +533,7 @@ color: #666666;padding-left: 25rpx;
 }
 .tcBox{
 	display: flex;justify-content: space-between;
-	padding-top: 26rpx;
+	padding-top: 26rpx;flex-wrap: wrap;
 }
 .bottom{
 	width: 100%;
@@ -759,7 +771,7 @@ color: #666E80;
 .tkBottomBtn{
 	width: 661rpx;text-align: center;
 	height: 86rpx;line-height: 86rpx;
-	background: #FCD903;
+	/* background: #FCD903; */
 	border-radius: 43rpx;
 	font-size: 32rpx;
 	color: #110B01;

pages/subPack/maintainItem.vue

@@ -52,12 +52,18 @@
 	 <view class="carTis" v-if="isRecommend!='true'">此套餐可能与爱车不适配</view>
 	 <view class="buyLine">
 	 		 <view class="buyTitle">商品规格</view>
-	 		 <view class="buyData guigeBox">
-				<!-- <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">单次购买</view> -->
-				 <view class="goodsGuige" @click="goodsGuige(item)"
-				 :class="{activeGuige:item.id==itemDefault.id}" v-if="item.isShow==1"
-				  v-for="(item,index) in detail.packageItems">{{item.title}}</view>
+			 <view class="guigeBox">
+				 <scroll-view scroll-x="true" enable-flex="true" class="buyData guigeBox2">
+					 
+					 				<!-- <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">单次购买</view> -->
+					 				 <view class="goodsGuige" @click="goodsGuige(item)"
+					 				 :class="{activeGuige:item.id==itemDefault.id}" v-if="item.isShow==1"
+					 				  v-for="(item,index) in detail.packageItems">{{item.title}}</view>
+					
+				 </scroll-view>
+				 
 			 </view>
+	 		
 	 </view>
 	 <view class="buyLine">
 	 		 <view class="buyTitle">商品数量</view>
@@ -128,7 +134,7 @@
  		<image class="kefuIcon" src="../../static/img2/kefu.png" mode=""></image>
  		<view style="text-align: center;font-size: 20rpx;color: #110B01;">客服</view>
  	</view>
- 		 <view class="Btn" @click="submitFn">立即购买</view>
+ 		 <view class="Btn commonBtn" @click="submitFn">立即购买</view>
  	</view>
  
  
@@ -171,7 +177,7 @@
  		 </view>
  		 
  		 <view class="tkBottom">
- 			 <view class="tkBottomBtn" @click="goSubmit">立即购买</view>
+ 			 <view class="tkBottomBtn commonBtn" @click="goSubmit">立即购买</view>
  		 </view>
  		 
  	 </view>
@@ -328,12 +334,12 @@
 							 this.itemDefault=item
 						}
 						if(item.content){
-							item.content=item.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+							item.content=item.content.replace(/\<img/gi, '<img style="max-width:100% !important;height:auto" ');
 						}
 						
 					})
 					if(this.detail.detailContent){
-						this.detail.detailContent=this.detail.detailContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+						this.detail.detailContent=this.detail.detailContent.replace(/\<img/gi, '<img style="max-width:100% !important;height:auto" ');
 					}
 					
 				   
@@ -470,13 +476,14 @@ color: #666E80;
 }
 .goodsGuige{
 /* 	width: 150rpx; */
-	height: 50rpx;line-height: 50rpx;
+	height: 50rpx;line-height: 48rpx;
 	background: #F6F6F6;
 	border-radius: 5rpx;
 	font-size: 24rpx;
 	color: #222222;text-align: center;
 	margin-left: 24rpx;
 	padding: 0 20rpx;
+	display: inline-block;
 }
 .activeGuige{
 	width: 146rpx;
@@ -652,7 +659,7 @@ color: #666E80;
 .Btn{
 	width: 532rpx;text-align: center;
 	height: 86rpx;line-height: 86rpx;
-	background: #FCD903;
+	/* background: #FCD903; */
 	border-radius: 43rpx;
 	font-size: 32rpx;
 	color: #110B01;
@@ -672,8 +679,14 @@ color: #666E80;
 	padding-right: 24rpx;
 }
 .guigeBox{
-	flex-wrap: wrap;justify-content: flex-end;
+	/* height: 50rpx; */
+    height: 52rpx;
 	width: 500rpx;
+	overflow: hidden;
+}
+.guigeBox2{
+	flex-wrap: nowrap;justify-content: flex-end;white-space: nowrap;
+	height: 50rpx;
 }
 .tkBox{
 	width: 100vw;height: 100vh;background: rgba(0,0,0,0.5);
@@ -780,7 +793,7 @@ color: #666E80;
 .tkBottomBtn{
 	width: 661rpx;text-align: center;
 	height: 86rpx;line-height: 86rpx;
-	background: #FCD903;
+	/* background: #FCD903; */
 	border-radius: 43rpx;
 	font-size: 32rpx;
 	color: #110B01;

pages/subPack/maintainSubmit.vue

@@ -54,7 +54,7 @@
 		 <span style="color: #EC0F0A;padding-left: 6rpx;">¥</span>
 		 <span style="font-weight: 500;font-size: 34rpx;color: #EC0F0A;">{{totalPrice}}</span>
 	 </view>
-	 <view class="Btn" @click="submitFn">提交订单</view>
+	 <view class="Btn commonBtn" @click="submitFn">提交订单</view>
  </view>
  
 </view>

pages/subPack/rescueOrderOrderDetail.vue

@@ -183,7 +183,7 @@
 		<view class="bottom"  v-if="orderData.openShopHelpSheet.sheetState != 5">
            <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
 			<view class="cancel" v-if="orderData.openShopHelpSheet.sheetState == 0" @click="cancelBespeak" >取消订单</view>
-		<!--  -->	<view class="defer" v-if="orderData.openShopHelpSheet.sheetState == 3||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2"  :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="orderevaluate">评价</view>
+		<!--  -->	<view class="defer" v-if="orderData.openShopHelpSheet.sheetState == 3||orderData.openShopHelpSheet.sheetState == 1||orderData.openShopHelpSheet.sheetState == 2"  @click="orderevaluate">评价</view>
 			<!-- <view class="defer"  v-if="orderData.openShopHelpSheet.sheetState == 5" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="seeevaluate">查看评价</view> -->
 		</view>
 		

pages/user/bespeakDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
          <homenav :iStatusBarHeight="iStatusBarHeight" :title="'预约详情'" ></homenav>
-		<view class="top" :style="{background:'#'+themeColor}">
+		<view class="top" >
 			<view class="orderState">
 				<image src="../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
 				
@@ -85,7 +85,7 @@
 		<view class="bottom" v-if="(orderData.orderSheet.sheetState == 0)||(orderData.orderSheet.sheetState == 1)">
 		
 			<view class="cancel" @click="cancelBespeak" >取消预约</view>
-			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="cktime">延期</view>
+			<view class="defer"  @click="cktime">延期</view><!-- :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" -->
 		</view>
 		
 		<!-- 预约时间 -->

pages/user/myOrder/activityOrderDetail.vue

@@ -238,7 +238,7 @@
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
            <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
 			<view class="cancel" @click="cancelBespeak" >取消订单</view>
-			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
+			<view class="defer"  @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
 		   <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>

pages/user/myOrder/mallOrderDetail.vue

@@ -228,7 +228,7 @@
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
-			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}"  @click="pay">立即支付</view>
+			<view class="defer"   @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
 		    <view class="cancel" @click="cancelOrder" >退款</view>

pages/user/myOrder/paintOrderDetail.vue

@@ -206,7 +206,8 @@
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
-			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
+			<view class="defer"  @click="pay">立即支付</view>
+			<!-- :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" -->
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
 		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>