Ver código fonte

样式修改

twt 7 meses atrás
pai
commit
d0da24ad6f

+ 13 - 12
pages/index/index.vue

@@ -199,18 +199,16 @@
 			
 			<!-- 商品区 -->
 			<view class="goodsBox">
-				<view class="goodsTabBox">
-					<!-- <view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in appletHomeSetting.sortSettingList">
-						<view @click="tabFn(index,item.type)" v-if="item.type==2">热销商品</view>
-						<view @click="tabFn(index,item.type)" v-if="item.type==1">热门活动</view>
-						<view @click="tabFn(index,item.type)" v-if="item.type==3&&homeCardList.isShowMaintain==1">{{homeCardList.maintainTitle}}</view>
-						<image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
-					</view> -->
-					<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in navigationList">
-						<view @click="tabFn(index,item.showType,item.id)">{{item.title}}</view>
-		                <image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/tab.svg" mode=""></image>
-						<!-- <image v-if="tabIndex==index" class="activeGoodsIcon" src="http://dmsphoto.66km.com.cn/thFiles/DABE4EFB-5699-4515-A4D4-59AF13F8D2F4.png" mode=""></image> -->
-					</view>
+				<view >
+					<scroll-view class="goodsTabBox" scroll-x="true" enable-flex="true" >
+						<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in navigationList">
+							<view @click="tabFn(index,item.showType,item.id)">{{item.title}}</view>
+						    <image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/tab.svg" mode=""></image>
+							<!-- <image v-if="tabIndex==index" class="activeGoodsIcon" src="http://dmsphoto.66km.com.cn/thFiles/DABE4EFB-5699-4515-A4D4-59AF13F8D2F4.png" mode=""></image> -->
+						</view>
+						
+					</scroll-view>
+					
 					
 				</view>
 				<view class="goodsLIneBox byBox" v-if="tabType==1">
@@ -1661,6 +1659,8 @@
 }
 .goodsTabBox{
 	display: flex;
+	white-space: nowrap;
+	    height: 80rpx;
 }
 .goodsTab{
 	text-align: center;
@@ -1731,6 +1731,7 @@
 	text-align: center;
 	font-size: 24rpx;
     color: #FFFFFF;
+	margin-top: 12rpx;
 }
 .goodsPriceBox{
 /* 	padding-bottom: 10rpx; */

+ 2 - 2
pages/index/shopList.vue

@@ -777,7 +777,7 @@
 		border: 1px solid #F19D01;
 		font-size: 22rpx;
 		line-height: 30rpx;
-		margin: 5rpx 16rpx 5rpx 0rpx;
+		margin: 5rpx 10rpx 5rpx 0rpx;
 	}
 
 	.timeBg {
@@ -788,7 +788,7 @@
 	.shopTime {
 		color: #666666;
 		font-size: 26rpx;
-		padding-top: 10rpx;
+		padding-top: 4rpx;
 	}
 
 	.addressBox {

+ 123 - 55
pages/subPack/maintain.vue

@@ -11,7 +11,7 @@
 			 </view>
 		 </view>
 		 <view class="ibRight">
-			 <image src="../../static/img2/gl.png" mode="" class="glIcon"></image>
+			 <image src="http://dmsphoto.66km.com.cn/thFiles/403AC6C5-CD4B-4D7A-B0D6-BA997D0AB9CE.png" mode="" class="glIcon"></image>
 			 <view class="glInput" v-if="milage">{{milage}}km</view>
 			 <view class="glInput" v-else>暂无填写</view>
 			<!-- <input type="text" v-else placeholder="暂无填写" class="glInput"/> -->
@@ -63,15 +63,17 @@
 			 <view class="line" 
 			  @click="goItem(item)" v-for="(item,index) in list">
 				 <view class="lineTop">
+					
+					 <image src="http://dmsphoto.66km.com.cn/thFiles/F4CEDFE9-CF9F-41C5-B2BC-0EE00D9EA455.png" mode="" v-if="item.showType.indexOf(1)!=-1" class="byTj"></image>
 					 <image class="lineImg" v-if="item.mainImgUrl" :src="item.mainImgUrl" mode=""></image>
-					  <image class="lineImg" v-else src="../../static/timg/noimg.png" mode=""></image>
+					 <image class="lineImg" v-else src="../../static/timg/noimg.png" mode=""></image>
 					 <view class="lineNameBox">
 						 <view class="goodsName">{{item.title}}</view>
 						 <view class="goodsMs">{{item.showContent}}</view>
 						 <view class="goodsKbox">
 						 	<view class="goosK1" v-if="item.showOilType">{{item.showOilType}}</view>
-						 	<view class="goosK2" v-if="item.showOilLevel">{{item.showOilLevel}}</view>
-						 	<view class="goosK2" v-if="item.showFit">{{item.showFit}}</view> 
+						 	<view class="goosK2" v-if="item.showOilLevel">机油等级 | {{item.showOilLevel}}</view>
+						 	<view class="goosK2" v-if="item.showFit">适配粘度 | {{item.showFit}}</view> 
 						 </view>
 						<!-- <view class="bfb">有91.4%的车主选择本商品</view> -->
 					 </view>
@@ -88,7 +90,7 @@
 							 <span class="tcSpan1">¥</span>
 							 <span class="tcSpan2">{{v.price}}</span>
 							 <span class="tcSpan3">/次</span>
-							 <span class="tcSpan3" style="padding-left: 10rpx;">¥{{v.money}}</span>
+							 <span class="tcSpan3" style="padding-left: 10rpx;">{{v.count}}次¥{{v.money}}</span>
 							<!-- <span class="tcSpan3" style="padding-left: 10rpx;">2次</span>
 							 <span class="tcSpan1">¥588</span> -->
 						 </view>
@@ -136,8 +138,8 @@
 	 <view class="tkCont">
 		 <view class="tkTop">
 			 <view class="tkDelBox" @click="clearAll">
-			 	<image src="../../static/img2/shanchu.png" mode="" class="tkDelIcon"></image>
-			 	<view class="tkDelTxt">清空</view>
+			 	<image v-if="itemDefault" src="../../static/img2/shanchu.png" mode="" class="tkDelIcon"></image>
+			 	<view v-if="itemDefault" class="tkDelTxt">清空</view>
 			 </view>
 			 <view class="tkTitle">清单</view>
 			
@@ -159,7 +161,7 @@
 				<view class="tkNameBox">
 					 <view class="tkName">{{itemDefault.goodsname}}</view>
 					 <view class="goodsPrice">
-						 <view class="goodsPrice4" >{{itemDefault.money}}</view>
+						 <view class="goodsPrice4" >{{itemDefault.money}}/</view>
 						<view class="goodsPrice2">¥</view>
 						<view class="goodsPrice3">{{itemDefault.price}}</view>
 						<view class="tkcount">{{itemDefault.count}}次</view>
@@ -171,6 +173,13 @@
 		
 		
 	</view>
+	<view v-if="!itemDefault" class="nodataBox">
+		<view style="text-align: center;">
+			<image class="nodataImg" src="http://dmsphoto.66km.com.cn/thFiles/FB1CBE1D-D56F-4921-AEB9-6364E7AC96BE.png" mode=""></image>
+		</view>
+		<view class="nodataTxt">暂无添加商品</view>
+	</view>
+	
 	</view>
 		
 		
@@ -262,24 +271,40 @@
 			 
 			},
 			clearAll(){
-				this.list.forEach(item=>{
-					item.packageItems.forEach(v=>{
-						v.select=false
-					})
-				})
-				 this.itemDefault=''
-				 this.qdNum=0
-				 this.totalPrice=0
+				var that=this
+				uni.showModal({
+					title: '提示',
+					content: '确定清空吗?',
+					success: function(resTK) {
+						that.list.forEach(item=>{
+							item.packageItems.forEach(v=>{
+								v.select=false
+							})
+						})
+						 that.itemDefault=''
+						 that.qdNum=0
+						 that.totalPrice=0
+					}
+				});
+				
 			},
 			delitemDefault(){
-				this.list.forEach(item=>{
-					item.packageItems.forEach(v=>{
-						v.select=false
-					})
-				})
-				 this.itemDefault=''
-				 this.qdNum=0
-				 this.totalPrice=0
+				var that=this
+				uni.showModal({
+					title: '提示',
+					content: '确定删除吗?',
+					success: function(resTK) {
+						that.list.forEach(item=>{
+							item.packageItems.forEach(v=>{
+								v.select=false
+							})
+						})
+						 that.itemDefault=''
+						 that.qdNum=0
+						 that.totalPrice=0
+					}
+				});
+				
 			},
 			selectItem(v,item){
 				this.list.forEach(item=>{
@@ -404,9 +429,9 @@
 	padding: 40rpx 24rpx;
 }
 .inputBox{
-	background: rgba(255,255,255,0.5);
+	background: rgba(255,255,255,0.4);
 	border-radius: 38rpx;line-height: 42rpx;
-	border: 2rpx solid #FFFFFF;
+	border: 1px solid #FFFFFF;
 	padding: 18rpx 30rpx;font-size: 26rpx;color: #222222;
 	display: flex;justify-content: space-between;
 }
@@ -433,12 +458,13 @@
 	padding-left: 10rpx;
 }
 .msIcon{
-	width: 20rpx;height: 20rpx;margin-top: 4rpx;
+	width: 26rpx;height: 26rpx;
 }
 .msTxt{
 	font-weight: 500;margin-left: 12rpx;
-	font-size: 20rpx;
+	font-size: 22rpx;
 	color: #A77102;
+	padding-top: 2rpx;
 }
 .msLine{
 	display: flex;line-height: 28rpx;
@@ -448,7 +474,7 @@
 	padding-left: 30rpx;padding-right: 30rpx;
 }
 .spBox{
-	background: linear-gradient( 180deg, #FFFFFF 0%, #F4F4F4 50%);
+	background: linear-gradient( 180deg, #FFFFFF 0%, #F4F4F4 440rpx);
 	border-radius: 23rpx;
 	padding: 24rpx 20rpx 0 24rpx;
 	margin-top: -50rpx;
@@ -474,9 +500,10 @@
 	border-radius: 21rpx;
 }
 .znCont{
-	background: url('http://dmsphoto.66km.com.cn/thFiles/A88B34CF-1BEB-4E0F-8C0B-E6FD2C858B73.png') no-repeat;
+	background: url('http://dmsimg.66km.com/marketing/be56733ed0464993b9e71d351d82062e.jpg') no-repeat;
 	background-size: 100% 100%;
-	height: 148rpx;
+	height: 160rpx;
+	    border-radius: 26rpx;
 }
 .hxIcon{
 	height: 4rpx;width: 360rpx;
@@ -498,7 +525,7 @@
 .line{
 	background: #FFFFFF;padding: 24rpx;
 	border-radius: 16rpx;margin-bottom: 20rpx;
-	padding-bottom: 4rpx;
+	padding-bottom: 4rpx;position: relative;
 }
 .lineImg{
 	width: 162rpx;
@@ -515,13 +542,15 @@
 	display: flex;flex-wrap: wrap;
 }
 .goosK1 {
-	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;
-	border: 1rpx solid #EC0F0A;font-size: 18rpx;
-color: #EC0F0A;margin-right: 10rpx;
+	height: 30rpx;line-height: 32rpx;padding: 0 8rpx;
+	border: 1rpx solid #EC0F0A;font-size: 20rpx;
+color: #EC0F0A;margin-right: 10rpx; border-radius: 6rpx;
+margin-top: 10rpx;
 }
 .goosK2{
-	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;color: #000000;
-	border: 1rpx solid #FCD903;font-size: 18rpx;
+	height: 30rpx;line-height: 32rpx;padding: 0 8rpx;color: #34B084;
+	border: 1rpx solid #34B084;font-size: 20rpx;border-radius: 6rpx;
+	margin-right: 10rpx;margin-top: 10rpx;
 }
 .goodsName{
 	font-weight: 500;
@@ -530,10 +559,15 @@ color: #EC0F0A;margin-right: 10rpx;
 	line-height: 40rpx;
 }
 .goodsMs{
-	font-weight: 400;padding-top: 5rpx;
-	font-size: 20rpx;padding-bottom: 10rpx;
+	font-weight: 400;padding-top: 10rpx;
+	padding-bottom: 6rpx;
+	font-size: 22rpx;
 	color: #8B8B8B;
 	line-height: 28rpx;
+	white-space: nowrap;      /* 确保文本在一行内显示 */
+	  overflow: hidden;         /* 超出容器部分隐藏 */
+	  text-overflow: ellipsis;
+	  width: 480rpx;
 }
 .bfb{
 	font-size: 20rpx;padding-top: 10rpx;
@@ -544,9 +578,9 @@ color: #EC0F0A;margin-right: 10rpx;
 	padding-left: 20rpx;    width: 500rpx;
 }
 .tcLine{
-	background: #F5F5F5;
+	background: #FBFBFB;
 	border-radius: 14rpx;
-	border: 1px solid #E0E0E0;
+	border: 1px solid #f1f1ff;
 	width: 316rpx;
 	height: 138rpx;
 	    margin-bottom: 20rpx;
@@ -575,16 +609,18 @@ color: #666666;padding-left: 25rpx;
 }
 .tcSpan3{
 	font-size: 20rpx;
-	color: #000000;
+	color: #999999;
+	
 }
 .tcNameTs{
-	width: 99rpx;margin-top: 30rpx;margin-left: 10rpx;
+	padding: 0 8rpx;margin-top: 30rpx;margin-left: 10rpx;
 	height: 25rpx;
 	background: #FE0200;
 	text-align: center;
 	line-height: 26rpx;
 	font-size: 18rpx;
 	color: #FFFFFF;
+	border-radius: 4rpx;
 }
 .tcBox{
 	display: flex;justify-content: space-between;
@@ -592,13 +628,13 @@ color: #666666;padding-left: 25rpx;
 }
 .bottom{
 	width: 100%;
-	height: 186rpx;
 	position: fixed;
 	bottom: 0rpx;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
 	background: #FFFFFF;
 	z-index: 111;
+	box-shadow: 0rpx -2rpx 16rpx 0rpx rgba(153,153,153,0.2);
 }
 .kaBox{
 	height: 70rpx;
@@ -638,9 +674,12 @@ color: #A26D4F;
 .bottomView{
 	display: flex;justify-content: space-between;
 	padding: 15rpx 30rpx;
+	padding-top: 30rpx;
+	padding-bottom: 0;
 }
 .qingdanIcon{
 	width: 40rpx;height: 45rpx;
+	display: block;
 }
 .bLeft{
 	display: flex;
@@ -668,7 +707,7 @@ color: #A26D4F;
 .bottomprice{
 	padding-left: 38rpx;
 	font-weight: 600;
-	font-size: 20rpx;padding-top: 12rpx;
+	font-size: 20rpx;padding-top: 24rpx;
 	color: #EC0F0A;line-height: 45rpx;
 }
 .byh{
@@ -700,12 +739,13 @@ color: #A26D4F;
 	font-size: 28rpx;
 	font-weight: 400;
 	color: #EC0F0A;
-	padding-top: 10rpx;
+	padding-top: 12rpx;
 	
 }
 
 .goodsPrice3{
-	font-size: 40rpx;
+	font-size: 28rpx;
+	padding-top: 12rpx;
 	font-weight: 500;
 	color: #EC0F0A;
 }
@@ -713,7 +753,7 @@ color: #A26D4F;
 	font-size: 24rpx;
 	font-weight: 400;
 	color: #999999;
-	padding-top: 14rpx;
+	padding-top: 16rpx;
 /* 	text-decoration:line-through; */
 	padding-left: 10rpx;
 }
@@ -733,7 +773,7 @@ border-radius: 6rpx;
 	line-height: 33rpx;
 }
 .tkNameBox{
-	padding-left: 24rpx;width: 500rpx;
+	padding-left: 24rpx;width: 515rpx;
 }
 .chahao{
 	width: 22rpx;height: 22rpx;padding-top: 10rpx;
@@ -852,8 +892,9 @@ color: #666E80;
 }
 .tkLine{
 	background: #ffffff;
-	padding: 12rpx 22rpx;
+	padding: 20rpx 22rpx;
 	padding-bottom: 30rpx;
+	border-radius: 16rpx;
 }
 .tkDelIcon{
 	width: 25rpx;height: 27rpx;
@@ -869,11 +910,11 @@ color: #666E80;
 	justify-content: space-between;
 }
 .tkDelBox{
-	display: flex;
+	display: flex;width: 100rpx;
 }
 .tkTop .tkDelTxt{
 	font-weight: 500;
-	font-size: 28rpx;
+	font-size: 26rpx;
 	color: #222222;
 	line-height: 42rpx;
 	padding-left: 8rpx;
@@ -884,9 +925,12 @@ color: #666E80;
 .tkLineTop{
 	display: flex;justify-content: space-between;
 }
+.tklineTopTitle{
+	font-size: 26rpx;
+}
 .tkCBox .tkDelTxt{
 	font-weight: 400;
-	font-size: 28rpx;
+	font-size: 26rpx;
 	color: #222222;
 	line-height: 42rpx;
 	padding-left: 8rpx;
@@ -894,17 +938,41 @@ color: #666E80;
 .tklineCont{
 	display: flex;
 	padding-top: 24rpx;
-	padding-left: 20rpx;
+	
 }
 .tkcount{
 	font-weight: 400;
 	font-size: 22rpx;
 	color: #222222;
 	padding-left: 22rpx;
-	padding-top: 14rpx;
+	padding-top: 16rpx;
 }
 .tkCBox .goodsPrice{
 	padding-top: 36rpx;
     justify-content: flex-end;
 }
+.nodataImg{
+	width: 176rpx;height: 180rpx;
+}
+.nodataTxt{
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #999999;
+	line-height: 37rpx;
+	text-align: center;
+	padding-top: 10rpx;
+}
+.nodataBox{
+	padding-top: 186rpx;
+	background: #fff;
+    padding-bottom: 200rpx;
+	border-radius: 20rpx;
+}
+.byTj{
+		width: 70rpx;height: 70rpx;top: 0;left: 0;
+		position: absolute;
+	}
+	.bSpan1{
+	 font-size: 30rpx;
+	}
 </style>

+ 14 - 6
pages/subPack/maintainItem.vue

@@ -26,7 +26,9 @@
  		<view class="goodsPrice" >
  			<view class="goodsPrice2">¥</view>
  			<view class="goodsPrice3" >{{itemDefault.money}}</view>
- 			<view class="goodsPrice4"  v-if="itemDefault.showCrossedPrice==1">原价:¥{{itemDefault.crossedPrice}}</view>
+ 			<view class="goodsPrice4"  v-if="itemDefault.showCrossedPrice==1">原价:
+			 <span class="goodsPrice41">¥{{itemDefault.crossedPrice}}</span>
+			</view>
  		</view>
 		<button open-type="share" class="shareBox" >
 			<view class="shareTxt">分享</view>
@@ -63,7 +65,7 @@
 		 </view>
 	 </view>
 	 <view class="carTis" v-if="isRecommend!='true'">此套餐可能与爱车不适配</view>
-	 <view class="buyLine" style="padding: 6rpx 24rpx;">
+	 <view class="buyLine" style="padding: 10rpx 24rpx;"><!--  -->
 	 		 <view class="buyTitle" style="line-height: 52rpx;">商品规格</view>
 			 <view class="guigeBox">
 				 <scroll-view scroll-x="true" enable-flex="true" class="buyData guigeBox2">
@@ -78,7 +80,7 @@
 			 </view>
 	 		
 	 </view>
-	 <view class="buyLine" style="padding: 10rpx 24rpx;">
+	 <view class="buyLine" style="padding: 12rpx 24rpx;"><!--  -->
 	 		 <view class="buyTitle" style="line-height: 44rpx;">商品数量</view>
 	 		 <view class="buyData">
 				 <view class="numJsbox">
@@ -173,7 +175,10 @@
  				 <view class="goodsPrice">
  				 	<view class="goodsPrice2">¥</view>
  				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
- 				 	<view class="goodsPrice4" v-if="itemDefault.showCrossedPrice==1">原价:¥{{itemDefault.crossedPrice}}</view>
+ 				 	<view class="goodsPrice4" v-if="itemDefault.showCrossedPrice==1">原价:
+					<span class="goodsPrice41">¥{{itemDefault.crossedPrice}}</span>
+					
+					</view>
  				 </view>
  				 
  			 </view>
@@ -474,9 +479,12 @@
 	font-weight: 400;
 	color: #999999;
 	padding-top: 20rpx;
-	text-decoration:line-through; 
+	
 	padding-left: 10rpx;
 }
+.goodsPrice41{
+	text-decoration:line-through; 
+}
 .Sold{
 		font-weight: 400;
 		color: #999999;
@@ -912,7 +920,7 @@ color: #666E80;
 }
 .hjt{
 	width: 12rpx;height: 24rpx;
-	margin-top: 6rpx;margin-left: 10rpx;
+	margin-top: 8rpx;margin-left: 10rpx;
 }
 button::after{
  	border: none;

+ 5 - 4
pages/user/addCar/cailist.vue

@@ -279,6 +279,7 @@
 	    align-items: center;
 		width: 32%;
 		justify-content: center;
+		color: #222222;
 	}
 	.carByIcon{
 		width: 34rpx;height: 34rpx;
@@ -398,11 +399,11 @@
 
 	.lineDel {
 		/* width: 94rpx; */
-		height: 50rpx;
-		border-radius: 28rpx;
+		height: 56rpx;
+		border-radius: 8rpx;
 		border: 1px solid #DDDDDD;
 		text-align: center;
-		line-height: 50rpx;
+		line-height: 56rpx;
 		font-size: 26rpx;
 		color: #3C3C3C;
 		margin-left: 29rpx;
@@ -451,7 +452,7 @@
 		width: 74rpx;
 		height: 40rpx;
 		/* background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%); */
-		border-radius: 16px 0rpx 16px 0rpx;
+		border-radius: 16rpx 0rpx 16rpx 0rpx;
 		text-align: center;
 		line-height: 40rpx;
 		color: #222222;

+ 4 - 4
pages/user/myOrder/activityOrderDetail.vue

@@ -1322,9 +1322,9 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.cancel {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
@@ -1334,9 +1334,9 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.defer {
 		color: #EC0F0A;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;

+ 4 - 4
pages/user/myOrder/mallOrderDetail.vue

@@ -1053,9 +1053,9 @@
 	.cancel {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
@@ -1065,9 +1065,9 @@
 	.defer {
 		color: #EC0F0A;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;

+ 8 - 8
pages/user/myOrder/myOrder.vue

@@ -570,24 +570,24 @@
 			.cancel {
 				color: #3C3C3C;
 				font-size: 24rpx;
-				width: 120rpx;
-				height: 40rpx;
-				border-radius: 20rpx;
+				width: 130rpx;
+				height: 56rpx;
+				border-radius: 8rpx;
 				border: 1rpx solid #DDDDDD;
 				text-align: center;
-				line-height: 40rpx;
+				line-height: 56rpx;
 				margin-right: 20rpx;
 			}
 			
 			.defer {
 				color: #EC0F0A;
 				font-size: 24rpx;
-				width: 120rpx;
-				height: 40rpx;
-				border-radius: 20rpx;
+				width: 130rpx;
+				height: 56rpx;
+				border-radius: 8rpx;
 				border: 1rpx solid #EC0F0A;
 				text-align: center;
-				line-height: 40rpx;
+				line-height: 56rpx;
 		
 			}
 			.bottom{

+ 4 - 4
pages/user/myOrder/paintOrderDetail.vue

@@ -1039,9 +1039,9 @@
 	.cancel {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #DDDDDD;
 		text-align: center;
 		line-height: 56rpx;
@@ -1051,9 +1051,9 @@
 	.defer {
 		color: #EC0F0A;
 		font-size: 28rpx;
-		width: 150rpx;
+		width: 130rpx;
 		height: 56rpx;
-		border-radius: 36rpx;
+		border-radius: 8rpx;
 		border: 2rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;

+ 10 - 6
pages/user/user.vue

@@ -95,7 +95,7 @@
 			<view style="padding-bottom: 20rpx;" v-if="numList.remindIntegral">
 				<view class="remindBox" >
 				  <view class="remindLeft" style="display: flex;">
-					  <image style="width: 24rpx;height: 24rpx;margin-top: 2rpx;" src="http://dmsphoto.66km.com.cn/thFiles/BA87B937-90F3-420C-A21C-A5B7BE7E8B07.png" mode=""></image>
+					  <image style="width: 30rpx;height: 30rpx;" src="http://dmsphoto.66km.com.cn/thFiles/4DC56154-C0D0-4CC8-A9B1-A2117C39CDFB.png" mode=""></image>
 					  <span style="padding-left: 10rpx;">您有</span>
 					  <span style="color: #0B0B0B;font-weight: 500;">{{numList.remindIntegral}}</span>
 					  <span v-if="numList.remindType==1">积分将于本月过期</span>
@@ -247,7 +247,7 @@
 					    <view class="KlineTxt">车况报告</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../index/rescue')">
-						<image class="klineIcon"  style="width: 54rpx;height: 44rpx;padding-bottom: 6rpx;"
+						<image class="klineIcon"  style="width: 58rpx;height: 49rpx;padding-bottom: 4rpx;"
 						src="../../static/img2/24.png" mode=""></image>
 					    <view class="KlineTxt">24小时救援</view>
 					</view>
@@ -1060,7 +1060,7 @@ margin-top: 30rpx;
 	border-right: 1px dashed #DDDDDD;
 }
 .carbrandLogo{
-	width: 50rpx;height: 50rpx;
+	width: 50rpx;height: 50rpx;    margin-bottom: 8rpx;
 }
 .kline{
 	display: flex;
@@ -1099,7 +1099,7 @@ margin-top: 30rpx;
 	color: #3C3C3C;
 	text-align: center;
 	border-bottom: 1px solid #eeeeee;
-	margin-top: 20rpx;
+	/* margin-top: 20rpx; */
 }
 .cardNameIcon{
 	width: 30rpx;height: 30rpx;
@@ -1123,11 +1123,11 @@ padding-right: 10rpx;
 }
 .remindBox{
 	width: 596rpx;
-	background: #FEE0B9;
+	background: #FFF8EF;
 	border-radius: 8rpx;
 	display: flex;justify-content: space-between;
 	    margin: 0 auto;font-size: 22rpx;
-		padding: 9rpx 20rpx;
+		padding: 10rpx 20rpx;
 		color: #666666;
 		line-height: 30rpx;
 	
@@ -1514,6 +1514,7 @@ padding-right: 10rpx;
 		margin: 20rpx 24rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
+		overflow: hidden;
 	}
 	.rowBox {
 		display: flex;
@@ -1752,6 +1753,9 @@ padding-right: 10rpx;
 	.carInfobrand{
 		text-align: center;
 		    width: 150rpx;
+			white-space: nowrap;      /* 确保文本在一行内显示 */
+			  overflow: hidden;         /* 超出容器部分隐藏 */
+			  text-overflow: ellipsis;
 	}
 	.hjtIcon{
 		width: 10rpx;height: 20rpx;

BIN
static/img2/24.png


BIN
static/img2/chezhu.png


BIN
static/img2/clsp.png


BIN
static/img2/fenx.png


BIN
static/img2/gl.png


BIN
static/img2/gongs.png


BIN
static/img2/hdjp.png


BIN
static/img2/huiyuan.png


BIN
static/img2/icon_fwzj.png


BIN
static/img2/icon_jydd.png


BIN
static/img2/icon_pingjia.png


BIN
static/img2/icon_yuyue.png


BIN
static/img2/jp.png


BIN
static/img2/jyjl.png


BIN
static/img2/kefu.png


BIN
static/img2/kehuzjs.png


BIN
static/img2/shwy.png


BIN
static/img2/yjfk.png


BIN
static/img2/zp.png


BIN
static/timg/car3.png


BIN
static/timg/car4.png


+ 4 - 4
utils/request.js

@@ -8,10 +8,10 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-//const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.11:20187/'
-const baseUrl='http://api.dms.66km.com.cn/'
-//const baseUrl='http://192.168.0.10:20187/' 
+const baseUrl=extConfig.url+'/'
+//const baseUrl='http://192.168.1.67:20187/'
+//const baseUrl='http://api.dms.66km.com.cn/'
+//const baseUrl='http://192.168.1.9:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 //京猫虎