Browse Source

样式修改

twt 3 months ago
parent
commit
4fe2f8cde2
81 changed files with 1741 additions and 1442 deletions
  1. 15 3
      components/homenav/nav.vue
  2. 3 3
      pages/activity/activity.vue
  3. 10 10
      pages/activity/jkDetail.vue
  4. 400 400
      pages/index/confirmRescue.vue
  5. 2 2
      pages/index/confirmYuyue.vue
  6. 4 4
      pages/index/couponShare.vue
  7. 17 17
      pages/index/discountCard.vue
  8. 6 6
      pages/index/discountCardDetail.vue
  9. 2 2
      pages/index/discountDlq.vue
  10. 1 1
      pages/index/handbook.vue
  11. 45 29
      pages/index/index.vue
  12. 4 4
      pages/index/onlineBooking.vue
  13. 56 56
      pages/index/paint.vue
  14. 182 182
      pages/index/paintSure.vue
  15. 54 54
      pages/index/personalCard.vue
  16. 4 4
      pages/index/receiveCoupon.vue
  17. 8 8
      pages/index/rescue.vue
  18. 5 4
      pages/index/shopList.vue
  19. 4 4
      pages/index/vipCard.vue
  20. 4 4
      pages/integral/exchangeRecord.vue
  21. 5 5
      pages/integral/integral.vue
  22. 233 233
      pages/integral/integralConfirm.vue
  23. 18 18
      pages/integral/integralgoodsDetail.vue
  24. 16 16
      pages/integral/recordDetail.vue
  25. 19 19
      pages/integral/scoreRecord.vue
  26. 2 2
      pages/partner/bonus.vue
  27. 2 2
      pages/partner/partner.vue
  28. 2 2
      pages/partner/people.vue
  29. 3 3
      pages/referral/extract.vue
  30. 1 1
      pages/referral/extractList.vue
  31. 4 4
      pages/referral/myConnections.vue
  32. 3 3
      pages/referral/rebateList.vue
  33. 3 3
      pages/referral/referral.vue
  34. 3 3
      pages/referral/referralExplain.vue
  35. 2 2
      pages/report/complete.vue
  36. 2 2
      pages/report/working.vue
  37. 4 4
      pages/shop/confirm.vue
  38. 13 13
      pages/shop/goodsDetail.vue
  39. 10 10
      pages/shop/shop.vue
  40. 1 1
      pages/shop/wp.vue
  41. 3 3
      pages/subPack/aboutUS.vue
  42. 3 3
      pages/subPack/depositDetail.vue
  43. 1 1
      pages/subPack/depositList.vue
  44. 1 1
      pages/subPack/feedBack.vue
  45. 15 15
      pages/subPack/jkDetail.vue
  46. 2 2
      pages/subPack/luckList.vue
  47. 34 18
      pages/subPack/maintain.vue
  48. 267 41
      pages/subPack/maintainItem.vue
  49. 13 10
      pages/subPack/maintainSubmit.vue
  50. 4 4
      pages/subPack/oldhistoryDetail.vue
  51. 6 5
      pages/subPack/paySuccess.vue
  52. 4 4
      pages/subPack/rescueOrder.vue
  53. 8 8
      pages/subPack/rescueOrderOrderDetail.vue
  54. 2 2
      pages/user/ShopAppraiseList.vue
  55. 23 13
      pages/user/addCar/addCar.vue
  56. 7 7
      pages/user/addCar/cailist.vue
  57. 3 3
      pages/user/appraise.vue
  58. 9 9
      pages/user/bespeakDetail.vue
  59. 22 22
      pages/user/expertServices.vue
  60. 5 5
      pages/user/historyDetail.vue
  61. 2 2
      pages/user/historySpend.vue
  62. 18 18
      pages/user/myAppraise.vue
  63. 27 27
      pages/user/myAppraiseDetail.vue
  64. 2 2
      pages/user/myBespeak.vue
  65. 13 12
      pages/user/myOrder/activityOrderDetail.vue
  66. 7 7
      pages/user/myOrder/mallOrderDetail.vue
  67. 6 5
      pages/user/myOrder/myOrder.vue
  68. 7 7
      pages/user/myOrder/paintOrderDetail.vue
  69. 4 4
      pages/user/reportUni.vue
  70. 51 39
      pages/user/user.vue
  71. BIN
      static/img/icon_ditu.png
  72. BIN
      static/img/icon_phone.png
  73. BIN
      static/img2/hjt.png
  74. BIN
      static/img2/jp.png
  75. BIN
      static/img2/shwy.png
  76. BIN
      static/img2/zp.png
  77. BIN
      static/img2/zyfw.png
  78. BIN
      static/timg/car1.png
  79. BIN
      static/timg/car2.png
  80. BIN
      static/timg/car3.png
  81. BIN
      static/timg/car4.png

+ 15 - 3
components/homenav/nav.vue

@@ -1,7 +1,19 @@
 <template>
 	<view class="" >
 		<!-- 自定义导航 -->
-		<view class="zdyNavBox">
+		<view class="zdyNavBox" v-if="bgColor" :style="{background: bgColor}">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNav">
+				<view class="zdyNavLeft">
+					<image src="../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback"></image>
+					<view class="navsx"></view>
+					<image src="../../static/img/nav_icon_home.png" mode="" class="homeImg" @click="gohome"></image>
+				</view>
+				<view class="zdyNavTitle">{{title}}</view>
+				<view style="width: 250rpx;"></view>
+			</view>
+		</view>
+		<view class="zdyNavBox" v-else>
 			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
@@ -22,7 +34,7 @@
 
 <script>
 export default {
-	props:['title','iStatusBarHeight','cj'],
+	props:['title','iStatusBarHeight','cj','bgColor'],
 	data() {
 		return {
 		}
@@ -109,7 +121,7 @@ export default {
 	.zdyNavTitle{
 		width: 100vw;
 		height: 44px;
-		background: #FFFFFF;
+	/* 	background: #FFFFFF; */
 		text-align: center;
 		font-size: 34rpx;
 		line-height: 44px;

+ 3 - 3
pages/activity/activity.vue

@@ -73,11 +73,11 @@
 				if(this.themeColor=='FF4F00'){
 					var backgroundImage='/static/tabimg/activtyFF4F00.png'
 				}
-				if(this.themeColor=='D53533'){
+				if(this.themeColor=='EC0F0A'){
 					var backgroundImage='/static/tabimg/activity1.png'
 				}
 				/* uni.setTabBarStyle({
-				  // color: '#FF0000',
+				  // color: '#EC0F0A',
 				  selectedColor: '#'+this.themeColor,
 				})
 				uni.setTabBarItem({
@@ -218,7 +218,7 @@
 .authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 66rpx;
 		text-align: center;

+ 10 - 10
pages/activity/jkDetail.vue

@@ -1224,20 +1224,20 @@ color: #FFFFFF;font-size: 26rpx;
 .separate{
 	width: 284rpx;margin-left: 30rpx;
 	height: 74rpx;
-	background: #FFE4E2;
+	background: #ffe1f1;
 	border-radius: 37rpx;
-	text-align: center;color:#D53533;
+	text-align: center;color:#EC0F0A;
 }
 .separate .separateTop{
-	color:#D53533;
+	color:#EC0F0A;
 }
 .separate .separateTxt{
-	color:#D53533;
+	color:#EC0F0A;
 }
 .groupBtn{
 	width: 284rpx;text-align: center;color: #ffffff;
 	height: 74rpx;margin-left: 30rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 }
 .separateTop{
@@ -1332,7 +1332,7 @@ color: #FFFFFF;font-size: 26rpx;
 	.bmBtn{
 		width: 690rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;
@@ -1419,7 +1419,7 @@ color: #FFFFFF;font-size: 26rpx;
 	.bottomBtn{
 		width: 598rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		line-height: 74rpx;
 		text-align: center;
@@ -1468,7 +1468,7 @@ color: #FFFFFF;font-size: 26rpx;
 		color: #FFFFFF;
 		width: 41rpx;
 		text-align: center;
-		background: #F03B3B;
+		background: #EC0F0A;
 		border-radius: 6rpx;
 		margin-top: 9rpx;
 		margin-left: 15rpx;
@@ -1545,7 +1545,7 @@ color: #FFFFFF;font-size: 26rpx;
 	line-height: 78rpx;
 }
 .signupTops1{
-	color: #FF0000;font-weight: 500;
+	color: #EC0F0A;font-weight: 500;
 	font-size: 28rpx;
 }
 .signupTops1{
@@ -1837,7 +1837,7 @@ color: #FFFFFF;font-size: 26rpx;
 		.authorizContbutton{
 			width: 210rpx;
 			height: 66rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 66rpx;
 			text-align: center;

+ 400 - 400
pages/index/confirmRescue.vue

@@ -1,104 +1,104 @@
 <template>
 <view class="box">
-  <view class="top-box" :style="{background:'#'+themeColor}">
-	  <view class="topTis">需提前2小时取消订单,不足2小时需联系门</view>
+  <view class="top-box" :style="{background:'#'+themeColor}">
+	  <view class="topTis">需提前2小时取消订单,不足2小时需联系门</view>
+  </view>
+  <view class="topTime">
+	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
+	  <view class="topTimeNum">{{opt.time}}</view>
+  </view>
+  <!-- 救援拖车框 -->
+  <view class="tcBox" v-if="opt.type==2">
+	  <view class="tcLeft">
+		  <view class="tcStart"> 
+		    <view class="tcStartYq"></view>	
+			<view class="tcStartTitle">起点</view>
+			<view class="tcStartTxt">{{opt.currentAddress}}</view>
+		  </view>
+		  <view class="tcEnd">
+			  <view class="tcEndYq"></view>
+			  <view class="tcStartTitle">终点</view>
+			  <view class="tcStartTxt">{{opt.endAddress}}</view>
+		  </view>
+	  </view>
+	  <view class="tcRight">约{{distance}}km</view>
+  </view>
+  <view class="tcBox" v-else>
+  	  <view class="tcLeft2">
+  		  <view class="tcStart"> 
+  		    <view class="tcStartYq"></view>	
+  			<view class="tcStartTitle">位置</view>
+  			<view class="tcStartTxt2">{{opt.currentAddress}}</view>
+  		  </view>
+  	  </view>
+  </view>
+   <!-- 救援拖车框 -->
+  <view class="contBox">
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span>服务门店</span>
+		  </view>
+		  <view class="kklineRight">{{shopName}}</view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span>救援项目</span>
+		  </view>
+		  <view class="kklineRight" v-if="opt.type==1">搭电</view>
+		  <view class="kklineRight" v-if="opt.type==2">拖车</view>
+		  <view class="kklineRight" v-if="opt.type==3">换胎</view>
+		  <view class="kklineRight" v-if="opt.type==4">未知原因</view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft2">
+			<span class="stars">*</span> <span>救援场景</span>
+		  </view>
+		  <view class="kklineRight2">
+			  <view class="jyKK " :class="{jyKKActive:jykkNum==1}" @click="jykk(1)">地面</view>
+			  <view class="jyKK" :class="{jyKKActive:jykkNum==2}" @click="jykk(2)">车库</view>
+			  <view class="jyKK" :class="{jyKKActive:jykkNum==3}" @click="jykk(3)">其他</view>
+		  </view>
+	  </view>
+	  <view class="kkline">
+		  <view class="kklineLeft">
+			<span class="stars">*</span> <span>车牌号</span>
+		  </view>
+		  <view class="kklineRight3" @click="goCarlist">
+			  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
+			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
+		  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span> <span>车型</span>
+	  		  </view>
+	  		  <view class="kklineRight3" @click="goCarlist">
+	  			  <span>{{carInfo.carModel?carInfo.carModel:'请选择'}}</span>
+	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
+	  		  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span><span>救援联系人</span>
+	  		  </view>
+	  		  <view class="kklineRight">
+				  <input type="text" placeholder="请输入" v-model="customerName">
+			  </view>
+	  </view>
+	  <view class="kkline">
+	  		  <view class="kklineLeft">
+	  			<span class="stars">*</span><span>手机号</span>
+	  		  </view>
+	  		  <view class="kklineRight"><input type="text" placeholder="请输入" v-model="mobilePhone"></view>
+	  </view>
   </view>
-  <view class="topTime">
-	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
-	  <view class="topTimeNum">{{opt.time}}</view>
-  </view>
-  <!-- 救援拖车框 -->
-  <view class="tcBox" v-if="opt.type==2">
-	  <view class="tcLeft">
-		  <view class="tcStart"> 
-		    <view class="tcStartYq"></view>	
-			<view class="tcStartTitle">起点</view>
-			<view class="tcStartTxt">{{opt.currentAddress}}</view>
-		  </view>
-		  <view class="tcEnd">
-			  <view class="tcEndYq"></view>
-			  <view class="tcStartTitle">终点</view>
-			  <view class="tcStartTxt">{{opt.endAddress}}</view>
-		  </view>
-	  </view>
-	  <view class="tcRight">约{{distance}}km</view>
-  </view>
-  <view class="tcBox" v-else>
-  	  <view class="tcLeft2">
-  		  <view class="tcStart"> 
-  		    <view class="tcStartYq"></view>	
-  			<view class="tcStartTitle">位置</view>
-  			<view class="tcStartTxt2">{{opt.currentAddress}}</view>
-  		  </view>
-  	  </view>
-  </view>
-   <!-- 救援拖车框 -->
-  <view class="contBox">
-	  <view class="kkline">
-		  <view class="kklineLeft">
-			<span>服务门店</span>
-		  </view>
-		  <view class="kklineRight">{{shopName}}</view>
-	  </view>
-	  <view class="kkline">
-		  <view class="kklineLeft">
-			<span>救援项目</span>
-		  </view>
-		  <view class="kklineRight" v-if="opt.type==1">搭电</view>
-		  <view class="kklineRight" v-if="opt.type==2">拖车</view>
-		  <view class="kklineRight" v-if="opt.type==3">换胎</view>
-		  <view class="kklineRight" v-if="opt.type==4">未知原因</view>
-	  </view>
-	  <view class="kkline">
-		  <view class="kklineLeft2">
-			<span class="stars">*</span> <span>救援场景</span>
-		  </view>
-		  <view class="kklineRight2">
-			  <view class="jyKK " :class="{jyKKActive:jykkNum==1}" @click="jykk(1)">地面</view>
-			  <view class="jyKK" :class="{jyKKActive:jykkNum==2}" @click="jykk(2)">车库</view>
-			  <view class="jyKK" :class="{jyKKActive:jykkNum==3}" @click="jykk(3)">其他</view>
-		  </view>
-	  </view>
-	  <view class="kkline">
-		  <view class="kklineLeft">
-			<span class="stars">*</span> <span>车牌号</span>
-		  </view>
-		  <view class="kklineRight3" @click="goCarlist">
-			  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
-			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
-		  </view>
-	  </view>
-	  <view class="kkline">
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span> <span>车型</span>
-	  		  </view>
-	  		  <view class="kklineRight3" @click="goCarlist">
-	  			  <span>{{carInfo.carModel?carInfo.carModel:'请选择'}}</span>
-	  			  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
-	  		  </view>
-	  </view>
-	  <view class="kkline">
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span><span>救援联系人</span>
-	  		  </view>
-	  		  <view class="kklineRight">
-				  <input type="text" placeholder="请输入" v-model="customerName">
-			  </view>
-	  </view>
-	  <view class="kkline">
-	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span><span>手机号</span>
-	  		  </view>
-	  		  <view class="kklineRight"><input type="text" placeholder="请输入" v-model="mobilePhone"></view>
-	  </view>
-  </view>
   
 	<view style="height: 120rpx;"></view>
 	<view class="bottom-container">
 		<view class="heji">
-		  <!-- <span>合计</span> <span  style="font-size: 22rpx;color: #FF0000;">¥</span> <span style="font-size: 32rpx;color: #FF0000;" >759</span> -->
+		  <!-- <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" :style="{background:'#'+themeColor}" @click="submitOrder">提交订单</view>
 	  <!-- yuyue 老预约-->
 	</view>
 	
@@ -120,128 +120,128 @@
 				timedata:'',
 				billDate:'',
 				yuyueData:'',
-				carInfo:'',
-				yyshopInfo:'',
-				themeColor:'',
-				shopName:'',
-				opt:'',
-				distance:'',
-				jykkNum:1,
-				customerName:'',
-				mobilePhone:'',
-				isGoing:false,
+				carInfo:'',
+				yyshopInfo:'',
+				themeColor:'',
+				shopName:'',
+				opt:'',
+				distance:'',
+				jykkNum:1,
+				customerName:'',
+				mobilePhone:'',
+				isGoing:false,
 				orderId:'',
 			}
 		},
-		onLoad(opt) {
+		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
-			//this.userInfo = uni.getStorageSync("userInfo");
-			var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
-			this.customerName=customerInfo.customerName;
-			this.mobilePhone=customerInfo.mobilePhone;
-			this.userInfo = this.$store.state.userInfo;
-			this.shopName=opt.shopName;
-			this.opt=opt;
-			if(this.opt.type==2){
-				this.calculateDistance()
-			}
+			//this.userInfo = uni.getStorageSync("userInfo");
+			var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+			this.customerName=customerInfo.customerName;
+			this.mobilePhone=customerInfo.mobilePhone;
+			this.userInfo = this.$store.state.userInfo;
+			this.shopName=opt.shopName;
+			this.opt=opt;
+			if(this.opt.type==2){
+				this.calculateDistance()
+			}
 			console.log(opt)
 		},
-		onShow() {
-			this.carInfo=this.$store.state.carInfo;
-			console.log(this.carInfo)
+		onShow() {
+			this.carInfo=this.$store.state.carInfo;
+			console.log(this.carInfo)
 		},
-		methods: {
-			jykk(num){
-				this.jykkNum=num;
-			},
-			goCarlist(){
-				uni.navigateTo({
-					url:'../user/addCar/cailist'
-				})
-			},
-			submitOrder(){
-				if(this.isGoing){
-					return false;
-				}
-				if(!this.carInfo.carModel){
-					uni.showToast({
-						title: '请输选择车型',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if(!this.customerName){
-					uni.showToast({
-						title: '请输入救援联系人',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if(!this.mobilePhone){
-					uni.showToast({
-						title: '请输入手机号',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				this.isGoing=true;
-				uni.showLoading({
-				 	title: '加载中'
-				});
-				this.$http('openShopHelpSheetOrder/submitOrder', {
-				  helpType:this.opt.type,
-				  customerName: this.customerName,
-				  mobilePhone: this.mobilePhone,
-				  //orderItem: this.yuyueData.map(item => item.ID).join(),
-				  shopID: this.opt.shopId,
-				  plateNumber: this.carInfo.plateNumber,
-				  carModel:this.carInfo.carModel,
-				  hEndAddress:this.opt.endAddress,
-				  hStartAddress:this.opt.currentAddress,
-				  orderType:this.opt.orderType,
-				  hTime:this.opt.time,
-				  hscene:this.jykkNum,
-				  startLng:this.opt.lng,
-				  startLat:this.opt.lat,
-				  endLng:this.opt.endLng,
-				  endLat:this.opt.endLat,
-				 },'POST').then(res => {
-					uni.hideLoading();
-					var id=res.data
-					console.log(id)
-					 if(res.code==0){
-						 uni.showModal({
-						     title: '提示',
-						     content: '救援信息提交成功',
-						 	confirmText:'返回首页',
-						 	cancelText:'查看订单',
-						     success: function (res) {
-								  this.isGoing=false;
-								
-						         if (res.confirm) {
-						            // console.log('用户点击确定');
-						 		   uni.switchTab({
-						 		   	url:'index'
-						 		   })
-						         } else if (res.cancel) {
-									// uni.hideLoading();
-						           uni.redirectTo({
-						           		url:'../subPack/rescueOrderOrderDetail?id='+id
-						           }) 
-						 		   
-						         }
-						     }
-						 });
-					 }else{
-						 this.isGoing=false;
-					 }
-				 })
+		methods: {
+			jykk(num){
+				this.jykkNum=num;
+			},
+			goCarlist(){
+				uni.navigateTo({
+					url:'../user/addCar/cailist'
+				})
+			},
+			submitOrder(){
+				if(this.isGoing){
+					return false;
+				}
+				if(!this.carInfo.carModel){
+					uni.showToast({
+						title: '请输选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.customerName){
+					uni.showToast({
+						title: '请输入救援联系人',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if(!this.mobilePhone){
+					uni.showToast({
+						title: '请输入手机号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				this.isGoing=true;
+				uni.showLoading({
+				 	title: '加载中'
+				});
+				this.$http('openShopHelpSheetOrder/submitOrder', {
+				  helpType:this.opt.type,
+				  customerName: this.customerName,
+				  mobilePhone: this.mobilePhone,
+				  //orderItem: this.yuyueData.map(item => item.ID).join(),
+				  shopID: this.opt.shopId,
+				  plateNumber: this.carInfo.plateNumber,
+				  carModel:this.carInfo.carModel,
+				  hEndAddress:this.opt.endAddress,
+				  hStartAddress:this.opt.currentAddress,
+				  orderType:this.opt.orderType,
+				  hTime:this.opt.time,
+				  hscene:this.jykkNum,
+				  startLng:this.opt.lng,
+				  startLat:this.opt.lat,
+				  endLng:this.opt.endLng,
+				  endLat:this.opt.endLat,
+				 },'POST').then(res => {
+					uni.hideLoading();
+					var id=res.data
+					console.log(id)
+					 if(res.code==0){
+						 uni.showModal({
+						     title: '提示',
+						     content: '救援信息提交成功',
+						 	confirmText:'返回首页',
+						 	cancelText:'查看订单',
+						     success: function (res) {
+								  this.isGoing=false;
+								
+						         if (res.confirm) {
+						            // console.log('用户点击确定');
+						 		   uni.switchTab({
+						 		   	url:'index'
+						 		   })
+						         } else if (res.cancel) {
+									// uni.hideLoading();
+						           uni.redirectTo({
+						           		url:'../subPack/rescueOrderOrderDetail?id='+id
+						           }) 
+						 		   
+						         }
+						     }
+						 });
+					 }else{
+						 this.isGoing=false;
+					 }
+				 })
 			},
-			yuyue(){
+			yuyue(){
 				var that=this;
 				if(!this.billDate){
 					uni.showToast({
@@ -250,10 +250,10 @@
 						duration: 3000
 					});
 					return false;
-				}
-				if(!this.isGoing){
-					return false;
-				}
+				}
+				if(!this.isGoing){
+					return false;
+				}
 				this.isGoing=true;
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
@@ -262,10 +262,10 @@
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
 				  unionId: this.userInfo.unionId
-				 },'POST').then(res => {
-					    console.log(res)
-						console.log(res.data)
-					    that.orderId=res.data
+				 },'POST').then(res => {
+					    console.log(res)
+						console.log(res.data)
+					    that.orderId=res.data
 						this.isGoing=false;
 						if(res.code==0){
 							uni.showModal({
@@ -280,13 +280,13 @@
 									   	url:'index'
 									   })
 							        } else if (res.cancel) {
-							           // console.log('用户点击取消');
-									   // uni.reLaunch({
-										  //  url:'../user/bespeakDetail?id='+id
-									   // })
-									   uni.redirectTo({
-									   		url:'../subPack/rescueOrderOrderDetail?id='+that.orderId
-									   })
+							           // console.log('用户点击取消');
+									   // uni.reLaunch({
+										  //  url:'../user/bespeakDetail?id='+id
+									   // })
+									   uni.redirectTo({
+									   		url:'../subPack/rescueOrderOrderDetail?id='+that.orderId
+									   })
 									   
 							        }
 							    }
@@ -307,170 +307,170 @@
 			},
 			cktime(){
 				 this.$refs.timeSelect.open();
-			},
-			//计算距离
-			calculateDistance(){
-			//调用距离计算接口
-				var that=this;
-				const tMap = new QQMapWX({
-					key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
-				});
-				
-				tMap.calculateDistance({
-					mode: 'driving',//可选值:'driving'(驾车)、'walking'(步行),不填默认:'walking',可不填
-					//from参数不填默认当前地址
-					//获取表单提交的经纬度并设置from和to参数(示例为string格式)
-					from: {
-						latitude:  that.opt.lat,
-						longitude: that.opt.lng,
-					}, //若起点有数据则采用起点坐标,若为空默认当前地址
-					to:[
-					{
-						latitude: that.opt.endLat,
-						longitude: that.opt.endLng
-					}	
-					] , //终点坐标
-					success: function(res) {//成功后的回调
-					  console.log(res);
-					  that.distance=res.result.elements[0].distance/1000;
                      //that.distance=that.distance.tofixed(2)
-					},

-				});

+			},
+			//计算距离
+			calculateDistance(){
+			//调用距离计算接口
+				var that=this;
+				const tMap = new QQMapWX({
+					key: 'L2GBZ-CIS6J-HRFFV-K5LO6-QROT7-BQFXZ' //开发者密钥 //这里要换成自己的key
+				});
+				
+				tMap.calculateDistance({
+					mode: 'driving',//可选值:'driving'(驾车)、'walking'(步行),不填默认:'walking',可不填
+					//from参数不填默认当前地址
+					//获取表单提交的经纬度并设置from和to参数(示例为string格式)
+					from: {
+						latitude:  that.opt.lat,
+						longitude: that.opt.lng,
+					}, //若起点有数据则采用起点坐标,若为空默认当前地址
+					to:[
+					{
+						latitude: that.opt.endLat,
+						longitude: that.opt.endLng
+					}	
+					] , //终点坐标
+					success: function(res) {//成功后的回调
+					  console.log(res);
+					  that.distance=res.result.elements[0].distance/1000;                      //that.distance=that.distance.tofixed(2)
+					},
+				});
 		},
 			
 		}
 	}
 </script>
 
-<style scoped lang="less">
-	.topTis{
-		font-weight: 400;
-		color: #FFFFFF;
-		font-size: 26rpx;
-		text-align: center;
-		padding-top: 24rpx;
-	}
-.tcBox{
-	width: 702rpx;
-    margin-top: 20rpx;
-	margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	display: flex;
-	
-}
-.heji{
-	font-weight: 500;
-	color: #666666;
-	padding-left: 30rpx;
-	line-height: 120rpx;
-}
+<style scoped lang="less">
+	.topTis{
+		font-weight: 400;
+		color: #FFFFFF;
+		font-size: 26rpx;
+		text-align: center;
+		padding-top: 24rpx;
+	}
+.tcBox{
+	width: 702rpx;
+    margin-top: 20rpx;
+	margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	display: flex;
+	
+}
+.heji{
+	font-weight: 500;
+	color: #666666;
+	padding-left: 30rpx;
+	line-height: 120rpx;
+}
 .rightJt{
 	width: 30rpx;
 	height: 30rpx;
 	margin-top: 4rpx;
-}
-.kklineRight3{
-  display: flex;
-  color: #3c3c3c;
-  font-size: 28rpx;
-  
-}
-.kklineRight2{
-	display: flex;
-}
-.jyKK{
-	width: 108rpx;
-	height: 56rpx;
-	border-radius: 6rpx;
-	border: 2rpx solid #CCCCCC;
-	color: #666666;
-	font-size: 24rpx;
-	text-align: center;
-	line-height: 56rpx;
-	margin-left: 20rpx;
-}
-.jyKKActive{
-	background: #FF0000;
-	border: none;
-	height: 60rpx;
-	color: #FFFFFF;
-}
-.kklineLeft2{
-	line-height: 60rpx;
-}
-.contBox{
-	width: 662rpx;
-	margin-top: 20rpx;
-	margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	padding: 0 20rpx;
-}
+}
+.kklineRight3{
+  display: flex;
+  color: #3c3c3c;
+  font-size: 28rpx;
+  
+}
+.kklineRight2{
+	display: flex;
+}
+.jyKK{
+	width: 108rpx;
+	height: 56rpx;
+	border-radius: 6rpx;
+	border: 2rpx solid #CCCCCC;
+	color: #666666;
+	font-size: 24rpx;
+	text-align: center;
+	line-height: 56rpx;
+	margin-left: 20rpx;
+}
+.jyKKActive{
+	background: #EC0F0A;
+	border: none;
+	height: 60rpx;
+	color: #FFFFFF;
+}
+.kklineLeft2{
+	line-height: 60rpx;
+}
+.contBox{
+	width: 662rpx;
+	margin-top: 20rpx;
+	margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	padding: 0 20rpx;
+}
 .stars{
 	color: #FF2400;
-}
-.tcLeft{
-   width: 524rpx;padding-left: 20rpx;
-}
-.tcStartTxt2{
-	width: 550rpx;
-}
-.tcLeft2{
-	padding-left: 13rpx;
-}
-.tcStart{
-	border-bottom: 1px solid #EEEEEE;
-	display: flex;
-	padding: 29rpx 0;
-	font-size: 28rpx;
-	color: #333333;
-	line-height: 40rpx;
-}
-.tcEnd{
-	display: flex;
-	padding: 29rpx 0;
-	font-size: 28rpx;
-	color: #333333;
-	line-height: 40rpx;
-}
-.tcStartYq{
-	width: 14rpx;
-	height: 14rpx;
-	background: #3F90F7;
-	margin-top: 13rpx;
-	border-radius: 50%;
-}
-.tcStartTxt{
-	width: 396rpx;
-}
-.tcEndYq{
-	width: 14rpx;
-	height: 14rpx;
-	background: #FF0000;
-	margin-top: 13rpx;
-	border-radius: 50%;
-}
-.tcStartTitle{
-	color: #666666;
-	padding: 0 30rpx 0 20rpx;
-}
-.tcRight{
-	color: #FF0000;
-	line-height: 33rpx;
-	font-size: 24rpx;
-	padding-top: 30rpx;
-	padding-left: 10rpx;
-	display: flex;
-	align-items: center;
-}
+}
+.tcLeft{
+   width: 524rpx;padding-left: 20rpx;
+}
+.tcStartTxt2{
+	width: 550rpx;
+}
+.tcLeft2{
+	padding-left: 13rpx;
+}
+.tcStart{
+	border-bottom: 1px solid #EEEEEE;
+	display: flex;
+	padding: 29rpx 0;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+}
+.tcEnd{
+	display: flex;
+	padding: 29rpx 0;
+	font-size: 28rpx;
+	color: #333333;
+	line-height: 40rpx;
+}
+.tcStartYq{
+	width: 14rpx;
+	height: 14rpx;
+	background: #3F90F7;
+	margin-top: 13rpx;
+	border-radius: 50%;
+}
+.tcStartTxt{
+	width: 396rpx;
+}
+.tcEndYq{
+	width: 14rpx;
+	height: 14rpx;
+	background: #EC0F0A;
+	margin-top: 13rpx;
+	border-radius: 50%;
+}
+.tcStartTitle{
+	color: #666666;
+	padding: 0 30rpx 0 20rpx;
+}
+.tcRight{
+	color: #EC0F0A;
+	line-height: 33rpx;
+	font-size: 24rpx;
+	padding-top: 30rpx;
+	padding-left: 10rpx;
+	display: flex;
+	align-items: center;
+}
 .kkline{
 	display: flex;
 	padding: 30rpx 0;
 	border-bottom: 1px solid #EEEEEE;
 	color: #666666;
-	font-size: 28rpx;
+	font-size: 28rpx;
 	justify-content: space-between;
-}
+}
 .kkline2{
 	display: flex;
 	justify-content: space-between;
@@ -478,12 +478,12 @@
 	border-bottom: 1px solid #EEEEEE;
 	color: #666666;
 	font-size: 28rpx;
-}
+}
 .kklineRight{
 	color: #3c3c3c;
 	font-size: 28rpx;
 	
-	width: 450rpx;
+	width: 450rpx;
 	text-align: right;
 }
 .kklineLeft {
@@ -492,34 +492,34 @@
 .box{
 	background: #F4F5F7;
 	min-height: 100vh;
-}
-.topTime{
-	width: 702rpx;
-    margin-left: 24rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	display: flex;
-	justify-content: center;
-	padding: 37rpx 0;
-	margin-top: -70rpx;
-	
-}
-.topTimeImg{
-	width: 36rpx;
-	height: 36rpx;
-}
-.topTimeNum{
-	font-weight: 500;
-	font-size: 32rpx;
-	line-height: 36rpx;
-	color: #333333;
-	padding-left: 18rpx;
-}
-.top-box{
-	width: 750rpx;
-	height: 164rpx;
-	background: #FF0000;
-	border-radius: 0 0 10% 10%;
+}
+.topTime{
+	width: 702rpx;
+    margin-left: 24rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	display: flex;
+	justify-content: center;
+	padding: 37rpx 0;
+	margin-top: -70rpx;
+	
+}
+.topTimeImg{
+	width: 36rpx;
+	height: 36rpx;
+}
+.topTimeNum{
+	font-weight: 500;
+	font-size: 32rpx;
+	line-height: 36rpx;
+	color: #333333;
+	padding-left: 18rpx;
+}
+.top-box{
+	width: 750rpx;
+	height: 164rpx;
+	background: #EC0F0A;
+	border-radius: 0 0 10% 10%;
 }
 .bottom-container{
 	width: 750rpx;
@@ -535,7 +535,7 @@
 .newyyBotbutton{
 	width: 204rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	font-weight: 500;
 	color: #FFFFFF;
@@ -545,7 +545,7 @@
 	margin-top: 23rpx;
 }
 .bottom-container-price{
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 30rpx;
 	padding-left: 30rpx;
 	font-size: 32rpx;

+ 2 - 2
pages/index/confirmYuyue.vue

@@ -303,7 +303,7 @@
 .newyyBotbutton{
 	width: 204rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	font-weight: 500;
 	color: #FFFFFF;
@@ -313,7 +313,7 @@
 	margin-top: 23rpx;
 }
 .bottom-container-price{
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 30rpx;
 	padding-left: 30rpx;
 	font-size: 32rpx;

+ 4 - 4
pages/index/couponShare.vue

@@ -315,7 +315,7 @@
 		border-radius: 44rpx;
 	}
 	.boxtop{
-		background: #FF0000;
+		background: #EC0F0A;
 	}
 	.box {
 		min-height: 100vh;
@@ -338,14 +338,14 @@
 	.use {
 
 		font-size: 26rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.use2 {
 
 		font-size: 40rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 		line-height: 56rpx;
 	}
 
@@ -471,7 +471,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 17 - 17
pages/index/discountCard.vue

@@ -12,8 +12,8 @@
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==0}" @click="tabClick2(0)">可使用</view>
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==2}" @click="tabClick2(2)">已使用</view>
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==1}" @click="tabClick2(1)">已过期</view>
-			</view>
-			
+			</view>
+			
 			<view style="height: 92rpx;"></view>
 			<view class="itemBg" v-for="(item,index) in currentList" @click="goDetail(item.id)">
 				<view class="leftB" v-if="item.discountType==1 " style="display: flex;align-items: center;justify-content: center;">
@@ -65,8 +65,8 @@
 
 				<!-- <view class="itemBottom">
 					<view></view>
-					<view @click="goDetail(item.id)" class="rightJian">查看详情 
-					<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
+					<view @click="goDetail(item.id)" class="rightJian">查看详情 
+					<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>
 					
 				</view> -->
@@ -230,7 +230,7 @@
 	margin-right: 10rpx;
 }
 .plateNumer{
-	color: #FF0000;
+	color: #EC0F0A;
 	line-height: 30rpx;
 	font-size: 22rpx;
 	padding: 3rpx 0rpx;
@@ -244,10 +244,10 @@
 	width: 99rpx;
 	height: 44rpx;
 	border-radius: 22rpx;
-	border: 1px solid #FF0000;
+	border: 1px solid #EC0F0A;
 	text-align: center;
 	line-height: 42rpx;
-	color: #FF0000;
+	color: #EC0F0A;
 }
 	.tab {
 		background: #FFFFFF;
@@ -269,8 +269,8 @@
 	}
 
 	.tabActive {
-		color: #FF0000;
-		border-bottom: 4rpx solid #FF0000;
+		color: #EC0F0A;
+		border-bottom: 4rpx solid #EC0F0A;
 
 	}
 
@@ -320,7 +320,7 @@
 
 		font-size: 28rpx;
 
-		color: #FF0000;
+		color: #EC0F0A;
 		width: 144rpx;
 		height: 56rpx;
 		line-height: 56rpx;
@@ -347,14 +347,14 @@
 	.use {
             text-align: center;
 		font-size: 26rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.use2 {
         padding-right: 8rpx;
 		font-size: 40rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 		line-height: 56rpx;
 	}
 
@@ -400,7 +400,7 @@
 		justify-content: space-between;
 		font-size: 24rpx;
 		color: #999999;
-		line-height: 33rpx;
+		line-height: 33rpx;
 		
 	}
 	.couponlineTopImg{
@@ -424,10 +424,10 @@
 		font-size: 22rpx;
 		color: #666666;
 		margin-top: 15rpx;
-	}
-	.rightJian{
-		display: flex;
-		align-items: center;
+	}
+	.rightJian{
+		display: flex;
+		align-items: center;
 	}
 	.authorizBox{
 			width: 100vw;

+ 6 - 6
pages/index/discountCardDetail.vue

@@ -344,7 +344,7 @@
 .useBtn{
 	width: 690rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	font-weight: 500;
 	color: #FFFFFF;
@@ -357,7 +357,7 @@
 .couponCodeYd{
 	width: 10rpx;
 	height: 10rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 50%;
 	margin-top: 10rpx;
 	margin-right: 12rpx;
@@ -386,7 +386,7 @@
 	line-height: 33rpx;padding-top: 8rpx;
 }
 	.boxtop{
-		background: #FF0000;
+		background: #EC0F0A;
 	}
 	.box {
 		min-height: 100vh;
@@ -409,14 +409,14 @@
 	.use {
         text-align: center;
 		font-size: 26rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.use2 {
 
 		font-size: 40rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 		line-height: 56rpx;
 	}
 
@@ -541,7 +541,7 @@ display: flex;
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 2 - 2
pages/index/discountDlq.vue

@@ -139,9 +139,9 @@
 	height: 56rpx;
 	font-size: 28rpx;
 	line-height: 56rpx;
-	color: #D53533;
+	color: #EC0F0A;
 	border-radius: 36rpx;
-	border: 2rpx solid #D53533;
+	border: 2rpx solid #EC0F0A;
 	text-align: center;
 }
 .lineTop1{

+ 1 - 1
pages/index/handbook.vue

@@ -156,7 +156,7 @@
 	.grayCol{
 		width: 24rpx;
 		height: 24rpx;
-		background-color: #FF4F00;
+		background-color: #EC0F0A;
 		border-radius: 12rpx;
 		
 	}

+ 45 - 29
pages/index/index.vue

@@ -154,7 +154,7 @@
 				<view class="modularLine">
 					<view class="modularMk"  @click="goRoter(item)" v-if="index>3"  v-for="(item,index) in homeCardList.application">
 						<view class="modularLogoBox">
-							<image :src="item.icon" mode="" class="modularLogo"></image>
+							<image :src="item.icon" mode="" class="modularLogo2"></image>
 						</view>
 						<view class="modularTitle2">{{item.name}}</view>
 					</view>
@@ -212,9 +212,10 @@
 					</view>
 					
 				</view>
-				<view class="goodsLIneBox" v-if="tabType==1">
+				<view class="goodsLIneBox byBox" v-if="tabType==1">
 					<view class="goodsLine" @click="goMaintain(item)" v-for="(item,index) in byList">
 						<view class="goodsLeft">
+							<image src="http://dmsphoto.66km.com.cn/thFiles/A117F813-4778-4EE8-B374-54D38363EC1C.png" mode="" v-if="item.showType.indexOf(1)!=-1" class="byTj"></image>
 							<image class="goodsIcon" v-if="item.mainImgUrl" :src="item.mainImgUrl" mode=""></image>
 							<image class="goodsIcon" v-else src="../../static/timg/noimg.png" mode=""></image>
 						</view>
@@ -1080,11 +1081,11 @@
 					if(this.themeColor=='FF4F00'){
 						var backgroundImage='/static/tabimg/indexFF4F00.png'
 					}
-					if(this.themeColor=='D53533'){
+					if(this.themeColor=='EC0F0A'){
 						var backgroundImage='/static/tabimg/index1.png'
 					}
 					uni.setTabBarStyle({
-					  // color: '#FF0000',
+					  // color: '#EC0F0A',
 					  //selectedColor: '#'+this.themeColor,
 					  selectedColor: '#222222',
 					})
@@ -1413,10 +1414,10 @@
 						}
 						//console.log("this.navigationList")
 						//console.log(this.navigationList)
-		
+		                
 						if(this.navigationList.length>0){
 						   this.tabType=this.navigationList[0].showType
-						   
+						   this.tabIndex=0
 							this.tabData(this.navigationList[0].showType,this.navigationList[0].id)
 						}
 						
@@ -1516,6 +1517,7 @@
 	left: 0;
 	width: 750rpx;
 	top: 0;
+	z-index: 111;
 }
 .logoImg{
 	height: 72rpx;width: 492rpx;
@@ -1608,7 +1610,10 @@
 	display: flex;flex-wrap: wrap;
 }
 .modularLogo{
-	width: 97rpx;height: 97rpx;
+	width: 110rpx;height: 110rpx;
+}
+.modularLogo2{
+	width: 62rpx;height: 62rpx;
 }
 .modularTitle{
 	/* font-weight: 600; */
@@ -1676,7 +1681,7 @@
 .goodsLine{
 	display: flex;
 }
-.goodsName{
+.byBox .goodsName{
 	font-weight: 500;
 	font-size: 28rpx;
 	color: #222222;
@@ -1686,10 +1691,14 @@
 	padding-left: 24rpx;
 	width: 438rpx;
 	display: flex;
-	 flex-direction: column;justify-content: space-between;
+	 flex-direction: column;
+	/* justify-content: space-between; */
+}
+.goodsRb{
+	padding-top: 16rpx;
 }
 .goodsMs{
-	font-weight: 400;padding-top: 5rpx;
+	font-weight: 500;padding-top: 5rpx;
 	font-size: 20rpx;
 	color: #8B8B8B;
 	line-height: 28rpx;
@@ -1733,11 +1742,11 @@ color: #EC0F0A;padding: 0 10rpx;
 .goosK1 {
 	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;
 	border: 1rpx solid #EC0F0A;font-size: 18rpx;
-color: #EC0F0A;margin-right: 10rpx;
+color: #EC0F0A;margin-right: 10rpx; border-radius: 6rpx;
 }
 .goosK2{
-	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;color: #000000;
-	border: 1rpx solid #FCD903;font-size: 18rpx;
+	height: 25rpx;line-height: 25rpx;padding: 0 8rpx;color: #34B084;
+	border: 1rpx solid #34B084;font-size: 18rpx;border-radius: 6rpx;
 }
 .carAddImage{
 	width: 91rpx;height: 123rpx;
@@ -1832,7 +1841,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 66rpx;
 		text-align: center;
@@ -1899,7 +1908,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	.qrBtn{
 		width: 292rpx;
 		height: 64rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 32rpx;
 		color: #FFFFFF;
 		line-height: 64rpx;
@@ -1931,12 +1940,12 @@ color: #EC0F0A;margin-right: 10rpx;
 		width: 118rpx;
 		height: 36rpx;
 		border-radius: 4rpx;
-		border: 1px solid #D53533;
+		border: 1px solid #EC0F0A;
 		line-height: 36rpx;
 		text-align: center;
 		margin-top: 12rpx;
 		margin-left: 20rpx;
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 24rpx;
 	}
 	.adviserJt{
@@ -1956,7 +1965,7 @@ color: #EC0F0A;margin-right: 10rpx;
 		width: 40%;
 	}
 	.bxline2{
-		width: 60%;
+		width: 60%;height: 40rpx;
 	}
 	.bxlineTitle{
 		color: #333333;
@@ -1966,15 +1975,15 @@ color: #EC0F0A;margin-right: 10rpx;
 	}
 	.bxlineMs1{
 		line-height: 37rpx;
-		color: #D53533;
+		color: #A26D4F;
 		font-size: 26rpx;
-		padding-left: 12rpx;
+		padding-left: 10rpx;
 	}
 	.bxlineMs2{
-		line-height: 37rpx;
+		line-height: 38rpx;
 		color: #999999;
 		font-size: 24rpx;
-		padding-left: 12rpx;
+		padding-left: 10rpx;
 	}
 	.bxlineIcon{
 		width: 34rpx;
@@ -1999,7 +2008,7 @@ color: #EC0F0A;margin-right: 10rpx;
 			border-radius: 0rpx 4rpx 4rpx 0rpx;
 	}
 	.swiperTk{
-		height: 50vh;
+		height: 52vh;
 		width: 100vw;
 	}
 	.swiper-itemTk{
@@ -2057,19 +2066,19 @@ color: #EC0F0A;margin-right: 10rpx;
 	.goodsPrice1{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 	}
 	.goodsPrice2{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 10rpx;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.goodsPrice11{
 		font-size: 20rpx;
@@ -2084,7 +2093,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	}
 	.goodsPrice33{
 		font-size: 22rpx;
-		color: #8B8B8B;
+		color: #8B8B8B;padding-left: 10rpx;
 	}
 	.goodsPrice4{
 		font-size: 24rpx;
@@ -2142,7 +2151,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	.hotlinestate2{
 		width: 102rpx;
 		height: 44rpx;
-		background:#FF0000 ; 	
+		background:#EC0F0A ; 	
 		line-height: 44rpx;
 		font-weight: 500;
 		color: #FFFFFF;
@@ -2176,7 +2185,7 @@ color: #EC0F0A;margin-right: 10rpx;
 	}
 	.isRecommend{
 		    font-size: 20rpx;
-		    background: #EC0F0A;
+		    background: #57C73D;
 		    height: 30rpx;
 		    padding: 0 6rpx;
 		    border-radius: 6rpx;
@@ -2184,4 +2193,11 @@ color: #EC0F0A;margin-right: 10rpx;
 		    margin-top: 5rpx;
 		    margin-right: 10rpx;
 	}
+	.goodsLeft{
+		position: relative;
+	}
+	.byTj{
+		width: 70rpx;height: 70rpx;top: 0;left: 0;
+		position: absolute;
+	}
 </style>

+ 4 - 4
pages/index/onlineBooking.vue

@@ -709,7 +709,7 @@
 	.newbottom-container-button {
 		width: 203rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		color: #FEFFFE;
 		font-size: 30rpx;
@@ -761,7 +761,7 @@
 	}
 
 	.newyyBox .totalPrice {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size: 32rpx;
 	}
 
@@ -883,7 +883,7 @@
 
 
 	.appraise {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size: 38rpx;
 		font-weight: bold;
 
@@ -963,7 +963,7 @@
 	.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 66rpx;
 		text-align: center;

+ 56 - 56
pages/index/paint.vue

@@ -43,20 +43,20 @@
 					<view class="itemBox" v-if="item2.open==true">
 						<view class="type" :class="{orangeLine:item2.type==1}" @click="select(item2)">
 							<view class="typeName" :class="{orangeColor:item2.type==1}">喷漆</view>
-							
-							<view class="priceBox">
-								<view class="money"><span class="renminbi">¥</span>{{item2.PSalePrice?item2.PSalePrice:'0'}}
-								</view>
-								<view class="old" v-if="item2.PShowScribingType==1"><span>¥</span>{{item2.PScribingPrice?item2.PScribingPrice:'0'}}</view>
+							
+							<view class="priceBox">
+								<view class="money"><span class="renminbi">¥</span>{{item2.PSalePrice?item2.PSalePrice:'0'}}
+								</view>
+								<view class="old" v-if="item2.PShowScribingType==1"><span>¥</span>{{item2.PScribingPrice?item2.PScribingPrice:'0'}}</view>
 							</view>
 						</view>
 						<view class="type marginLeft" :class="{orangeLine:item2.type==2}" @click="select2(item2)">
 							<view class="typeName" :class="{orangeColor:item2.type==2}">钣金喷漆</view>
-							<view class="priceBox">
-								<view class="money"><span
-										class="renminbi">¥</span>{{item2.BPSalePrice?item2.BPSalePrice:'0'}}</view>
-								<view class="old" v-if="item2.BPShowScribingType==1"><span>¥</span>{{item2.BPScribingPrice?item2.BPScribingPrice:'0'}}</view>
-							</view>
+							<view class="priceBox">
+								<view class="money"><span
+										class="renminbi">¥</span>{{item2.BPSalePrice?item2.BPSalePrice:'0'}}</view>
+								<view class="old" v-if="item2.BPShowScribingType==1"><span>¥</span>{{item2.BPScribingPrice?item2.BPScribingPrice:'0'}}</view>
+							</view>
 									
 						</view>
 					</view>
@@ -123,7 +123,7 @@
 				leftIndex: 0,
 				selectItemList: [],
 				sumMoney: 0,
-				qingdanShow: false,
+				qingdanShow: false,
 				themeColor:'',
 			}
 		},
@@ -131,11 +131,11 @@
 			this.carInfo = this.$store.state.carInfo
 			console.log("车=", this.carInfo);
 		},
-		onLoad() {
+		onLoad() {
 			 this.themeColor = uni.getStorageSync("themeColor");
 			this.getData();
 		},
-		methods: {
+		methods: {
 			sure(){
 				if(!this.carInfo){
 					uni.showToast({
@@ -152,19 +152,19 @@
 						duration: 3000
 					});
 					return false;
-				}
-				if (this.selectItemList.length == 0) {
-					uni.showToast({
-						title: '请选择项目',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				uni.navigateTo({
-					url:'paintSure?itemList='+JSON.stringify(this.selectItemList)
-				})
-				 this.$store.commit('mutationsckshopInfo', "")	
+				}
+				if (this.selectItemList.length == 0) {
+					uni.showToast({
+						title: '请选择项目',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				uni.navigateTo({
+					url:'paintSure?itemList='+JSON.stringify(this.selectItemList)
+				})
+				 this.$store.commit('mutationsckshopInfo', "")	
 			},
 			goCarlist() {
 				uni.navigateTo({
@@ -178,7 +178,7 @@
 					content: '确定要清空已选项目吗',
 					success: function(res) {
 						if (res.confirm) {
-							that.selectItemList = [];
+							that.selectItemList = [];
 							that.sumMoney = 0;
 							that.qingdanShow = false;
 							that.getData();
@@ -274,7 +274,7 @@
 							this.sumMoney += item.BPSalePrice;
 						}
 					})
-				}
+				}
 				this.sumMoney = this.sumMoney.toFixed(2);
 				// console.log('selectItemList==', this.selectItemList);
 
@@ -332,7 +332,7 @@
 		padding: 30rpx 20rpx;
 		display: flex;
 		justify-content: space-between;
-		align-items: center;
+		align-items: center;
 		border-bottom: 1rpx solid #EEEEEE;
 	}
 
@@ -394,14 +394,14 @@
 	}
 
 	.lineLeftActive {
-		background: #FFFFFF;
+		background: #FFFFFF;
 		font-weight: bold;
 	}
 
 	.mainRight {
 		width: 596rpx;
 		overflow-y: scroll;
-		background-color: #FFFFFF;
+		background-color: #FFFFFF;
 		
 	}
 
@@ -470,38 +470,38 @@
 	}
 
 	.orangeLine {
-		border: 2rpx solid #FF0000;
+		border: 2rpx solid #EC0F0A;
 	}
 
 	.orangeColor {
-		color: #FF0000;
+		color: #EC0F0A;
 
 	}
 
 	.renminbi {
 		font-size: 22rpx;
-		height: 76rpx;
+		height: 76rpx;
 		line-height: 76rpx;
 	}
-	.priceBox{
-		display: flex;
-		justify-content: center;
-		
+	.priceBox{
+		display: flex;
+		justify-content: center;
+		
 	}
 	.money {
 		height: 76rpx;
 		line-height: 76rpx;
 		font-size: 32rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 		
 	}
-	.old {
-		color: #999999;
-		font-size: 24rpx;
-		height: 33rpx;
-		line-height: 33rpx;
-		text-decoration: line-through;
-		padding-top: 24rpx;
+	.old {
+		color: #999999;
+		font-size: 24rpx;
+		height: 33rpx;
+		line-height: 33rpx;
+		text-decoration: line-through;
+		padding-top: 24rpx;
 	}
 
 	.main {
@@ -537,14 +537,14 @@
 		width: 604rpx;
 	}
 
-	
-	.mainLeftLine {
-		color: #3C3C3C;
-		padding: 30rpx 20rpx;
-		font-size: 26rpx;
-		text-align: left;
-		position: relative;
-		
+	
+	.mainLeftLine {
+		color: #3C3C3C;
+		padding: 30rpx 20rpx;
+		font-size: 26rpx;
+		text-align: left;
+		position: relative;
+		
 	}
 
 	.lineNum {
@@ -797,7 +797,7 @@
 	.settlement {
 		width: 203rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;
@@ -884,4 +884,4 @@
 		display: flex;
 		align-items: center;
 	}
-</style>
+</style>

+ 182 - 182
pages/index/paintSure.vue

@@ -18,18 +18,18 @@
 		</view>
 		<view class="cont">
 			<view class="contKk">
-			
-			<view class="contLine">
-				<view class="contlineLeft">联系人</view>
-				<view class="contlineRight">
-					<input type="text" v-model="customerName" placeholder="请输入联系人姓名" class="contlineRightInput">
-				</view>
-			</view>
-			<view class="contLine">
-				<view class="contlineLeft">手机号</view>
-				<view class="contlineRight">
-					<input type="text" v-model="mobilePhone" placeholder="请输入联系人手机号" class="contlineRightInput">
-				</view>
+			
+			<view class="contLine">
+				<view class="contlineLeft">联系人</view>
+				<view class="contlineRight">
+					<input type="text" v-model="customerName" placeholder="请输入联系人姓名" class="contlineRightInput">
+				</view>
+			</view>
+			<view class="contLine">
+				<view class="contlineLeft">手机号</view>
+				<view class="contlineRight">
+					<input type="text" v-model="mobilePhone" placeholder="请输入联系人手机号" class="contlineRightInput">
+				</view>
 			</view>
 				
 
@@ -57,16 +57,16 @@
 
 			</view>
 
-			<view class="contKk" style="margin-top:20rpx;">
+			<view class="contKk" style="margin-top:20rpx;">
 				<view class="detailedTitle">支付方式</view>
 				<view class="contLine " style="border-bottom: none;">
-					<view class="payLeft" v-if="PayType==1">
-						<image src="../../static/img/icon_weixinzhifu.png" mode="" class="zhifuImg"></image>
-						微信支付
-					</view>
-					<view class="payLeft" v-if="PayType==2">
-						<image src="../../static/img/icon_xianxia.png" mode="" class="zhifuImg"></image>
-						线下支付
+					<view class="payLeft" v-if="PayType==1">
+						<image src="../../static/img/icon_weixinzhifu.png" mode="" class="zhifuImg"></image>
+						微信支付
+					</view>
+					<view class="payLeft" v-if="PayType==2">
+						<image src="../../static/img/icon_xianxia.png" mode="" class="zhifuImg"></image>
+						线下支付
 					</view>
 					<view class="contlineRight">
 						<image src="../../static/img/icon_selectY.png" mode="" class="selectBtn"></image>
@@ -82,18 +82,18 @@
 				
 			</view>
 			<view class="bottomBtn" :style="{background:'#'+themeColor}" @click="submit">提交订单</view>
-		</view>
-		
+		</view>
+		
 		<timeSelect ref="timeSelect" :stationID="StationID" :timedata="timedata" @changeTime="changeTime"></timeSelect>
 	</view>
 </template>
 
-<script>
-	import timeSelect from '@/components/timeSelect/timeSelect.vue'
-	export default {
-		components: {
-			timeSelect
-		},
+<script>
+	import timeSelect from '@/components/timeSelect/timeSelect.vue'
+	export default {
+		components: {
+			timeSelect
+		},
 		
 		data() {
 			return {
@@ -110,12 +110,12 @@
 				mobilePhone: '',
 				comment: '',
 				mydata: '',
-				orderData: '',
-				PayType:0,
-				timedata:'',
-				billDate:'',
+				orderData: '',
+				PayType:0,
+				timedata:'',
+				billDate:'',
 				itemList:[],
-				sheetDetail:[],
+				sheetDetail:[],
 				 themeColor:'',
 				 StationID:'',
 			}
@@ -136,10 +136,10 @@
 			this.goodsnum = opt.itemQty;
 			//console.log(this.carInfo)
 			this.userInfo = uni.getStorageSync("userInfo");
-			this.goodsInfo = uni.getStorageSync("goodsDetail");
+			this.goodsInfo = uni.getStorageSync("goodsDetail");
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.jsMoney()
-			
+			
 			
 			this.$http('openreservation/getInfo', {
 				lat: '',
@@ -147,76 +147,76 @@
 			}, 'GET').then(res => {
 				this.mydata = res.data
 				this.customerName = this.mydata.customerInfo.customerName
-				this.mobilePhone = this.mydata.customerInfo.mobilePhone
+				this.mobilePhone = this.mydata.customerInfo.mobilePhone
+				
+			}),
+			
+			this.getqueryShopList()
+			
+			this.$http('openSheetMetalSprayPaint/queryPayType', {
+				
+			}, 'GET').then(res => {
+				this.PayType = res.data.PayType
+				this.StationID=res.data.StationID
 				
-			}),
-			
-			this.getqueryShopList()
-			
-			this.$http('openSheetMetalSprayPaint/queryPayType', {
-				
-			}, 'GET').then(res => {
-				this.PayType = res.data.PayType
-				this.StationID=res.data.StationID
-				
 			})
 		},
 		onShow() {
-			this.carInfo = this.$store.state.carInfo;
-			let shopInfo = this.$store.state.ckshopInfo;
-			if (shopInfo) {
-				this.shopInfo= shopInfo
-				this.shopInfo.id = this.shopInfo.shopId
-				this.shopID=this.shopInfo.id
-				
-				uni.setStorage({
-					key: 'yyshopInfo',
-					data:this.shopInfo,
-					 success: function () {
-					    
-					 }
-				}); 
-			}
-			
+			this.carInfo = this.$store.state.carInfo;
+			let shopInfo = this.$store.state.ckshopInfo;
+			if (shopInfo) {
+				this.shopInfo= shopInfo
+				this.shopInfo.id = this.shopInfo.shopId
+				this.shopID=this.shopInfo.id
+				
+				uni.setStorage({
+					key: 'yyshopInfo',
+					data:this.shopInfo,
+					 success: function () {
+					    
+					 }
+				}); 
+			}
+			
 			console.log('服务门店选择过-=',this.shopInfo)
 		},
-		methods: {
-			getqueryShopList() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
-			     
-				}, 'GET').then(res => {
-					uni.hideLoading();
-					let list = res.data
-					//console.log('list+=', this.queryShopList);
-					list.forEach((item)=>{
-						/* if (item.thedefault=="true") {
-							this.shopInfo = item
-							this.shopInfo.id = this.shopInfo.shopId
-							this.shopID=this.shopInfo.id
-							uni.setStorage({
-								key: 'yyshopInfo',
-								data:this.shopInfo,
-								 success: function () {
-								    
-								 }
-							}); 
-							
-							console.log('item-=',item)
-						} */
-					})
-					
-			
-				})
-				
-				console.log('默认服务门店-=',this.shopInfo)
-			},
-			changeTime(data){
-				console.log(data)
-				this.billDate=data
-			},
+		methods: {
+			getqueryShopList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('openSheetMetalSprayPaint/queryBpshopList', {
+			     
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					let list = res.data
+					//console.log('list+=', this.queryShopList);
+					list.forEach((item)=>{
+						/* if (item.thedefault=="true") {
+							this.shopInfo = item
+							this.shopInfo.id = this.shopInfo.shopId
+							this.shopID=this.shopInfo.id
+							uni.setStorage({
+								key: 'yyshopInfo',
+								data:this.shopInfo,
+								 success: function () {
+								    
+								 }
+							}); 
+							
+							console.log('item-=',item)
+						} */
+					})
+					
+			
+				})
+				
+				console.log('默认服务门店-=',this.shopInfo)
+			},
+			changeTime(data){
+				console.log(data)
+				this.billDate=data
+			},
 			cktime(){
 				if (!this.shopID) {
 					uni.showToast({
@@ -225,26 +225,26 @@
 						duration: 3000
 					});
 					return false;
-				}
-				 this.$refs.timeSelect.open();
+				}
+				 this.$refs.timeSelect.open();
 			},
 			submit() {
 				console.log(this.shopID)
-				if (!this.shopID) {
-					uni.showToast({
-						title: '请选择服务门店',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
-				}
-				if (this.billDate == '') {
-					uni.showToast({
-						title: '请选择到店服务时间',
-						icon: 'none',
-						duration: 3000
-					});
-					return false;
+				if (!this.shopID) {
+					uni.showToast({
+						title: '请选择服务门店',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.billDate == '') {
+					uni.showToast({
+						title: '请选择到店服务时间',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
 				}
 				//"bizType:1商品2项目3套餐
 				var params = {
@@ -256,7 +256,7 @@
 					carModel: this.carInfo.carModel,
 					totalMoney: this.totalMoney,
 					shopId: this.shopID,
-					comment: this.comment,
+					comment: this.comment,
 					hTime: this.billDate,
 					sheetDetail: JSON.stringify(this.sheetDetail),
 					payType:this.PayType,
@@ -277,11 +277,11 @@
 								title: '提交成功',
 								icon: 'none',
 								duration: 2000
-							});
-							if (this.orderData.sheetType==5){
-								uni.redirectTo({
-									url: "../user/myOrder/paintOrderDetail?id=" +this.orderData.id+'&sx=1'
-								})
+							});
+							if (this.orderData.sheetType==5){
+								uni.redirectTo({
+									url: "../user/myOrder/paintOrderDetail?id=" +this.orderData.id+'&sx=1'
+								})
 							}
 						}
 						
@@ -353,10 +353,10 @@
 								url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +
 									"&SheetType=" + that.orderData.sheetType
 							})
-						}else if (that.orderData.sheetType==5){
-							uni.navigateTo({
-								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
-							})
+						}else if (that.orderData.sheetType==5){
+							uni.navigateTo({
+								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
+							})
 						}
 
 					},
@@ -375,10 +375,10 @@
 								url: "../user/myOrder/mallOrderDetail?id=" + that.orderData.id +
 									"&SheetType=" + that.orderData.sheetType
 							})
-						}else if (that.orderData.sheetType==5){
-							uni.navigateTo({
-								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
-							})
+						}else if (that.orderData.sheetType==5){
+							uni.navigateTo({
+								url: "../user/myOrder/paintOrderDetail?id=" +that.orderData.id
+							})
 						}
 					}
 				});
@@ -413,13 +413,13 @@
 					}
 				}
 			},
-			jsMoney() {
-				
-				var money = 0.00
-				this.itemList.forEach((item)=>{
-					money += item.money
-				})
-				this.totalMoney = money.toFixed(2);
+			jsMoney() {
+				
+				var money = 0.00
+				this.itemList.forEach((item)=>{
+					money += item.money
+				})
+				this.totalMoney = money.toFixed(2);
 				
 				
 			}
@@ -438,15 +438,15 @@
 		justify-content: space-between;
 		position: fixed;
 		left: 0;
-		bottom: 0;
-		padding-bottom: constant(safe-area-inset-bottom);
+		bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
 
 	.bottomLeft {
 		padding-top: 23rpx;
-		padding-left: 30rpx;
-		    height: 74rpx;
+		padding-left: 30rpx;
+		    height: 74rpx;
 		    line-height: 74rpx;
 	}
 
@@ -456,7 +456,7 @@
 	}
 
 	.bottomLeftLine span {
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.bottomPrice {
@@ -473,7 +473,7 @@
 	.bottomBtn {
 		width: 204rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;
@@ -491,17 +491,17 @@
 		background: #FFFFFF;
 		border-radius: 10rpx;
 		padding: 0 20rpx;
-	}
-	.detailedTitle {
-		padding: 22rpx 0;
-		display: flex;
-		text-align: center;
-		align-content: flex-start;
-		
-		
-		font-size: 24rpx;
-		font-weight: bold;
-		color: #666666;
+	}
+	.detailedTitle {
+		padding: 22rpx 0;
+		display: flex;
+		text-align: center;
+		align-content: flex-start;
+		
+		
+		font-size: 24rpx;
+		font-weight: bold;
+		color: #666666;
 	}
 
 	.contLine {
@@ -530,14 +530,14 @@
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
-	}
-	.noColor{
-		color: #CCCCCC;
+	}
+	.noColor{
+		color: #CCCCCC;
 	}
 
 	.carModelRight {
 		display: flex;
-		justify-content: flex-end;
+		justify-content: flex-end;
 		align-items: center;
 	}
 
@@ -549,10 +549,10 @@
 		text-overflow: ellipsis;
 		width: 450rpx;
 		text-align: right;
-	}
-	.selectBtn{
-		width: 36rpx;
-		height: 36rpx;
+	}
+	.selectBtn{
+		width: 36rpx;
+		height: 36rpx;
 	}
 
 	.contlineRightInput {
@@ -572,14 +572,14 @@
 
 	.topBox {
 		height: 140rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		width: 750rpx;
 	}
 
 	.yuanhu {
 		width: 750rpx;
 		height: 30rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 0 0 100% 100%;
 	}
 
@@ -690,21 +690,21 @@
 	.goodsBoxRgiht {
 		padding-left: 24rpx;
 
-	}
-	.zhifuImg{
-		width: 40rpx;
-		height: 40rpx;
-		margin-right: 20rpx;
-		
-	}
-	.payLeft{
-		display: flex;
-		align-items: center;
-		
-		height: 40rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: #333333;
-		line-height: 40rpx;
-	}
-</style>
+	}
+	.zhifuImg{
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 20rpx;
+		
+	}
+	.payLeft{
+		display: flex;
+		align-items: center;
+		
+		height: 40rpx;
+		font-size: 28rpx;
+		font-weight: 400;
+		color: #333333;
+		line-height: 40rpx;
+	}
+</style>

+ 54 - 54
pages/index/personalCard.vue

@@ -33,12 +33,12 @@
 	export default {
 		data() {
 			return {
-				adInfo: {
-					shopName:'',
-					shopInfo:{
-						shopName:''
+				adInfo: {
+					shopName:'',
+					shopInfo:{
+						shopName:''
 					},
-					
+					
 				},
 				themeColor:'',
 			}
@@ -48,63 +48,63 @@
 			this.adInfo = JSON.parse(e.adInfo)
 			 console.log('个人名片传递的参数', this.adInfo);
 			 this.themeColor = uni.getStorageSync("themeColor");
-		},
-		computed: {
-	
-			avatarStr(){
-				return this.adInfo.avatar ? this.adInfo.avatar : '../../static/timg/pic_def_ava@2x.png'
-			},
-
-			shopNameStr(){
-				if (this.adInfo.shopName) {
-					// console.log('this.adInfo.shopName = ',this.adInfo.shopName)
-					return this.adInfo.shopName
-				}
-				else if(this.adInfo.shopInfo.shopName){
-					// console.log('this.adInfo.shopInfo.shopName = ',this.adInfo.shopInfo.shopName)
-					return this.adInfo.shopInfo.shopName
+		},
+		computed: {
+	
+			avatarStr(){
+				return this.adInfo.avatar ? this.adInfo.avatar : '../../static/timg/pic_def_ava@2x.png'
+			},
+
+			shopNameStr(){
+				if (this.adInfo.shopName) {
+					// console.log('this.adInfo.shopName = ',this.adInfo.shopName)
+					return this.adInfo.shopName
+				}
+				else if(this.adInfo.shopInfo.shopName){
+					// console.log('this.adInfo.shopInfo.shopName = ',this.adInfo.shopInfo.shopName)
+					return this.adInfo.shopInfo.shopName
 				}else{
 					var k=''
 					return k
-				}
-			},
-			addressStr() {
-				if (this.adInfo.provinceName) {
-					return this.adInfo.provinceName + this.adInfo.cityName + this.adInfo.areaName + this.adInfo.address	
-				}
-				else
-				{
-					return this.adInfo.shopInfo.provinceName + this.adInfo.shopInfo.cityName + this.adInfo.shopInfo.areaName + (this.adInfo.shopInfo.Address ? this.adInfo.shopInfo.Address :'')
-				}
-			},
+				}
+			},
+			addressStr() {
+				if (this.adInfo.provinceName) {
+					return this.adInfo.provinceName + this.adInfo.cityName + this.adInfo.areaName + this.adInfo.address	
+				}
+				else
+				{
+					return this.adInfo.shopInfo.provinceName + this.adInfo.shopInfo.cityName + this.adInfo.shopInfo.areaName + (this.adInfo.shopInfo.Address ? this.adInfo.shopInfo.Address :'')
+				}
+			},
 		},
 		methods: {
 			// 拨号
-			callOpra() {
-				if (this.adInfo.phone) {
-					uni.makePhoneCall({
-						phoneNumber: this.adInfo.phone,
-						success(e) {
-							console.log(e)
-						},
-						fail: function(e) {
-							console.log(e)
-						}
-					})
-				}
-				else
-				{
-					uni.showToast({
-						title:'没有电话信息',
-						icon: "none",
-						duration:2000
-					})
+			callOpra() {
+				if (this.adInfo.phone) {
+					uni.makePhoneCall({
+						phoneNumber: this.adInfo.phone,
+						success(e) {
+							console.log(e)
+						},
+						fail: function(e) {
+							console.log(e)
+						}
+					})
+				}
+				else
+				{
+					uni.showToast({
+						title:'没有电话信息',
+						icon: "none",
+						duration:2000
+					})
 				}
 			},
 			// 门店地址
 			addressOpra() {
-				// uni.switchTab({
-				// 	url:'/pages/index/index'
+				// uni.switchTab({
+				// 	url:'/pages/index/index'
 				// })
 				uni.navigateTo({
 					url:'onlineBooking?naShopId='+this.adInfo.shopID
@@ -227,11 +227,11 @@
 	.call-btn {
 		flex: 1;
 		margin: 20rpx;
-		background-color: #D53533;
+		background-color: #EC0F0A;
 		border-radius: 37rpx;
 		font-size: 28rpx;
 		color: white;
 		text-align: center;
 		line-height: 74rpx;
 	}
-</style>
+</style>

+ 4 - 4
pages/index/receiveCoupon.vue

@@ -160,7 +160,7 @@
 		width: 368rpx;height: 82rpx;text-align: center;line-height: 82rpx;
 		background: url('http://dmsphoto.66km.com.cn/thFiles/D810AED4-98B9-49DB-87E6-42C015BAD016.png');
 		background-size: 100% 100%;font-weight: 500;
-        color: #FF0000;font-size: 30rpx;
+        color: #EC0F0A;font-size: 30rpx;
 		margin: 0 auto;
 		margin-top: 80rpx;
 	}
@@ -195,11 +195,11 @@
 	}
 	.moneyBs{
 		font-weight: 500;font-size: 28rpx;
-		color: #FF0000;padding-top: 20rpx;
+		color: #EC0F0A;padding-top: 20rpx;
 	}
 	.moneyNum{
 		font-weight: 500;font-size: 48rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.mdsky{
 		font-weight: 400;font-size: 24rpx;
@@ -290,7 +290,7 @@
 			.authorizContbutton{
 				width: 422rpx;
 				height: 88rpx;
-				background: #D53533;
+				background: #EC0F0A;
 				border-radius: 44rpx;
 				line-height: 88rpx;
 				text-align: center;

+ 8 - 8
pages/index/rescue.vue

@@ -480,7 +480,7 @@
 								fontSize: 15, //文本大小
 								borderRadius: 15, //边框圆角
 								padding: '10',
-								bgColor: '#FF0000', //背景颜色
+								bgColor: '#EC0F0A', //背景颜色
 								display: 'ALWAYS', //常显
 							}
 							
@@ -664,9 +664,9 @@
 
 	.tabActive {
 
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
-		border-bottom: 4rpx solid #FF0000;
+		border-bottom: 4rpx solid #EC0F0A;
 
 	}
 
@@ -719,7 +719,7 @@
 		padding-bottom: 30rpx;
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #D53533;
+		color: #EC0F0A;
 		text-align: center;
 	}
 
@@ -764,12 +764,12 @@
 		width: 14rpx;
 		height: 14rpx;
 
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 7rpx;
 	}
   .typeActive{
 	
-	  background: #FF0000;
+	  background: #EC0F0A;
   }
 .typeActive .title{
 	    color: #FFFFFF !important;
@@ -799,7 +799,7 @@
 	}
 	.sure {
 
-		background-color: #D53533;
+		background-color: #EC0F0A;
 		margin: 23rpx 30rpx;
 		height: 74rpx;
 
@@ -861,7 +861,7 @@
 			.authorizContbutton{
 				width: 210rpx;
 				height: 66rpx;
-				background: #D53533;
+				background: #EC0F0A;
 				border-radius: 44rpx;
 				line-height: 66rpx;
 				text-align: center;

+ 5 - 4
pages/index/shopList.vue

@@ -685,7 +685,7 @@
 		margin: 0rpx 24rpx 20rpx;
 		padding: 24rpx 20rpx;
 		background-color: #FFFFFF;
-		border-radius: 10rpx;
+		border-radius: 20rpx;
 		display: flex;
 		position: relative;
 	}
@@ -761,7 +761,7 @@
 		align-items: center;
 		padding: 10rpx 0rpx;
 		flex-wrap: wrap;
-		    height: 36rpx;
+		    height: 34rpx;
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -777,7 +777,7 @@
 		border: 1px solid #F19D01;
 		font-size: 22rpx;
 		line-height: 30rpx;
-		margin: 5rpx 10rpx 5rpx 0rpx;
+		margin: 5rpx 16rpx 5rpx 0rpx;
 	}
 
 	.timeBg {
@@ -788,6 +788,7 @@
 	.shopTime {
 		color: #666666;
 		font-size: 26rpx;
+		padding-top: 10rpx;
 	}
 
 	.addressBox {
@@ -958,7 +959,7 @@
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

+ 4 - 4
pages/index/vipCard.vue

@@ -657,7 +657,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 		width: 40rpx;
 		margin: 0rpx 10rpx;
 		height: 4rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		margin-top: 8rpx;
 	}
 
@@ -788,7 +788,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 
 		font-size: 36rpx;
 		font-weight: bold;
-		color: #FF0000;
+		color: #EC0F0A;
 		line-height: 50rpx;
 	}
 	.moneyBox{
@@ -799,7 +799,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 		align-items: center; 
 	}
 	.count {
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.shiyongBox {
@@ -904,7 +904,7 @@ border-radius: 4rpx;margin-right: 8rpx;
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 4 - 4
pages/integral/exchangeRecord.vue

@@ -30,9 +30,9 @@
 
 			<view class="sum">
 				<span style="font-size: 24rpx; color: #666666; margin-right: 10rpx;">总计</span>
-				<span style="font-size: 32rpx; color: #FF0000; font-weight: 500; margin-right: 5rpx;">{{item.integral}}</span>
+				<span style="font-size: 32rpx; color: #EC0F0A; font-weight: 500; margin-right: 5rpx;">{{item.integral}}</span>
 
-				<span style=" font-size: 24rpx; color: #FF0000;">积分</span>
+				<span style=" font-size: 24rpx; color: #EC0F0A;">积分</span>
 			</view>
 
 
@@ -181,7 +181,7 @@
 
 	.red {
 		font-size: 24rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 
 	}
 
@@ -247,4 +247,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

+ 5 - 5
pages/integral/integral.vue

@@ -326,12 +326,12 @@
 }
 .classificationNameActive{
 	font-weight: 500 !important;
-	color: #FF0000 ;
+	color: #EC0F0A ;
 }
 .classificationHx{
 	width: 40rpx;
 	height: 4rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	margin: 0 auto;
 }
 .exchangeBox{
@@ -355,14 +355,14 @@
 }
 .jfspan1{
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 	font-size:32rpx;
 	line-height: 45rpx;
 	padding-left: 20rpx;
 }
 .jfspan2{
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	font-size:24rpx;
 	line-height: 45rpx;
 	padding-left: 10rpx;
@@ -555,7 +555,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 233 - 233
pages/integral/integralConfirm.vue

@@ -1,246 +1,246 @@
-<template>
- <view class="box">
-	 <view class="topTis">
-		 <view class="tanhao">!</view>
-		 <view class="topTisTxt">提交申请后请到店兑换</view>
-	 </view>
-	 <view class="cont">
-		 <view class="contTitle">商品明细</view>
-		 <view class="goodsCont">
-			 <img :src="jfgoodsDetail.imgList[0].img" alt="" class="goodsImg" v-if="jfgoodsDetail.imgList.length>0">
-			  <image src="../../static/timg/noimg.png"  class="goodsImg" v-else></image>
-		     <view class="goodsRight">
-				 <view class="goodsName">{{jfgoodsDetail.name}}</view>
-				 <view class="goodsNumbox">
-					 <view class="Price" v-if="jfgoodsDetail.salePrice">¥<span>{{jfgoodsDetail.salePrice}}</span> </view>
-					 <view class="goodsNum">x{{goodsnum}}</view>
-				 </view>
-			 </view>
-		 </view>
-	 </view>
-	 <view class="shopCont">
-		 <view class="shopLeft">服务门店</view>
-		 <view class="shopName">{{shopName}}</view>
-	 </view>
-	 <view class="buybtnBox">
-	 	<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>
+<template>
+ <view class="box">
+	 <view class="topTis">
+		 <view class="tanhao">!</view>
+		 <view class="topTisTxt">提交申请后请到店兑换</view>
+	 </view>
+	 <view class="cont">
+		 <view class="contTitle">商品明细</view>
+		 <view class="goodsCont">
+			 <img :src="jfgoodsDetail.imgList[0].img" alt="" class="goodsImg" v-if="jfgoodsDetail.imgList.length>0">
+			  <image src="../../static/timg/noimg.png"  class="goodsImg" v-else></image>
+		     <view class="goodsRight">
+				 <view class="goodsName">{{jfgoodsDetail.name}}</view>
+				 <view class="goodsNumbox">
+					 <view class="Price" v-if="jfgoodsDetail.salePrice">¥<span>{{jfgoodsDetail.salePrice}}</span> </view>
+					 <view class="goodsNum">x{{goodsnum}}</view>
+				 </view>
+			 </view>
+		 </view>
+	 </view>
+	 <view class="shopCont">
+		 <view class="shopLeft">服务门店</view>
+		 <view class="shopName">{{shopName}}</view>
+	 </view>
+	 <view class="buybtnBox">
+	 	<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>
  </view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				shopId:'',
-				shopName:'',
-				avaIntegral:'',
-				goodsnum:'',
-				jfgoodsDetail:'',
-				themeColor:'',
-			}
-		},
-		onLoad(opt) {
-			this.jfgoodsDetail=uni.getStorageSync("jfgoodsDetail");
-			this.shopName=opt.shopName;
-			this.shopId=opt.shopID;
-			this.avaIntegral=opt.avaIntegral;
-			this.goodsnum=opt.goodsnum;
-			this.themeColor = uni.getStorageSync("themeColor");
-		},
-		methods: {
-			
-			goDetail(){
-				uni.navigateTo({
-					url:'integralgoodsDetail'
-				})
-			},
-			goBuy(){
-				uni.showLoading({
-					title: '加载中'
-				})
-				this.$http('openIntegralMall/exchangeApply', {
-				  shopId:this.shopId,
-				  goodsID:this.jfgoodsDetail.id,
-				  qty:this.goodsnum
-				 },'POST').then(res => {
-						uni.hideLoading();
-						if(res.code==0){
-							this.orderData=res.data
-							// uni.showToast({
-							// 	title: '兑换成功',
-							// 	icon: 'none',
-							// 	duration: 3000
-							// });
-							
-							var that = this
-							uni.showModal({
-							    title: '提示',
-							    content: '提交成功',
-								cancelText:'回到首页',
-								confirmText:'查看订单',
-							    success: function (res2) {
-							        if (res2.confirm) {
-										uni.redirectTo({
-											url:'recordDetail?id='+res.data
-										})
-									
-							          
-							        } else if (res2.cancel) {
-							           uni.switchTab({
-							           	url:'../index/index'
-							           })
-							        }
-							    }
-							});
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 3000
-							});
-						}
-				 })
-			}
-		}
+<script>
+	export default {
+		data() {
+			return {
+				shopId:'',
+				shopName:'',
+				avaIntegral:'',
+				goodsnum:'',
+				jfgoodsDetail:'',
+				themeColor:'',
+			}
+		},
+		onLoad(opt) {
+			this.jfgoodsDetail=uni.getStorageSync("jfgoodsDetail");
+			this.shopName=opt.shopName;
+			this.shopId=opt.shopID;
+			this.avaIntegral=opt.avaIntegral;
+			this.goodsnum=opt.goodsnum;
+			this.themeColor = uni.getStorageSync("themeColor");
+		},
+		methods: {
+			
+			goDetail(){
+				uni.navigateTo({
+					url:'integralgoodsDetail'
+				})
+			},
+			goBuy(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('openIntegralMall/exchangeApply', {
+				  shopId:this.shopId,
+				  goodsID:this.jfgoodsDetail.id,
+				  qty:this.goodsnum
+				 },'POST').then(res => {
+						uni.hideLoading();
+						if(res.code==0){
+							this.orderData=res.data
+							// uni.showToast({
+							// 	title: '兑换成功',
+							// 	icon: 'none',
+							// 	duration: 3000
+							// });
+							
+							var that = this
+							uni.showModal({
+							    title: '提示',
+							    content: '提交成功',
+								cancelText:'回到首页',
+								confirmText:'查看订单',
+							    success: function (res2) {
+							        if (res2.confirm) {
+										uni.redirectTo({
+											url:'recordDetail?id='+res.data
+										})
+									
+							          
+							        } else if (res2.cancel) {
+							           uni.switchTab({
+							           	url:'../index/index'
+							           })
+							        }
+							    }
+							});
+						}else{
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 3000
+							});
+						}
+				 })
+			}
+		}
 	}
 </script>
 
-<style scoped>
-.box{
-	background: #F4F5F7;
-	min-height: 100vh;
-}
- .tanhao{
-	 width: 30rpx;
-	 height: 30rpx;
-	 background: #F19D01;
-	 border-radius: 50%;
-	 text-align: center;
-	 line-height: 30rpx;
-	 color: #ffffff;
-	 font-size: 30rpx;
- }
-.topTis{
-	padding: 20rpx 21rpx;
-	background: #FDF5E5;
-	display: flex;
-}
-.topTisTxt{
-	color: #F19D01;font-size: 26rpx;line-height: 30rpx;padding-left: 10rpx;
-}
-.cont{
-	width: 702rpx;
-	background: #FFFFFF;
-	border-radius: 10rpx;
-	margin-left: 24rpx;
-	margin-top: 20rpx;
-}
-.contTitle{
-	font-size: 30rpx;
-	font-family: PingFangSC-Medium, PingFang SC;
-	font-weight: 500;
-	color: #3C3C3C;
-	line-height: 42rpx;
-	padding: 26rpx 20rpx;
-	border-bottom: 1px solid #EEEEEE;
-}
-.goodsImg{
-	width: 120rpx;
-	height: 120rpx;
-}
-.goodsCont{
-	display: flex;
-	padding: 30rpx 20rpx;
-}
-.goodsRight{
-	width: 522rpx;
-	padding-left: 20rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-}
-.goodsName{
-	color: #3C3C3C;font-size: 26rpx;
-}
-.goodsNumbox{
-	display: flex;
-	justify-content: space-between;
-}
-.Price{
-	color: #3C3C3C;font-size: 22rpx;
-}
-.Price span{
-	font-weight: 500;
-	color: #3C3C3C;
-	font-size: 32rpx;
-}
-.goodsNum{
-	color: #999999;font-size: 24rpx;padding-top: 5rpx;
-}
+<style scoped>
+.box{
+	background: #F4F5F7;
+	min-height: 100vh;
+}
+ .tanhao{
+	 width: 30rpx;
+	 height: 30rpx;
+	 background: #F19D01;
+	 border-radius: 50%;
+	 text-align: center;
+	 line-height: 30rpx;
+	 color: #ffffff;
+	 font-size: 30rpx;
+ }
+.topTis{
+	padding: 20rpx 21rpx;
+	background: #FDF5E5;
+	display: flex;
+}
+.topTisTxt{
+	color: #F19D01;font-size: 26rpx;line-height: 30rpx;padding-left: 10rpx;
+}
+.cont{
+	width: 702rpx;
+	background: #FFFFFF;
+	border-radius: 10rpx;
+	margin-left: 24rpx;
+	margin-top: 20rpx;
+}
+.contTitle{
+	font-size: 30rpx;
+	font-family: PingFangSC-Medium, PingFang SC;
+	font-weight: 500;
+	color: #3C3C3C;
+	line-height: 42rpx;
+	padding: 26rpx 20rpx;
+	border-bottom: 1px solid #EEEEEE;
+}
+.goodsImg{
+	width: 120rpx;
+	height: 120rpx;
+}
+.goodsCont{
+	display: flex;
+	padding: 30rpx 20rpx;
+}
+.goodsRight{
+	width: 522rpx;
+	padding-left: 20rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+.goodsName{
+	color: #3C3C3C;font-size: 26rpx;
+}
+.goodsNumbox{
+	display: flex;
+	justify-content: space-between;
+}
+.Price{
+	color: #3C3C3C;font-size: 22rpx;
+}
+.Price span{
+	font-weight: 500;
+	color: #3C3C3C;
+	font-size: 32rpx;
+}
+.goodsNum{
+	color: #999999;font-size: 24rpx;padding-top: 5rpx;
+}
 .buybtnBox{
 	width: 750rpx;
 	height: 120rpx;
 	background: #FFFFFF;
-	box-shadow: 0px -2px 10px 0px rgba(153,153,153,0.2000);
-	display: flex;
-	justify-content: space-between;
-	position: fixed;
-	left: 0;
-	bottom: 0;
+	box-shadow: 0px -2px 10px 0px rgba(153,153,153,0.2000);
+	display: flex;
+	justify-content: space-between;
+	position: fixed;
+	left: 0;
+	bottom: 0;
 	padding-bottom: env(safe-area-inset-bottom);
-}
-.ktyong{
-		font-weight: 500;
-		color: #666666;
-		font-size: 24rpx;
-		padding-left: 30rpx;
-		padding-top: 18rpx;
-	}
    .ktyong1{
-		color: #FF0000;
-		font-size: 32rpx;
-	}
-	.ktyong2{
-		color: #FF0000;
-		font-size: 24rpx;
-	}
-	.kyNum{
-		color: #999999;
-		font-size: 24rpx;
-	}
-	.bottomBtn{
-		width: 204rpx;
-		height: 74rpx;
-		background: #D53533;
-		border-radius: 37rpx;
-		line-height: 74rpx;
-		text-align: center;
-		color: #FFFFFF;
-		font-size: 30rpx;
-		margin-top: 23rpx;
-		margin-left: 70rpx;
-		margin-right: 30rpx;
-	}
-.shopCont{
-	background: #FEFFFE;
-	border-radius: 10rpx;
-	width: 702rpx;
-	padding: 30rpx 0;
-	margin-top: 20rpx;
-	margin-left: 24rpx;
-	display: flex;
-	justify-content: space-between;
-}
-.shopLeft{
-	color: #666666;
-	font-size: 28rpx;
-	padding-left: 20rpx;
-}
-.shopName{
-	color: #333333;font-size: 28rpx;
-	padding-right: 20rpx;
+}
+.ktyong{
+		font-weight: 500;
+		color: #666666;
+		font-size: 24rpx;
+		padding-left: 30rpx;
+		padding-top: 18rpx;
+	}    .ktyong1{
+		color: #EC0F0A;
+		font-size: 32rpx;
+	}
+	.ktyong2{
+		color: #EC0F0A;
+		font-size: 24rpx;
+	}
+	.kyNum{
+		color: #999999;
+		font-size: 24rpx;
+	}
+	.bottomBtn{
+		width: 204rpx;
+		height: 74rpx;
+		background: #EC0F0A;
+		border-radius: 37rpx;
+		line-height: 74rpx;
+		text-align: center;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 23rpx;
+		margin-left: 70rpx;
+		margin-right: 30rpx;
+	}
+.shopCont{
+	background: #FEFFFE;
+	border-radius: 10rpx;
+	width: 702rpx;
+	padding: 30rpx 0;
+	margin-top: 20rpx;
+	margin-left: 24rpx;
+	display: flex;
+	justify-content: space-between;
+}
+.shopLeft{
+	color: #666666;
+	font-size: 28rpx;
+	padding-left: 20rpx;
+}
+.shopName{
+	color: #333333;font-size: 28rpx;
+	padding-right: 20rpx;
 }
 </style>

+ 18 - 18
pages/integral/integralgoodsDetail.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="box">
 	<view class="spwBox">
-		<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+		<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
 			<swiper-item v-for="(item,index) in info.imgList">
 				<view class="swiper-item">
 					<img mode="aspectFit" :src="item.img" alt="" class="swiper-itemImg" v-if="item.imgType==1">
@@ -476,7 +476,7 @@
 		width: 460rpx;
 	}
 	.surplus{
-		color: #FF0000;font-size: 24rpx;padding-top: 6rpx;
+		color: #EC0F0A;font-size: 24rpx;padding-top: 6rpx;
 	}
 	.ktyong{
 		
@@ -485,16 +485,16 @@
 		padding-left: 30rpx;
 		padding-top: 18rpx;
 	}    .ktyong1{
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size: 32rpx;
 	}
 	.ktyong2{
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size: 24rpx;
 	}
 	.jfspan1{
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size:32rpx;
 		line-height: 45rpx;
 		
@@ -504,7 +504,7 @@
 	}
 	.jfspan2{
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size:24rpx;
 		line-height: 45rpx;
 		padding-left: 10rpx;
@@ -548,7 +548,7 @@
 		color: #FFFFFF;
 		width: 41rpx;
 		text-align: center;
-		background: #F03B3B;
+		background: #EC0F0A;
 		border-radius: 6rpx;
 		margin-top: 9rpx;
 		margin-left: 15rpx;
@@ -594,7 +594,7 @@
 .buyBtn{
 	width: 690rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	text-align: center;
 	line-height: 74rpx;
@@ -732,21 +732,21 @@
 	.goodsPrice11{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 		padding-right: 10rpx;
 	}
 	.goodsPrice22{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 		
 	}
 	.goodsPrice33{
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.goodsPrice44{
 		font-size: 24rpx;
@@ -813,7 +813,7 @@ button{
 .bottomBtn{
 	width: 204rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	line-height: 74rpx;
 	text-align: center;
@@ -916,12 +916,12 @@ button{
 .fwlcyuan{
 	width: 16rpx;
 	height: 16rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 50%;
 }
 .fwHx{
 	height: 4rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	width: 186rpx;
 	margin-top: 7rpx;
 }
@@ -960,14 +960,14 @@ button{
 .goodsPrice1{
 	font-size: 24rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 14rpx;
 	padding-right: 14rpx;
 }
 .goodsPrice2{
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 10rpx;
 	
 }
@@ -975,7 +975,7 @@ button{
 .goodsPrice3{
 	font-size: 40rpx;
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .goodsPrice4{
 	font-size: 24rpx;
@@ -1083,7 +1083,7 @@ button{
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

+ 16 - 16
pages/integral/recordDetail.vue

@@ -111,9 +111,9 @@
 
 			<view class="sum">
 				<span style="font-size: 24rpx; color: #666666; margin-right: 10rpx;">总计</span>
-				<span style="font-size: 32rpx; color: #FF0000; 
+				<span style="font-size: 32rpx; color: #EC0F0A; 
 			font-weight: 500; margin-right: 5rpx;">{{orderData.integral}}</span>
-				<span style=" font-size: 24rpx; color: #FF0000;">积分</span>
+				<span style=" font-size: 24rpx; color: #EC0F0A;">积分</span>
 			</view>
 
 		</view>
@@ -205,8 +205,8 @@
 
 		methods: {
 
-			showMa() {
-				this.isShowMa = !this.isShowMa
+			showMa() {
+				this.isShowMa = !this.isShowMa
 			},
 
 			copy(txt) {
@@ -389,7 +389,7 @@
 
 	.top {
 		height: 190rpx;
-		background-color: #FF0000;
+		background-color: #EC0F0A;
 
 	}
 
@@ -413,8 +413,8 @@
 	.orderTop {
 		background: #FFFFFF;
 		border-radius: 10rpx;
-		margin: 20rpx 24rpx;
-		
+		margin: 20rpx 24rpx;
+		
 		margin-top: -60rpx;
 	}
 
@@ -426,7 +426,7 @@
 
 	.timeRight {
 		font-size: 26rpx;
-		color: #3F90F7;
+		color: #3F90F7;
 		margin-right: 8rpx;
 	}
 
@@ -506,9 +506,9 @@
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
 
-	}
-	.wuMa{
-		margin-top: -60rpx;
+	}
+	.wuMa{
+		margin-top: -60rpx;
 	}
 
 	.shopCont {
@@ -597,7 +597,7 @@
 	.redPoint {
 		width: 10rpx;
 		height: 10rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 10rpx;
 		margin-right: 10rpx;
 	}
@@ -689,7 +689,7 @@
 		margin-top: 34rpx;
 		display: flex;
 		justify-content: flex-end;
-		align-items: center;
+		align-items: center;
 		padding-right: 20rpx;
 	}
 
@@ -790,12 +790,12 @@
 	}
 
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -848,4 +848,4 @@
 	}
 
 	
-</style>
+</style>

+ 19 - 19
pages/integral/scoreRecord.vue

@@ -17,21 +17,21 @@
 		<view class="itemHistory" v-for="(item,index) in itemData" :key="index">
 
 			<view class="carPlate">
-				<view class="plate" v-if="item.bizType==0">支付使用积分</view>
-				<view class="plate" v-if="item.bizType==1">积分清理</view>
-				<view class="plate" v-if="item.bizType==2">积分兑换</view>
-				<view class="plate" v-if="item.bizType==3">积分调整</view>
-				<view class="plate" v-if="item.bizType==4">下单送积分</view>
-				<view class="plate" v-if="item.bizType==5">取消支付回收积分</view>
-				<view class="plate" v-if="item.bizType==6">取消支付返回使用积分</view>
-				<view class="plate" v-if="item.bizType==7">期初导入</view>
-				<view class="plate" v-if="item.bizType==8">兑换取消</view>
-				<view class="plate" v-if="item.bizType==9">每日签到</view>
+				<view class="plate" v-if="item.bizType==0">支付使用积分</view>
+				<view class="plate" v-if="item.bizType==1">积分清理</view>
+				<view class="plate" v-if="item.bizType==2">积分兑换</view>
+				<view class="plate" v-if="item.bizType==3">积分调整</view>
+				<view class="plate" v-if="item.bizType==4">下单送积分</view>
+				<view class="plate" v-if="item.bizType==5">取消支付回收积分</view>
+				<view class="plate" v-if="item.bizType==6">取消支付返回使用积分</view>
+				<view class="plate" v-if="item.bizType==7">期初导入</view>
+				<view class="plate" v-if="item.bizType==8">兑换取消</view>
+				<view class="plate" v-if="item.bizType==9">每日签到</view>
 				<view class="plate" v-if="item.bizType==10">积分过期</view>
-				<view class="plate" v-if="item.bizType==12">评价积分</view>
-				
+				<view class="plate" v-if="item.bizType==12">评价积分</view>
 				
-				<view class="mileage" v-if="item.type==1">+{{item.integral}}</view>
+				
+				<view class="mileage" v-if="item.type==1">+{{item.integral}}</view>
 				<view class="jian" v-if="item.type==2" style="font-weight: 500;">-{{item.integral}}</view>
 			</view>
 			<view class="time">{{item.createTime}}</view>
@@ -199,7 +199,7 @@
 
 	.time {
 		font-size: 24rpx;
-		color: #999999;
+		color: #999999;
 		margin-top: 8rpx;
 	}
 
@@ -218,12 +218,12 @@
 
 	.mileage {
 		font-size: 30rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
 	}
-	.jian{
-		font-size: 30rpx;
-		color: #333333;
+	.jian{
+		font-size: 30rpx;
+		color: #333333;
 	}
 
 
@@ -233,4 +233,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

+ 2 - 2
pages/partner/bonus.vue

@@ -181,7 +181,7 @@
 	color: #3C3C3C;
 }
 .amount{
-	color: #FF0000;font-weight: 500;
+	color: #EC0F0A;font-weight: 500;
 }
 .authorizBox{
 			width: 100vw;
@@ -233,7 +233,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 2 - 2
pages/partner/partner.vue

@@ -118,7 +118,7 @@
 .top-box{
 	width: 750rpx;
 	height: 192rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	
 }
 .topCont{
@@ -151,7 +151,7 @@
 	color: #666666;	font-size: 28rpx;padding-top: 28rpx;
 }
 .topContLIneNum{
-	color: #FF0000;
+	color: #EC0F0A;
 	font-size: 40rpx;
 	font-family: PingFangSC-Medium, PingFang SC;
 	font-weight: 500;

+ 2 - 2
pages/partner/people.vue

@@ -190,7 +190,7 @@
 	color: #3C3C3C;
 }
 .amount{
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .nickNameImg{
 	width: 30rpx;
@@ -246,7 +246,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 3 - 3
pages/referral/extract.vue

@@ -12,7 +12,7 @@
 					placeholder="请输入提现金额" v-model="money" @input="inputValue" />
 				<view class="allBtn" @click="allBtn">全部提现</view>
 			</view>
-			<view class="zongMoney">可提现金额: <span style="color: #FF0000;padding-right: 10rpx;">¥{{detail.canMoney}}  </span>  (冻结金额:{{detail.freezeMoney}}) </view>
+			<view class="zongMoney">可提现金额: <span style="color: #EC0F0A;padding-right: 10rpx;">¥{{detail.canMoney}}  </span>  (冻结金额:{{detail.freezeMoney}}) </view>
 
 			
 		</view>
@@ -224,7 +224,7 @@
 
 	.allBtn {
 		font-size: 26rpx;
-		color: #FF0000;
+		color: #EC0F0A;
 		width: 200rpx;
 		height: 50rpx;
 		line-height: 50rpx;
@@ -274,7 +274,7 @@
 		margin: 20rpx 30rpx;
 		border-radius: 37rpx;
 		height: 74rpx;
-        background: #D53533;
+        background: #EC0F0A;
 		color: #FFFFFF;
 		font-size: 30rpx;
 		text-align: center;

+ 1 - 1
pages/referral/extractList.vue

@@ -132,7 +132,7 @@
 	color: #3C3C3C;
 }
 .amount{
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .nickNameImg{
 	width: 30rpx;

+ 4 - 4
pages/referral/myConnections.vue

@@ -114,7 +114,7 @@
 	font-size: 30rpx;
 	font-family: PingFangSC-Medium, PingFang SC;
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 	line-height: 42rpx;
 	
 }
@@ -122,12 +122,12 @@
 	padding-top: 23rpx;padding-bottom: 8rpx;
 }
 .tabActive{
-	color: #FF0000 !important;
+	color: #EC0F0A !important;
 }
 .tabkk{
 	width: 40rpx;
 	height: 4rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	margin: 0 auto;
 }
 .nickName{
@@ -173,7 +173,7 @@
 	color: #3C3C3C;
 }
 .amount{
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .nickNameImg{
 	width: 30rpx;

+ 3 - 3
pages/referral/rebateList.vue

@@ -119,12 +119,12 @@
 	padding-top: 23rpx;padding-bottom: 8rpx;
 }
 .tabActive{
-	color: #FF0000 !important;
+	color: #EC0F0A !important;
 }
 .tabkk{
 	width: 40rpx;
 	height: 4rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	margin: 0 auto;
 }
 .lineContLeftImg{
@@ -163,6 +163,6 @@
 	color: #3C3C3C;
 }
 .amount{
-	color: #FF0000;
+	color: #EC0F0A;
 }
 </style>

+ 3 - 3
pages/referral/referral.vue

@@ -160,13 +160,13 @@
 	font-size: 40rpx;
 	font-family: PingFangSC-Semibold, PingFang SC;
 	font-weight: 600;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 24rpx;
 }
 .topRight{
 	width: 138rpx;
 	height: 64rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 10rpx;
 	line-height: 64rpx;
 	text-align: center;
@@ -199,7 +199,7 @@
 .xfflyq{
 	width: 10rpx;
 	height: 10rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 50%;
 	margin-top: 12rpx;
 	margin-right: 14rpx;

+ 3 - 3
pages/referral/referralExplain.vue

@@ -72,13 +72,13 @@
 	font-size: 40rpx;
 	font-family: PingFangSC-Semibold, PingFang SC;
 	font-weight: 600;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 24rpx;
 }
 .topRight{
 	width: 138rpx;
 	height: 64rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 10rpx;
 	line-height: 64rpx;
 	text-align: center;
@@ -110,7 +110,7 @@
 .xfflyq{
 	width: 10rpx;
 	height: 10rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 50%;
 	margin-top: 12rpx;
 	margin-right: 14rpx;

+ 2 - 2
pages/report/complete.vue

@@ -316,7 +316,7 @@
 	.topbox{
 	    width: 750rpx;
 	    height: 200rpx;
-	    background: #FF0000;
+	    background: #EC0F0A;
 	  }
 	.carBox{
 		width: 702rpx;
@@ -663,7 +663,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 2 - 2
pages/report/working.vue

@@ -298,7 +298,7 @@
 	.topbox{
 	    width: 750rpx;
 	    height: 200rpx;
-	    background: #FF0000;
+	    background: #EC0F0A;
 	  }
 	.carBox{
 		width: 702rpx;
@@ -642,7 +642,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 4 - 4
pages/shop/confirm.vue

@@ -350,7 +350,7 @@
 	font-size: 24rpx;
 }
 .bottomLeftLine span{
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .bottomPrice{
 	font-size: 32rpx;
@@ -364,7 +364,7 @@
 .bottomBtn{
 	width: 204rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	text-align: center;
 	line-height: 74rpx;
@@ -426,13 +426,13 @@
 }
 .topBox{
 	height: 140rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	width: 750rpx;
 }
 .yuanhu{
 	width: 750rpx;
 	height: 30rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 0 0 100% 100%;
 }
 .goodsBox{

+ 13 - 13
pages/shop/goodsDetail.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="box">
 	<view class="spwBox">
-		<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+		<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
 			<swiper-item v-for="(item,index) in info.ImgList">
 				<view class="swiper-item">
 					<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" v-if="item.bizType==1">
@@ -591,7 +591,7 @@
 		color: #FFFFFF;
 		width: 41rpx;
 		text-align: center;
-		background: #F03B3B;
+		background: #EC0F0A;
 		border-radius: 6rpx;
 		margin-top: 9rpx;
 		margin-left: 15rpx;
@@ -635,7 +635,7 @@
 .buyBtn{
 	width: 690rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	text-align: center;
 	line-height: 74rpx;
@@ -770,21 +770,21 @@
 	.goodsPrice11{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 		padding-right: 10rpx;
 	}
 	.goodsPrice22{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 		
 	}
 	.goodsPrice33{
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.goodsPrice44{
 		font-size: 24rpx;
@@ -846,7 +846,7 @@ button{
 .bottomBtn{
 	width: 450rpx;
 	height: 74rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 	line-height: 74rpx;
 	text-align: center;
@@ -948,12 +948,12 @@ button{
 .fwlcyuan{
 	width: 16rpx;
 	height: 16rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 50%;
 }
 .fwHx{
 	height: 4rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	width: 186rpx;
 	margin-top: 7rpx;
 }
@@ -992,14 +992,14 @@ button{
 .goodsPrice1{
 	font-size: 24rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 14rpx;
 	padding-right: 14rpx;
 }
 .goodsPrice2{
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 10rpx;
 	
 }
@@ -1007,7 +1007,7 @@ button{
 .goodsPrice3{
 	font-size: 40rpx;
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .goodsPrice4{
 	font-size: 24rpx;
@@ -1115,7 +1115,7 @@ button{
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

+ 10 - 10
pages/shop/shop.vue

@@ -175,11 +175,11 @@
 				if(this.themeColor=='FF4F00'){
 					var backgroundImage='/static/tabimg/shopFF4F00.png'
 				}
-				if(this.themeColor=='D53533'){
+				if(this.themeColor=='EC0F0A'){
 					var backgroundImage='/static/tabimg/shop1.png'
 				}
 				/* uni.setTabBarStyle({
-				  // color: '#FF0000',
+				  // color: '#EC0F0A',
 				  selectedColor: '#'+this.themeColor,
 				})
 				uni.setTabBarItem({
@@ -541,7 +541,7 @@
 			color: #FFFFFF;
 			width: 41rpx;
 			text-align: center;
-			background: #F03B3B;
+			background: EC0F0A;
 			border-radius: 6rpx;
 			margin-top: 9rpx;
 			margin-left: 10rpx;
@@ -568,7 +568,7 @@ top: 40rpx;
 z-index: 11;
 }
 .pxActive{
-	color: #FF0000 !important;
+	color: #EC0F0A !important;
 }
 .paixuLineTbtopIcon{
 	width: 16rpx;
@@ -636,12 +636,12 @@ z-index: 11;
 }
 .classificationNameActive{
 	font-weight: 500 !important;
-	/* color: #FF0000 ; */
+	/* color: #EC0F0A ; */
 }
 .classificationHx{
 	width: 40rpx;
 	height: 4rpx;
-	// background: #FF0000;
+	// background: #EC0F0A;
 	margin: 0 auto;
 }
 .paixuBox{
@@ -695,19 +695,19 @@ z-index: 11;
 	.goodsPrice1{
 		font-size: 24rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 8rpx;
 	}
 	.goodsPrice2{
 		font-size: 22rpx;
 		font-weight: 400;
-		color: #FF0000;
+		color: #EC0F0A;
 		padding-top: 10rpx;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.goodsPrice4{
 		font-size: 24rpx;
@@ -775,7 +775,7 @@ z-index: 11;
 	.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 66rpx;
 		text-align: center;

+ 1 - 1
pages/shop/wp.vue

@@ -192,7 +192,7 @@
 				// 透明背景
 				 ctx.setFillStyle('rgba(255, 255, 255, 0)')
 				//ctx.setFillStyle('#FFFFFF')
-				//ctx.setFillStyle('#D53533')
+				//ctx.setFillStyle('#EC0F0A')
 				ctx.fillRect(0, 0, this.canvasW, this.canvasH)
 				// draw card round rect
 				this.drawback(ctx)

+ 3 - 3
pages/subPack/aboutUS.vue

@@ -128,13 +128,13 @@
 	font-size: 40rpx;
 	font-family: PingFangSC-Semibold, PingFang SC;
 	font-weight: 600;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 24rpx;
 }
 .topRight{
 	width: 138rpx;
 	height: 64rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 10rpx;
 	line-height: 64rpx;
 	text-align: center;
@@ -166,7 +166,7 @@
 .xfflyq{
 	width: 10rpx;
 	height: 10rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 50%;
 	margin-top: 12rpx;
 	margin-right: 14rpx;

+ 3 - 3
pages/subPack/depositDetail.vue

@@ -177,7 +177,7 @@
 	}
 .top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 	.orderState {
@@ -259,12 +259,12 @@
 		padding-bottom: env(safe-area-inset-bottom);
 	}
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 180rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

+ 1 - 1
pages/subPack/depositList.vue

@@ -123,7 +123,7 @@
 	padding-left: 24rpx;
 }
 .state1{
-	color: #FF0000;font-size: 24rpx;
+	color: #EC0F0A;font-size: 24rpx;
 }
 .state2{
 	color: #00A040;font-size: 24rpx;

+ 1 - 1
pages/subPack/feedBack.vue

@@ -265,7 +265,7 @@
 	.shoreDz {
 		width: 702rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;

+ 15 - 15
pages/subPack/jkDetail.vue

@@ -70,7 +70,7 @@
 				<image src="../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
 				<view class="ptmobilePhone">{{info.shareOpenGroup.firstMobilePhone}}</view>
 			</view>
-			<view class="DiffBNumber">还差 <span style="#FF0000">{{info.shareOpenGroup.groupNumber - info.shareGroupList.length}}</span> 人,赶快邀请好友来拼团吧</view>
+			<view class="DiffBNumber">还差 <span style="#EC0F0A">{{info.shareOpenGroup.groupNumber - info.shareGroupList.length}}</span> 人,赶快邀请好友来拼团吧</view>
 		    <view class="ptBtnBox" v-if="!ifMyself">
 				<view class="yqhypt" @click="jionPt">参与拼团</view>
 		    </view>
@@ -1254,30 +1254,30 @@ color: #FFFFFF;font-size: 26rpx;
 	height: 74rpx;
 	background: #FFE4E2;
 	border-radius: 37rpx;
-	text-align: center;color:#D53533;
+	text-align: center;color:#EC0F0A;
 }
 .separate .separateTop{
-	color:#D53533;
+	color:#EC0F0A;
 }
 .separate .separateTxt{
-	color:#D53533;
+	color:#EC0F0A;
 }
 .groupBtn{
 	width: 284rpx;text-align: center;color: #ffffff;
 	height: 74rpx;margin-left: 30rpx;
-	background: #D53533;
+	background: #EC0F0A;
 	border-radius: 37rpx;
 }
 .separateTop{
 	font-weight: 500;font-size: 28rpx;
-	color: #D53533;
+	color: #EC0F0A;
 }
 .groupBtnTop{
 	font-weight: 500;font-size: 28rpx;
 	color: #FFFFFF;padding-top: 2rpx;
 }
 .separateTxt{
-	color: #D53533;font-size: 26rpx;line-height: 26rpx;
+	color: #EC0F0A;font-size: 26rpx;line-height: 26rpx;
 }
 .groupBtnTxt{
 	color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;
@@ -1367,7 +1367,7 @@ color: #FFFFFF;font-size: 26rpx;
 	.bmBtn{
 		width: 690rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;
@@ -1454,7 +1454,7 @@ color: #FFFFFF;font-size: 26rpx;
 	.bottomBtn{
 		width: 598rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		line-height: 74rpx;
 		text-align: center;
@@ -1503,7 +1503,7 @@ color: #FFFFFF;font-size: 26rpx;
 		color: #FFFFFF;
 		width: 41rpx;
 		text-align: center;
-		background: #F03B3B;
+		background: EC0F0A;
 		border-radius: 6rpx;
 		margin-top: 9rpx;
 		margin-left: 15rpx;
@@ -1580,7 +1580,7 @@ color: #FFFFFF;font-size: 26rpx;
 	line-height: 78rpx;
 }
 .signupTops1{
-	color: #FF0000;font-weight: 500;
+	color: #EC0F0A;font-weight: 500;
 	font-size: 28rpx;
 }
 .signupTops1{
@@ -1876,7 +1876,7 @@ color: #FFFFFF;font-size: 26rpx;
 		.authorizContbutton{
 			width: 210rpx;
 			height: 66rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 66rpx;
 			text-align: center;
@@ -1936,7 +1936,7 @@ color: #FFFFFF;font-size: 26rpx;
 		.ptTime{
 			width: 42rpx;font-size: 24rpx;
 			height: 42rpx;text-align: center;line-height: 42rpx;
-			background: #FF0000;
+			background: #EC0F0A;
 			border-radius: 6rpx;
 			font-weight: 500;
 			color: #FFFFFF;
@@ -1953,9 +1953,9 @@ color: #FFFFFF;font-size: 26rpx;
 		}
 		.seeTy{
 			width: 260rpx;line-height: 62rpx;text-align: center;
-			height: 62rpx;color: #FF0000;
+			height: 62rpx;color: #EC0F0A;
 			border-radius: 36rpx;font-size: 26rpx;
-			border: 2rpx solid #FF0000;
+			border: 2rpx solid #EC0F0A;
 		}
 		.ptBtnBox{
 			display: flex;

+ 2 - 2
pages/subPack/luckList.vue

@@ -194,9 +194,9 @@
 	}
 	
 	.tabActive {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
-		border-bottom: 4rpx solid #FF0000;
+		border-bottom: 4rpx solid #EC0F0A;
 	
 	}
 </style>

+ 34 - 18
pages/subPack/maintain.vue

@@ -42,7 +42,7 @@
 		 		 <view class="spTitle">适配推荐</view>
 		 		 <view class="spMs">
 		 			 <span>保养记录</span>
-		 			 <span>  | </span>
+		 			 <span style="padding: 0 10rpx;">  | </span>
 		 			 <span>保养手册</span>
 		 		 </view>
 		 </view>
@@ -86,7 +86,7 @@
 							 <span class="tcSpan1">¥</span>
 							 <span class="tcSpan2">{{v.price}}</span>
 							 <span class="tcSpan3">/次</span>
-							 <span class="tcSpan3">¥{{v.money}}</span>
+							 <span class="tcSpan3" style="padding-left: 10rpx;">¥{{v.money}}</span>
 							<!-- <span class="tcSpan3" style="padding-left: 10rpx;">2次</span>
 							 <span class="tcSpan1">¥588</span> -->
 						 </view>
@@ -95,6 +95,7 @@
 			 </view>
 		 </view>
 	 
+	 <view style="height: 220rpx;"></view>
  </view>
  
  <view class="bottom">
@@ -112,7 +113,7 @@
 			<view class="bLeftImgBox">
 				<image class="qingdanIcon" src="../../static/img2/qingdan.png" mode=""></image>
 				<view class="qdTxt">清单</view>
-				<view class="qdNum">1</view>
+				<view class="qdNum" v-if="qdNum">{{qdNum}}</view>
 			</view>
 			<view>
 				<view class="bottomprice">
@@ -142,7 +143,7 @@
 				 </view>
 				 
 			 </view>
-			 <image class="chahao" src="../../static/img2/chahao.png" mode=""></image>
+			 <image @click="qdTkclose" class="chahao" src="../../static/img2/chahao.png" mode=""></image>
 		 </view>
 		 <view class="buyLine">
 		 		 <view class="buyTitle">商品规格</view>
@@ -195,6 +196,7 @@
 				itemDefault:'',
 				lineItem:'',
 				maintainProjectID:'',
+				qdNum:'',
 			}
 		},
 		onLoad(opt) {
@@ -230,6 +232,9 @@
 			qingdan(){
 				this.tkShow=true;
 			},
+			qdTkclose(){
+			  this.qdTkclose=false	
+			},
 			selectItem(v,item){
 				this.list.forEach(item=>{
 					item.packageItems.forEach(v=>{
@@ -240,6 +245,7 @@
 			  this.totalPrice=v.money
 			  this.itemDefault=v
 			  this.lineItem=item
+			  this.qdNum=1
 			},
 			goCkcar(){
 				uni.navigateTo({
@@ -344,7 +350,7 @@
 	display: flex;justify-content: space-between;
 }
 .xiaIcon{
-	width: 12rpx;height: 9rpx;margin-top: 18rpx;
+	width: 12rpx;height: 9rpx;margin-top: 18rpx;margin-left: 10rpx;
 }
 .ibCarIcon{
 	height: 42rpx;width: 42rpx;
@@ -362,7 +368,7 @@
 	display: flex;padding-left: 10rpx;
 }
 .glInput{
-	width: 160rpx;line-height: 42rpx;height: 42rpx;
+	width: 120rpx;line-height: 42rpx;height: 42rpx;
 	padding-left: 10rpx;
 }
 .msIcon{
@@ -381,10 +387,12 @@
 	padding-left: 30rpx;padding-right: 30rpx;
 }
 .spBox{
-	background: linear-gradient( 180deg, #FFFFFF 0%, #F4F4F4 100%);
+	background: linear-gradient( 180deg, #FFFFFF 0%, #F4F4F4 50%);
 	border-radius: 23rpx;
 	padding: 24rpx 20rpx 0 24rpx;
 	margin-top: -50rpx;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
 }
 .spTop{
 	display: flex;justify-content: space-between;line-height: 40rpx;
@@ -433,7 +441,7 @@
 .lineImg{
 	width: 162rpx;
 	height: 162rpx;
-	border-radius: 10rpx;
+	border-radius: 16rpx;
 }
 .lineTop{
 	display: flex;
@@ -498,7 +506,7 @@ color: #666666;padding-left: 25rpx;
 	font-size: 34rpx;
 	color: #000000;
 }
-.tcSpan2{
+.tcSpan3{
 	font-size: 20rpx;
 	color: #000000;
 }
@@ -522,6 +530,7 @@ color: #666666;padding-left: 25rpx;
 	bottom: 0rpx;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom);
+	background: #FFFFFF;
 }
 .kaBox{
 	height: 70rpx;
@@ -579,8 +588,8 @@ color: #A26D4F;
 	text-align: center;line-height: 22rpx;
 	font-size: 16rpx;
 	color: #FFFFFF;
-	top: -2rpx;
-	right: -4rpx;
+	top: 0rpx;
+	right: -8rpx;
 	border-radius: 50%;
 }
 .qdTxt{
@@ -615,14 +624,14 @@ color: #A26D4F;
 .goodsPrice1{
 	font-size: 24rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 14rpx;
 	padding-right: 14rpx;
 }
 .goodsPrice2{
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 10rpx;
 	
 }
@@ -630,7 +639,7 @@ color: #A26D4F;
 .goodsPrice3{
 	font-size: 40rpx;
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .goodsPrice4{
 	font-size: 24rpx;
@@ -711,7 +720,7 @@ color: #666E80;
 	height: 36rpx;
 }
 .goodsnum{
-	width: 88rpx;
+	width: 44rpx;
 	height: 44rpx;
 	background: #F4F5F7;
 	line-height: 44rpx;
@@ -720,11 +729,13 @@ color: #666E80;
 	color: #333333;
 	font-size: 24rpx;
 	margin: 0 4rpx;
+	border-left:1px solid #C0C0C0;
+	border-right:1px solid #C0C0C0;
 }
 .goodsnumInput{
-	width: 88rpx;
+	width: 44rpx;
 	height: 44rpx;
-	background: #F4F5F7;
+	background: #FFFFFF;
 	line-height: 44rpx;
 	text-align: center;
 	font-weight: 500;
@@ -734,13 +745,17 @@ color: #666E80;
 .numJj{
 	width: 44rpx;
 	height: 44rpx;
-	background: #F4F5F7;
+	background: #ffffff;
 	border-radius: 0px 6rpx 6rpx 0px;	
 	text-align: center;
 	line-height: 44rpx;
 	font-size: 32rpx;
 	color: #999999;
 }
+.numJsbox{
+	border: 1px solid #C0C0C0;
+	border-radius: 6rpx;
+}
 .tkBottomBtn{
 	width: 661rpx;text-align: center;
 	height: 86rpx;line-height: 86rpx;
@@ -761,5 +776,6 @@ color: #666E80;
 }
 .lineActive{
 	border: 1px solid #FE0200;
+	background: #FFF7F7;
 }
 </style>

+ 267 - 41
pages/subPack/maintainItem.vue

@@ -2,8 +2,8 @@
 <view class="box">
 
  <view class="spwBox">
- 	<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
- 		<swiper-item v-for="(item,index) in ImgList">
+ 	<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
+ 		<swiper-item v-for="(item,index) in detail.openMaintainImgUrls">
  			<view class="swiper-item">
  				<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" >
  				
@@ -29,7 +29,7 @@
 		<!-- <view class="goodsMs" v-if="detail.showOilType">机油类型|{{detail.showOilType}}</view>
 		<view class="goodsMs" v-if="detail.showOilLevel">机油等级|{{detail.showOilLevel}}</view>
 		<view class="goodsMs" v-if="detail.showFit">适配粘度|{{detail.showFit}}</view> -->
-		<view class="goodsMs" v-if="detail.content">{{detail.content}}</view>
+		<view class="goodsMs" v-for="(item,index) in detail.content.split(',')">{{item}}</view>
 	</view>
 	<view class="timeBox">
 		<view class="itemTime" v-if="detail.validityType==1">套餐有效期:{{detail.validityTime}}</view>
@@ -43,7 +43,9 @@
  <view class="buyBOx">
 	 <view class="buyLine" @click="ckCar">
 		 <view class="buyTitle">已选车型</view>
-		 <view class="buyData">{{carInfo.carModel?carInfo.carModel:''}}
+		 <view class="buyData" style="display: flex;">
+			 <view class="carModelLine">   {{carInfo.carModel?carInfo.carModel:''}}</view>
+		
 		   <image class="jtIcon" src="../../static/timg/jthei.png" mode=""></image>
 		 </view>
 	 </view>
@@ -53,7 +55,7 @@
 	 		 <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}"
+				 :class="{activeGuige:item.id==itemDefault.id}" v-if="item.isShow==1"
 				  v-for="(item,index) in detail.packageItems">{{item.title}}</view>
 			 </view>
 	 </view>
@@ -76,11 +78,11 @@
 	 <view class="buyLine">
 	 		 <view class="buyTitle">可用门店</view>
 	 		 <view class="buyData" v-if="itemDefault.packTimeShopName=='全部'">全部门店</view>
-			  <view class="buyData" v-else>{{itemDefault.packTimeShopName.split(',').length}}个门店可用</view>
+			 <view @click="keyongFn" class="buyData" v-else>{{itemDefault.packTimeShopName.split(',').length}}个门店可用</view>
 	 </view>
  </view>
  
- <view class="mealBox">
+ <view class="mealBox" v-if="itemDefault.content">
 	 <view class="fwlcTitle">套餐内容</view>
 	  <rich-text :nodes="itemDefault.content" style="background: #fff;"></rich-text>
 <!-- 	 <view class="mealTop">
@@ -113,7 +115,7 @@
  </view>
  
  <!-- 商品详情 -->
- <view class="goodsDetail" >
+ <view class="goodsDetail" v-if="detail.detailContent">
  	<view class="goodsDetailTitle">商品详情</view>
  	<!-- <view v-html="info.details" style="background: #fff;"></view> -->
  	 <rich-text :nodes="detail.detailContent" style="background: #fff;"></rich-text>
@@ -130,6 +132,71 @@
  	</view>
  
  
+ 
+ <!-- 提交订单弹框-->
+ <view class="tkBox" v-if="tkShow" @click="closeTk">
+ 	 <view class="tkCont" @click.stop="">
+ 		 <view class="tkTop">
+			 <image class="tkImg" v-if="detail.mainImgUrl" :src="detail.mainImgUrl" mode="" ></image>
+ 			 <image class="tkImg" v-else src="../../static/timg/noimg.png" mode="" ></image>
+ 			 <view class="tkNameBox">
+ 				 <view class="tkName">{{detail.title}}</view>
+ 				 <view class="goodsPrice">
+ 				 	<view class="goodsPrice2">¥</view>
+ 				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
+ 				 	<view class="goodsPrice4" >原价:¥{{itemDefault.crossedPrice}}</view>
+ 				 </view>
+ 				 
+ 			 </view>
+ 			 <image class="chahao" src="../../static/img2/chahao.png" mode=""  @click="closeTk"></image>
+ 		 </view>
+ 		 <view class="buyLine">
+ 		 		 <view class="buyTitle">商品规格</view>
+ 		 		 <view class="buyData">
+ 		 				 <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">{{itemDefault.title}}</view>
+ 		 				<!-- <view class="goodsGuige">保养套餐卡</view> -->
+ 		 			 </view>
+ 		 </view>
+ 		 <view class="buyLine">
+ 		 		 <view class="buyTitle">商品数量</view>
+ 		 		 <view class="buyData">
+ 		 				 <view class="numJsbox">
+ 		 				 	<view class="numJj" @click="calculation(1)">-</view>
+ 		 				 	<view class="goodsnum">
+ 		 				 	 <input type="number" value="" v-model="goodsnum" class="goodsnumInput"/>
+ 		 				 	</view>
+ 		 				 	<view class="numJj" @click="calculation(2)">+</view>
+ 		 				 </view>
+ 		 			 </view>
+ 		 </view>
+ 		 
+ 		 <view class="tkBottom">
+ 			 <view class="tkBottomBtn" @click="goSubmit">立即购买</view>
+ 		 </view>
+ 		 
+ 	 </view>
+ </view>
+ 
+ 
+ 
+ <!-- 提交订单弹框-->
+ 
+ <!-- 门店列表-->
+ <view class="tkBox" v-if="keyongShow" @click="keyongClose">
+	 <view class="tkCont2">
+		 <view class="tkTOp2">
+			  <view class="chahao"></view>
+			  <view class="kymd">可用门店</view>
+			  <image class="chahao" src="../../static/img2/chahao.png" mode=""  @click="closeTk"></image>
+		 </view>
+		 <view class="keyongBOx">
+			 <view class="keyongLine" v-for="(item,index) in itemDefault.packTimeShopName.split(',')">
+				 {{item}}
+			 </view>
+		 </view>
+	 </view>
+ </view>
+ 
 </view>
 </template>
 
@@ -143,10 +210,7 @@
 			return {
 				themeColor:'',
 				ext:'',
-				ImgList:[
-					{url:'http://dmsphoto.66km.com.cn/thFiles/339E5DB5-F727-4F0F-AD41-1A2EBAB73883.png'},
-					{url:'http://dmsphoto.66km.com.cn/thFiles/53DA3E26-5FA3-42DE-95A4-10BA255290A6.png'},
-				],
+				
 				goodsnum:1,
 				details:'11233',
 				maintainId:'',
@@ -155,6 +219,8 @@
 				carInfo:'',
 				userInfo:'',
 				isRecommend:'',
+				tkShow:false,
+				keyongShow:false,
 			}
 		},
 		onLoad(opt) {
@@ -193,21 +259,33 @@
 			goodsGuige(item){
 				this.itemDefault=item
 			},
+			goSubmit(){
+				this.itemDefault.goodsnum=this.goodsnum
+				this.itemDefault.goodsname=this.detail.title
+				this.itemDefault.itemId=this.detail.id
+				this.itemDefault.mainImgUrl=this.detail.mainImgUrl
+				uni.setStorage({
+					key: 'itemDefault',
+					data: this.itemDefault,
+					 success: function () {
+					    uni.navigateTo({
+					    	url:'maintainSubmit'
+					    })
+					 }
+				}); 
+			},
+			closeTk(){
+				this.tkShow=false
+			},
+			keyongClose(){
+				this.keyongShow=false;
+			},
+			keyongFn(){
+				this.keyongShow=true;
+			},
 			submitFn(){
 				if(this.itemDefault){
-					this.itemDefault.goodsnum=this.goodsnum
-					this.itemDefault.goodsname=this.detail.title
-					this.itemDefault.itemId=this.detail.id
-					this.itemDefault.mainImgUrl=this.detail.mainImgUrl
-					uni.setStorage({
-						key: 'itemDefault',
-						data: this.itemDefault,
-						 success: function () {
-						    uni.navigateTo({
-						    	url:'maintainSubmit'
-						    })
-						 }
-					}); 
+					this.tkShow=true
 				}else{
 					uni.showToast({
 						 title: '请选择商品规格',
@@ -249,7 +327,15 @@
 						if(item.isDefault==1){
 							 this.itemDefault=item
 						}
+						if(item.content){
+							item.content=item.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+						}
+						
 					})
+					if(this.detail.detailContent){
+						this.detail.detailContent=this.detail.detailContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+					}
+					
 				   
 				})
 			},
@@ -270,7 +356,7 @@
 	width: 750rpx;
 	height: 700rpx;
 	background: #FFFFFF;
-	border-bottom: 1px solid #EEEEEE;
+/* 	border-bottom: 1px solid #EEEEEE; */
 }
 .swiper-item{
 	width: 750rpx;
@@ -286,29 +372,29 @@
 .goodsPrice1{
 	font-size: 24rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 14rpx;
 	padding-right: 14rpx;
 }
 .goodsPrice2{
 	font-size: 28rpx;
 	font-weight: 400;
-	color: #FF0000;
+	color: #EC0F0A;
 	padding-top: 10rpx;
 	
 }
 
 .goodsPrice3{
-	font-size: 40rpx;
+	font-size: 44rpx;
 	font-weight: 500;
-	color: #FF0000;
+	color: #EC0F0A;
 }
 .goodsPrice4{
 	font-size: 24rpx;
 	font-weight: 400;
 	color: #999999;
 	padding-top: 14rpx;
-/* 	text-decoration:line-through; */
+	text-decoration:line-through; 
 	padding-left: 10rpx;
 }
 .Sold{
@@ -338,7 +424,7 @@
 }
 .shopCtop{
 	display: flex;
-	padding: 20rpx 24rpx;
+	padding: 20rpx 24rpx 6rpx 20rpx;
 	justify-content: space-between;
 	background: #FFFFFF;
 }
@@ -346,7 +432,7 @@
 	display: flex;padding-left: 24rpx;
 }
 .goodsMs{
-	font-size: 16rpx;
+	font-size: 18rpx;
 	color: #FF063A;
 	padding: 4rpx 8rpx;
 	border-radius: 6rpx;
@@ -372,7 +458,7 @@ line-height: 33rpx;
 }
 .buyLine{
 	display: flex;justify-content: space-between;
-	padding: 20rpx 24rpx;font-size: 26rpx;
+	padding: 15rpx 24rpx;font-size: 26rpx;
 color: #666E80;
 }
 .buyBOx{
@@ -383,13 +469,14 @@ color: #666E80;
 	color: #222222;display: flex;
 }
 .goodsGuige{
-	width: 150rpx;
+/* 	width: 150rpx; */
 	height: 50rpx;line-height: 50rpx;
 	background: #F6F6F6;
 	border-radius: 5rpx;
 	font-size: 24rpx;
 	color: #222222;text-align: center;
 	margin-left: 24rpx;
+	padding: 0 20rpx;
 }
 .activeGuige{
 	width: 146rpx;
@@ -425,7 +512,7 @@ color: #666E80;
 	height: 36rpx;
 }
 .goodsnum{
-	width: 88rpx;
+	width: 44rpx;
 	height: 44rpx;
 	background: #F4F5F7;
 	line-height: 44rpx;
@@ -434,11 +521,13 @@ color: #666E80;
 	color: #333333;
 	font-size: 24rpx;
 	margin: 0 4rpx;
+	border-left:1px solid #C0C0C0;
+	border-right:1px solid #C0C0C0;
 }
 .goodsnumInput{
-	width: 88rpx;
+	width: 44rpx;
 	height: 44rpx;
-	background: #F4F5F7;
+	background: #FFFFFF;
 	line-height: 44rpx;
 	text-align: center;
 	font-weight: 500;
@@ -448,20 +537,24 @@ color: #666E80;
 .numJj{
 	width: 44rpx;
 	height: 44rpx;
-	background: #F4F5F7;
+	background: #ffffff;
 	border-radius: 0px 6rpx 6rpx 0px;	
 	text-align: center;
 	line-height: 44rpx;
 	font-size: 32rpx;
 	color: #999999;
 }
+.numJsbox{
+	border: 1px solid #C0C0C0;
+	border-radius: 6rpx;
+}
 .mealBox{
 	background: #FFFFFF;
 	padding: 20rpx 24rpx;
 	margin-top: 20rpx;
 }
 .fwlcTitle{
-	color: #333333;font-size: 30rpx;font-weight: 500;
+	color: #666666;font-size: 30rpx;font-weight: 500;
 }
 .mealTop{
 	display: flex;
@@ -523,7 +616,7 @@ color: #666E80;
 	line-height: 38rpx;
 }
 .goodsDetailTitle{
-	color: #333333;
+	color: #666666;
 	font-size: 30rpx;
 	font-weight: 500;
 	background: #FFFFFF;
@@ -582,4 +675,137 @@ color: #666E80;
 	flex-wrap: wrap;justify-content: flex-end;
 	width: 500rpx;
 }
+.tkBox{
+	width: 100vw;height: 100vh;background: rgba(0,0,0,0.5);
+	position: fixed;left: 0;top: 0;
+	z-index: 11;
+}
+.tkCont{
+	width: 750rpx;
+	height: 611rpx;
+	background: #FFFFFF;
+	border-radius: 28rpx 28rpx 0rpx 0rpx;
+	position: absolute;
+	left: 0;bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+}
+.tkCont2{
+	width: 750rpx;
+	height:50vh;
+	background: #FFFFFF;
+	border-radius: 28rpx 28rpx 0rpx 0rpx;
+	position: absolute;
+	left: 0;bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	overflow-y: auto;
+}
+.tkTop{
+	display: flex;padding: 40rpx 24rpx;
+	padding-bottom: 25rpx;
+}
+.tkImg{
+	width: 160rpx;
+	height: 160rpx;border-radius: 13rpx;
+}
+.tkName{
+	font-size: 30rpx;
+	color: #222222;
+	line-height: 42rpx;
+}
+.tkNameBox{
+	padding-left: 24rpx;width: 500rpx;
+}
+.chahao{
+	width: 22rpx;height: 22rpx;padding-top: 10rpx;
+}
+.buyLine{
+	display: flex;justify-content: space-between;
+	padding: 15rpx 24rpx;font-size: 26rpx;
+color: #666E80;
+}
+.buyBOx{
+	background: #FFFFFF;margin-top: 20rpx;
+	
+}
+.buyData{
+	color: #222222;display: flex;
+
+	
+}
+.carModelLine{
+		max-width: 560rpx;
+	white-space: nowrap;      /* 确保文本在一行内显示 */
+	  overflow: hidden;         /* 超出容器部分隐藏 */
+	  text-overflow: ellipsis
+}
+
+.activeGuige{
+	width: 146rpx;
+	height: 46rpx;line-height: 46rpx;
+	border: 2rpx solid #FF0035;
+	border-radius: 5rpx;
+	font-size: 24rpx;
+	color: #FF0035;text-align: center;
+	background: #ffffff;
+	font-weight: 500;
+}
+.numJsbox{
+	display: flex;
+}
+.buyCont{
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 750rpx;
+	height: 688rpx;
+	background: #FFFFFF;
+	border-radius: 26rpx 26rpx 0px 0px;
+}
+.buyNumBox{
+	padding: 30rpx;
+    padding-top: 10rpx;
+	padding-bottom: 70rpx;
+}
+.buyContCh{
+	position: absolute;
+	top: 53rpx;
+	right: 36rpx;
+	width: 36rpx;
+	height: 36rpx;
+}
+
+
+.tkBottomBtn{
+	width: 661rpx;text-align: center;
+	height: 86rpx;line-height: 86rpx;
+	background: #FCD903;
+	border-radius: 43rpx;
+	font-size: 32rpx;
+	color: #110B01;
+}
+.tkBottom{
+	width: 750rpx;
+	height: 146rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx -2rpx 16rpx 0rpx rgba(153,153,153,0.2);
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	display: flex;justify-content: center;align-items: center;
+	position: absolute;left: 0;bottom: 0;
+}
+.tkTOp2{
+	display: flex;justify-content: space-between;
+	font-size: 30rpx;
+	padding: 30rpx;
+}
+.keyongLine{
+	padding: 16rpx 24rpx;
+	font-size: 26rpx;
+	border-bottom: 1px solid #eaeaea;
+}
+.mealBox img{
+	width: 100%;
+}
 </style>

+ 13 - 10
pages/subPack/maintainSubmit.vue

@@ -6,19 +6,22 @@
 		 <image class="itemIMg" v-else src="../../static/timg/noimg.png" mode=""></image>
 		 <view class="itemRight">
 		 	<view class="itemName">{{itemDefault.goodsname}}</view>
-			<view class="buyType">{{itemDefault.title}}</view>
+			<view style="display: flex;">
+					<view class="buyType">{{itemDefault.title}}</view>
+			</view>
+		
 			<view class="priceBox">
 				<view class="price">¥{{itemDefault.money}}</view>
-				<view class="itemNum">X{{itemDefault.goodsnum}}</view>
+				<view class="itemNum">x{{itemDefault.goodsnum}}</view>
 			</view>
 			<view class="itemnotes">注:该商品购买后不支持线上退款</view>
 		 </view>
 	 </view>
 
  
- <view class="mealBox">
- 	 <view class="fwlcTitle">套餐内容</view>
- 	
+      <view class="mealBox" v-if="itemDefault.content">
+		 <view class="fwlcTitle" >套餐内容</view>
+		 <rich-text :nodes="itemDefault.content" style="background: #fff;"></rich-text>
 	 </view>
 	 <view class="goodsBox">
 	 	 <view class="goodsline flex" style="border-bottom: 1px solid #EEEEEE;">
@@ -27,7 +30,7 @@
 	 	 </view>
 	 	 <view class="goodsline flex" >
 	 	 		 <view class="goodsLeft"></view>
-	 	 		 <view class="goodRight" style="font-size: 26rpx;font-weight: 500;">合计 <span style="color: #EC0F0A;"> ¥{{totalPrice}}</span></view>
+	 	 		 <view class="goodRight" style="font-size: 26rpx;font-weight: 500;">合计 <span style="color: #EC0F0A;padding-left: 6rpx;">¥{{totalPrice}}</span></view>
 	 	 </view>
 	 </view>
 	 <view class="goodsBox">
@@ -48,7 +51,7 @@
  <view class="bottom">
 	 <view class="bleft">
 		 <span>合计</span>
-		 <span>¥</span>
+		 <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>
@@ -229,7 +232,7 @@
 	line-height: 40rpx;
 }
 .buyType{
-	width: 106rpx;text-align: center;
+	min-width: 106rpx;text-align: center;
 	height: 32rpx;line-height: 32rpx;
 	border-radius: 5rpx;
 	border: 1px solid #FF0035;font-size: 22rpx;
@@ -321,13 +324,13 @@ margin-top: 10rpx;
 	line-height: 38rpx;
 }
 .goodsBox{
-	padding: 10rpx 18rpx;font-size: 26rpx;
+	padding: 0rpx 18rpx;font-size: 26rpx;
 color: #222222;background: #FFFFFF;margin-top: 20rpx;
 border-radius: 16rpx;
 }
 .goodsline{
 	justify-content: space-between;
-	padding: 18rpx 0;
+	padding: 28rpx 0;
 }
 .bottom{
 	background: #FFFFFF;

+ 4 - 4
pages/subPack/oldhistoryDetail.vue

@@ -464,7 +464,7 @@
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -734,7 +734,7 @@
 
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 		display: flex;
 
 		align-items: center;
@@ -768,7 +768,7 @@
 	}
 
 	.goodsCostNum {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
 	}
 
@@ -1096,7 +1096,7 @@
 	.authorizContbutton {
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

+ 6 - 5
pages/subPack/paySuccess.vue

@@ -3,8 +3,9 @@
    <view class="imgBox">
 	   <image class="duihao" src="../../static/img/icon_selectY.png" mode=""></image>
    </view>
-   <view class="txt" v-if="type==1">下单成功</view>
-   <view class="txt" v-if="type==2">付款失败</view>
+  <!-- <view class="txt" v-if="type==1">下单成功</view>
+   <view class="txt" v-if="type==2">付款失败</view> -->
+   <view class="txt" >下单成功</view>
    <view class="goBack" @click="goBack">返回首页</view>
  
 </view>
@@ -23,11 +24,11 @@
 		},
 		onLoad(opt) {
 			this.type=opt.type
-			if(this.type==2){
+			/* if(this.type==2){
 				uni.setNavigationBarTitle({
 				    title: '下单失败' //页面标题为"新标题"
 				});
-			}
+			} */
 			
 		},
 		onShow() {
@@ -70,7 +71,7 @@
 .goBack{
 	font-weight: 400;
 	font-size: 26rpx;
-	color: #F03B3B;
+	color: #EC0F0A;
 	line-height: 37rpx;
 	text-align: center;
 	padding-top: 30rpx;

+ 4 - 4
pages/subPack/rescueOrder.vue

@@ -232,9 +232,9 @@
 	}
 
 	.tabActive {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
-		border-bottom: 4rpx solid #FF0000;
+		border-bottom: 4rpx solid #EC0F0A;
 
 	}
 
@@ -266,7 +266,7 @@
 		color: #999999
 	}
 	.redColor {
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.orangeColor {
 		color: #F19D01;
@@ -404,7 +404,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 8 - 8
pages/subPack/rescueOrderOrderDetail.vue

@@ -858,7 +858,7 @@ color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 .ptTime{
 	width: 42rpx;font-size: 24rpx;
 	height: 42rpx;text-align: center;line-height: 42rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 6rpx;
 	font-weight: 500;
 	color: #FFFFFF;
@@ -875,9 +875,9 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 }
 .seeTy{
 	width: 260rpx;line-height: 62rpx;text-align: center;
-	height: 62rpx;color: #FF0000;
+	height: 62rpx;color: #EC0F0A;
 	border-radius: 36rpx;font-size: 26rpx;
-	border: 2rpx solid #FF0000;
+	border: 2rpx solid #EC0F0A;
 	margin-right: 15rpx;
 }
 .ptBtnBox{
@@ -939,7 +939,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -1085,7 +1085,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.redPoint {
 		width: 10rpx;
 		height: 10rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 10rpx;
 		margin-right: 10rpx;
 	}
@@ -1260,12 +1260,12 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1429,7 +1429,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 2 - 2
pages/user/ShopAppraiseList.vue

@@ -22,7 +22,7 @@
 					<view class="secondView">
 						<view class="fen">总分</view>
 						<!-- 星星 -->
-						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF0000"
+						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#EC0F0A"
 							:size="13" :margin="2" :readonly="true" />
 
 						<view class="count">服务态度{{item.ServiceEvaluation}}星</view>
@@ -377,4 +377,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

+ 23 - 13
pages/user/addCar/addCar.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-        <homenav :iStatusBarHeight="iStatusBarHeight" :title="'我的车库'" :cj="3"></homenav>
+        <homenav :iStatusBarHeight="iStatusBarHeight" :bgColor="bgColor" :title="'我的车库'" :cj="3"></homenav>
 		<!-- 填写车辆信息 -->
 		<!-- <view class="carMessage">
 			
@@ -67,7 +67,7 @@
 					<view class="mbContBox">
 						<view style="display: flex;justify-content: space-between;">
 							<view class="brand">{{carModelInfo.carModelInfo.brand?carModelInfo.carModelInfo.brand:''}}
-							 &nbsp;  {{carModelInfo.carModelInfo.carModel?carModelInfo.carModelInfo.carModel:''}}
+							 &nbsp;{{carModelInfo.carModelInfo.carModel?carModelInfo.carModelInfo.carModel:''}}
 							</view>
 						    <view class="lineRgiht" @click="goModel">
 						    	<view class="lineRtxt">重新选择</view>
@@ -176,14 +176,15 @@
 					"value": "ids"
 				},
 				vin: '',
-				type:'',
-				themeColor:'',
+				type:'',
+				themeColor:'',
                 title: 'Hello',
                 keyMode:'keyboard',
                 keyTitle:'VIN',
                 keyType:'1',
 				iStatusBarHeight:'',
 				plateNoArr:[],
+			    bgColor:'#FFF8E2'
 			}
 		},
 		onLoad(opt) {
@@ -193,7 +194,7 @@
 				this.carModelInfo = carModelInfo;
 			}
 			//uni.removeStorageSync('carModelInfo');
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
 
 			this.getNowFormatDate();
 
@@ -207,6 +208,10 @@
 				uni.setNavigationBarTitle({
 					title: '编辑爱车'
 				})
+				/* uni.setNavigationBarColor({
+					frontColor: "#000000",
+					backgroundColor: '#FFF8E2'
+				}) */
 			}
 		},
 		onShow() {
@@ -499,7 +504,7 @@
 					brandLogo: "",
 					buyDate: this.time,
 					guidePrice: "",
-					vIN: this.vin,
+					vIN: this.vin,
 					id:this.carId,
 				};
 				if(this.carModelInfo){
@@ -519,7 +524,7 @@
 						brandLogo: this.carModelInfo.carModelInfo.logo,
 						buyDate: this.time,
 						guidePrice: this.carModelInfo.carModelInfo.guidePrice,
-						vIN: this.vin,
+						vIN: this.vin,
 						id:this.carId,
 					}
 				}
@@ -559,7 +564,7 @@
 		padding-top: 20rpx;
 	}
 .logo{
-	width: 125rpx;height: 125rpx;border-radius: 50%;
+	width: 120rpx;height: 120rpx;border-radius: 50%;
 }
 .newBox{
 	padding: 24rpx;
@@ -589,7 +594,7 @@
 	padding-right: 10rpx;
 }
 .jtIcon{
-	width: 10rpx;height: 20rpx;margin-top: 10rpx;
+	width: 10rpx;height: 20rpx;margin-top: 15rpx;
 }
 .brand{
 	font-weight: 500;
@@ -597,6 +602,11 @@
 	color: #090909;
 	line-height: 45rpx;
 	width: 350rpx;
+	overflow: hidden;
+	  text-overflow: ellipsis;
+	  display: -webkit-box;
+	  -webkit-line-clamp: 2;
+	  -webkit-box-orient: vertical;
 }
 .mbCont{
 	display: flex;
@@ -658,7 +668,7 @@
 }
 .jbLine{
 	border-bottom: 1px solid #EEEEEE;
-	padding: 12rpx 0;
+	padding: 16rpx 0;
 }
 .jtIcon2{
 	width: 10rpx;height: 20rpx;margin-top: 8rpx;
@@ -686,7 +696,7 @@
 .jbMS{
 	font-weight: 400;
 	font-size: 24rpx;
-	color: #9A9A9A;padding-top: 20rpx;
+	color: #9A9A9A;padding-top: 30rpx;
 }
 .complete{
 	width: 661rpx;text-align: center;
@@ -726,7 +736,7 @@
 
 	.noSelectColor {
 		color: #999999;
-
+        font-size: 24rpx;
 	}
 
 	.selectColor {
@@ -799,7 +809,7 @@
 
 	.saveCar {
 
-		background-color: #D53533;
+		background-color: #EC0F0A;
 		margin: 23rpx 30rpx;
 		height: 74rpx;
 

+ 7 - 7
pages/user/addCar/cailist.vue

@@ -284,7 +284,7 @@
 		width: 34rpx;height: 34rpx;
 	}
 	.nextCaretxt{
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.nextCare{
 		font-size: 20rpx;
@@ -325,7 +325,7 @@
 
 	.saveCar {
 
-		background: #D53533;
+		background: #EC0F0A;
 		margin: 23rpx 30rpx;
 		height: 74rpx;
 
@@ -355,8 +355,8 @@
 
 	.line {
 		background: #FFFFFF;
-		padding: 20rpx 20rpx;
-		border-radius: 10rpx;
+		padding: 24rpx 20rpx;
+		border-radius: 16rpx;
 		margin-bottom: 20rpx;
 		position: relative;
 	}
@@ -399,7 +399,7 @@
 	.lineDel {
 		/* width: 94rpx; */
 		height: 50rpx;
-		border-radius: 25rpx;
+		border-radius: 28rpx;
 		border: 1px solid #DDDDDD;
 		text-align: center;
 		line-height: 50rpx;
@@ -451,7 +451,7 @@
 		width: 74rpx;
 		height: 40rpx;
 		/* background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%); */
-		border-radius: 10px 0rpx 10px 0rpx;
+		border-radius: 16px 0rpx 16px 0rpx;
 		text-align: center;
 		line-height: 40rpx;
 		color: #222222;
@@ -509,7 +509,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 3 - 3
pages/user/appraise.vue

@@ -6,7 +6,7 @@
 				<view class="title">总体评价</view>
 				<view class=" " style="padding-left: 30rpx;">
 					<view class="xxBox">
-						<uni-rate v-model="grade" :max="5" color="#EEEEEE" active-color="#FF0000" :size="20" :margin="20"
+						<uni-rate v-model="grade" :max="5" color="#EEEEEE" active-color="#EC0F0A" :size="20" :margin="20"
 							@change="gradeCl" />
 						<view class="td orangeColor" v-if="grade==5">非常好</view>
 						<view class="td orangeColor" v-if="grade==4">很好</view>
@@ -316,7 +316,7 @@
 	}
 
 	.orangeColor {
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 
 	.rowView {
@@ -410,7 +410,7 @@
 	.shoreDz {
 		width: 702rpx;
 		height: 74rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 37rpx;
 		text-align: center;
 		line-height: 74rpx;

+ 9 - 9
pages/user/bespeakDetail.vue

@@ -109,7 +109,7 @@
 				orderData: '',
 				timedata:'',
 				billDate:'',
-				 themeColor:'',
+				 themeColor:'',
                 iStatusBarHeight:'',
 				stationID:'',
 			}
@@ -117,7 +117,7 @@
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
-			 this.themeColor = uni.getStorageSync("themeColor");
+			 this.themeColor = uni.getStorageSync("themeColor");
 
 			if (this.id) {
 				this.getData()
@@ -272,7 +272,7 @@
 
 	.top {
 		height: 190rpx;
-		background-color: #FF0000;
+		background-color: #EC0F0A;
 
 	}
 
@@ -529,7 +529,7 @@
 	}
 
 	.informationNum {
-		color: #333333;
+		color: #333333;
 		width: 524rpx;
 	}
 
@@ -790,9 +790,9 @@
 		height: 98rpx;
 		width: 100vw;
 		position: fixed;
-		bottom: 0rpx;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
 		
 	}
 	.cancel{
@@ -807,12 +807,12 @@
 		margin-right: 40rpx;
 	}
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;

+ 22 - 22
pages/user/expertServices.vue

@@ -8,7 +8,7 @@
 				</view>
 				<view class="ad-con-box">
 					<image :src="usersAvatarStr" mode="aspectFit" class="ad-icon-mine"></image>
-					<view class="ad-list-r">
+					<view class="ad-list-r">
 						<text class="ad-name">{{users.name}}</text>
 					</view>
 				</view>
@@ -21,9 +21,9 @@
 		</view>
 		<!-- 服务顾问list -->
 		<view class="ad-list" v-for="(item,index) in queryManagerList" :key="item.id" @click="goDetail(item)">
-			<image :src="item.avatar ? item.avatar : '../../static/timg/pic_def_ava@2x.png'" class="ad-list-img"></image>
-			<view class="ad-list-r">
-				<text class="ad-name">{{item.name}}</text>
+			<image :src="item.avatar ? item.avatar : '../../static/timg/pic_def_ava@2x.png'" class="ad-list-img"></image>
+			<view class="ad-list-r">
+				<text class="ad-name">{{item.name}}</text>
 			</view>
 
 			<view class="address-arrow">
@@ -53,11 +53,11 @@
 		onLoad() {
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.getQueryManagerList()
-		},
-		computed: {
-			usersAvatarStr() {
-				return this.users.avatar ? this.users.avatar : '../../static/timg/pic_def_ava@2x.png'
-			}
+		},
+		computed: {
+			usersAvatarStr() {
+				return this.users.avatar ? this.users.avatar : '../../static/timg/pic_def_ava@2x.png'
+			}
 		},
 		methods: {
 			getQueryManagerList() {
@@ -66,8 +66,8 @@
 				})
 				this.$http('openmy/queryManager', {}, 'GET').then(res => {
 					uni.hideLoading();
-					this.queryManagerList = res.data.userlist
-					this.users = res.data.users
+					this.queryManagerList = res.data.userlist
+					this.users = res.data.users
 					
 					console.log('服务顾问列表===', res);
 				})
@@ -99,7 +99,7 @@
 	}
 
 	.ad-bg-box {
-		background-color: #FF0000;
+		background-color: #EC0F0A;
 		padding: 20rpx 24rpx;
 	}
 	.ad-box {
@@ -126,22 +126,22 @@
 		border-radius: 50rpx;
 	}
 
-	.ad-con-box-r {
-		display: flex;
-		flex-direction: column;
+	.ad-con-box-r {
+		display: flex;
+		flex-direction: column;
 		justify-content: center;
-		margin-left: 30rpx;
+		margin-left: 30rpx;
 	}
 
 	.ad-name {
 		font-size: 30rpx;
 		font-weight: bold;
-		color: #333333;
+		color: #333333;
 		margin: auto 20rpx;
 	}
 	/* 全部服务顾问横栏 */
 	.mid-v-line {
-		background-color: #FF0000;
+		background-color: #EC0F0A;
 		width: 8rpx;
 		height: 30rpx;
 		border-radius: 4rpx;
@@ -188,9 +188,9 @@
 		height: 100%;
 	}
 
-	.ad-list-r {
-		display: flex;
-		flex: 1;		
+	.ad-list-r {
+		display: flex;
+		flex: 1;		
 	}
 	.noMore {
 		text-align: center;
@@ -213,4 +213,4 @@
 	.nodataBox {
 		text-align: center;
 	} */
-</style>
+</style>

+ 5 - 5
pages/user/historyDetail.vue

@@ -793,7 +793,7 @@
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -1076,7 +1076,7 @@
 
 		font-size: 26rpx;
 		font-weight: 500;
-		/* color: #FF0000; */
+		/* color: #EC0F0A; */
 		display: flex;
         color: #3C3C3C;
 		align-items: center;
@@ -1110,7 +1110,7 @@
 	}
 
 	.goodsCostNum {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: 500;
 		font-size: 36rpx;
 	}
@@ -1446,7 +1446,7 @@
 	.authorizContbutton {
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;
@@ -1504,7 +1504,7 @@
 		display: flex;
 	}
 	.yhprice{
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.yhmx .goodsCostNum3{
 		color: #666;

+ 2 - 2
pages/user/historySpend.vue

@@ -518,7 +518,7 @@
 	.price{
 		font-size: 32rpx;
 		font-weight: 500;
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.itemN {
 		margin-top: 15rpx;
@@ -630,7 +630,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 18 - 18
pages/user/myAppraise.vue

@@ -23,7 +23,7 @@
 					<view class="secondView">
 						<view class="fen">总分</view>
 						<!-- 星星 -->
-						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF0000"
+						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#EC0F0A"
 							:size="13" :margin="2" :readonly="true" />
 
 						<view class="count">服务态度{{item.ServiceEvaluation}}星</view>
@@ -46,12 +46,12 @@
 
 					<!-- 商家回复 -->
 
-					<view  v-if="item.ReplyContent" class="writeBack">
-						<view class="title">
-							<view style="font-weight: bold;">商家回复</view>
-							<view>{{item.ReplyTime.slice(0,item.ReplyTime.length-8)}}</view>
-						</view>
-						<view>{{item.ReplyContent}}</view>
+					<view  v-if="item.ReplyContent" class="writeBack">
+						<view class="title">
+							<view style="font-weight: bold;">商家回复</view>
+							<view>{{item.ReplyTime.slice(0,item.ReplyTime.length-8)}}</view>
+						</view>
+						<view>{{item.ReplyContent}}</view>
 					</view>
 
 
@@ -201,7 +201,7 @@
 					} else {
 						this.noMoreShow = true
 					}
-					
+					
 					
 
 				})
@@ -323,10 +323,10 @@
 		height: 150rpx;
 		margin-right: 20rpx;
 		border-radius: 8rpx;
-	}
-	.img4R {
-		
-		margin-right: 0;
+	}
+	.img4R {
+		
+		margin-right: 0;
 	}
 
 	.writeBack {
@@ -337,11 +337,11 @@
 		background-color: #F4F5F7;
 		margin-bottom: 20rpx;
 		border-radius: 10rpx;
-	}
-	.title{
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 10rpx;
+	}
+	.title{
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 10rpx;
 	}
 
 	.bottom {
@@ -376,4 +376,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

+ 27 - 27
pages/user/myAppraiseDetail.vue

@@ -23,7 +23,7 @@
 					<view class="secondView">
 						<view class="fen">总分</view>
 						<!-- 星星 -->
-						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF0000"
+						<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#EC0F0A"
 							:size="13" :margin="2" :readonly="true" />
 
 						<view class="count">服务态度{{item.ServiceEvaluation}}星</view>
@@ -153,20 +153,20 @@
 							that.$http(url, params, 'POST').then(res => {
 								uni.hideLoading();
 
-								uni.showToast({
-									title: '成功',
-									icon: 'none',
-									duration: 2000,
-								});
-								let pages = getCurrentPages(); // 当前页面
-								let beforePage = pages[pages.length - 2]; // 上一页
-								setTimeout(function() {
-									uni.navigateBack({
-									    success: function() {
-									        beforePage.onLoad(); // 执行上一页的onLoad方法
-									    }
-									});
-								}, 2000);
+								uni.showToast({
+									title: '成功',
+									icon: 'none',
+									duration: 2000,
+								});
+								let pages = getCurrentPages(); // 当前页面
+								let beforePage = pages[pages.length - 2]; // 上一页
+								setTimeout(function() {
+									uni.navigateBack({
+									    success: function() {
+									        beforePage.onLoad(); // 执行上一页的onLoad方法
+									    }
+									});
+								}, 2000);
 								
 
 							})
@@ -210,18 +210,18 @@
 					// 	this.noMoreShow = false
 					// } else {
 					// 	this.noMoreShow = true
-					// }
+					// }
 					
-					if (res.data.length == 0) {
-						uni.showToast({
-							title: '评价已删除,无法查看!',
-							icon: 'none',
-							duration: 2000
-						});
-						
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
+					if (res.data.length == 0) {
+						uni.showToast({
+							title: '评价已删除,无法查看!',
+							icon: 'none',
+							duration: 2000
+						});
+						
+						setTimeout(function() {
+							uni.navigateBack()
+						}, 1000);
 					}
 
 				})
@@ -399,4 +399,4 @@
 		color: #999999;
 		font-size: 28rpx;
 	}
-</style>
+</style>

+ 2 - 2
pages/user/myBespeak.vue

@@ -5,7 +5,7 @@
 
 			<view class="carPlate">
 				<view class="time">{{item.BillDate}}</view>
-				<view class="mileage" v-if="item.SheetState == 0" style="color: #FF0000">待确认</view>
+				<view class="mileage" v-if="item.SheetState == 0" style="color: #EC0F0A">待确认</view>
 				<view class="mileage" v-if="item.SheetState == 1" style="color: #3F90F7">预约中</view>
 				<view class="mileage" v-if="item.SheetState == 2" style="color: #00A040;">已到店</view>
 				<view class="mileage" v-if="item.SheetState == 3">已取消</view>
@@ -297,7 +297,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 13 - 12
pages/user/myOrder/activityOrderDetail.vue

@@ -47,7 +47,7 @@
 				<image src="../../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
 				<view class="ptmobilePhone">{{orderData.openGroup.firstMobilePhone}}</view>
 			</view>
-			<view class="DiffBNumber">还差 <span style="color:#FF0000; ">{{orderData.openGroup.groupNumber - orderData.groupList.length}}</span> 人,赶快邀请好友来拼团吧</view>
+			<view class="DiffBNumber">还差 <span style="color:#EC0F0A; ">{{orderData.openGroup.groupNumber - orderData.groupList.length}}</span> 人,赶快邀请好友来拼团吧</view>
 		    <view class="ptBtnBox">
 		    	<view class="seeTy" @click="seeTyshowBtn">查看全部团员</view>
 				 <button open-type="share" class=" shareBtn" >
@@ -155,7 +155,7 @@
 		<!-- 实付款 -->
 		<view class="money">
 			<view class="informationNum">实付款:</view>
-			<view class="informationNum" style="color: #FF0000;font-weight: bold;">¥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
+			<view class="informationNum" style="color: #EC0F0A;font-weight: bold;">¥{{orderData.data.payType==1?orderData.data.realMoney:0}}</view>
 		</view>
 
 		<!-- 订单信息 -->
@@ -255,7 +255,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -936,7 +936,7 @@ color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 .ptTime{
 	width: 42rpx;font-size: 24rpx;
 	height: 42rpx;text-align: center;line-height: 42rpx;
-	background: #FF0000;
+	background: #EC0F0A;
 	border-radius: 6rpx;
 	font-weight: 500;
 	color: #FFFFFF;
@@ -953,9 +953,9 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 }
 .seeTy{
 	width: 260rpx;line-height: 62rpx;text-align: center;
-	height: 62rpx;color: #FF0000;
+	height: 62rpx;color: #EC0F0A;
 	border-radius: 36rpx;font-size: 26rpx;
-	border: 2rpx solid #FF0000;
+	border: 2rpx solid #EC0F0A;
 	margin-right: 15rpx;
 }
 .ptBtnBox{
@@ -965,7 +965,8 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 .yqhypt{
 	width: 260rpx;color: #FFFFFF;line-height: 66rpx;text-align: center;
 	height: 66rpx;font-size: 26rpx;
-	background: linear-gradient(132deg, #FD5C05 0%, #FD0323 100%);
+	/* background: linear-gradient(132deg, #FD5C05 0%, #EC0F0A 100%); */
+	background: #EC0F0A;
 	border-radius: 36rpx;
 	margin-left: 15rpx;
 }
@@ -1017,7 +1018,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -1163,7 +1164,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	.redPoint {
 		width: 10rpx;
 		height: 10rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 10rpx;
 		margin-right: 10rpx;
 	}
@@ -1331,12 +1332,12 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1498,7 +1499,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

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

@@ -156,7 +156,7 @@
 		<!-- 实付款 -->
 		<view class="money">
 			<view class="informationNum">实付款:</view>
-			<view class="informationNum" style="color: #FF0000;font-weight: bold;">¥{{orderData.data.realMoney}}</view>
+			<view class="informationNum" style="color: #EC0F0A;font-weight: bold;">¥{{orderData.data.realMoney}}</view>
 		</view>
 
 		<!-- 订单信息 -->
@@ -244,7 +244,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -767,7 +767,7 @@
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -913,7 +913,7 @@
 	.redPoint {
 		width: 10rpx;
 		height: 10rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 10rpx;
 		margin-right: 10rpx;
 	}
@@ -1063,12 +1063,12 @@
 	}
 
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1230,7 +1230,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 6 - 5
pages/user/myOrder/myOrder.vue

@@ -18,12 +18,13 @@
 					<view class="itemType" v-if="item.SheetType==4">救援订单</view>
 					<view class="itemType" v-if="item.SheetType==5">钣喷订单</view>
 					<view class="itemType" v-if="item.SheetType==6">集客订单</view>
+					<view class="itemType" v-else></view>
                     <view class="itemSheetState redColor" v-if="item.SheetState==5">待成团</view>
 					<view class="itemSheetState redColor" v-if="item.SheetState==1">待付款</view>
 					<view class="itemSheetState orangeColor" v-if="item.SheetState==2">待服务</view>
 					<view class="itemSheetState greenColor" v-if="item.SheetState==3">已完成</view>
 					<view class="itemSheetState" v-if="item.SheetState==4">已取消</view>
-
+         
 				</view>
 				<view class="itemShopBg">
 					<view class="shopName">{{item.SheetContent}}</view>
@@ -243,9 +244,9 @@
 	}
 
 	.tabActive {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-weight: bold;
-		border-bottom: 4rpx solid #FF0000;
+		border-bottom: 4rpx solid #EC0F0A;
 
 	}
 
@@ -277,7 +278,7 @@
 		color: #999999
 	}
 	.redColor {
-		color: #FF0000;
+		color: #EC0F0A;
 	}
 	.orangeColor {
 		color: #F19D01;
@@ -419,7 +420,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

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

@@ -112,7 +112,7 @@
 		<!-- 实付款 -->
 		<view class="money">
 			<view class="informationNum">实付款:</view>
-			<view class="informationNum" style="color: #FF0000;font-weight: bold;">¥{{orderData.data.realMoney}}</view>
+			<view class="informationNum" style="color: #EC0F0A;font-weight: bold;">¥{{orderData.data.realMoney}}</view>
 		</view>
 
 		<!-- 订单信息 -->
@@ -223,7 +223,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#EC0F0A">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -745,7 +745,7 @@
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 
 	}
 
@@ -891,7 +891,7 @@
 	.redPoint {
 		width: 10rpx;
 		height: 10rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		border-radius: 10rpx;
 		margin-right: 10rpx;
 	}
@@ -1048,12 +1048,12 @@
 	}
 
 	.defer {
-		color: #D53533;
+		color: #EC0F0A;
 		font-size: 28rpx;
 		width: 150rpx;
 		height: 56rpx;
 		border-radius: 36rpx;
-		border: 1rpx solid #D53533;
+		border: 1rpx solid #EC0F0A;
 		text-align: center;
 		line-height: 56rpx;
 		margin-right: 40rpx;
@@ -1215,7 +1215,7 @@
 		.authorizContbutton{
 			width: 422rpx;
 			height: 88rpx;
-			background: #D53533;
+			background: #EC0F0A;
 			border-radius: 44rpx;
 			line-height: 88rpx;
 			text-align: center;

+ 4 - 4
pages/user/reportUni.vue

@@ -604,9 +604,9 @@
 					// }
 
 					&.error-lamp {
-						// color: #F03B3B;
+						// color: EC0F0A;
 
-						// filter: drop-shadow(#F03B3B 10rpx 0);
+						// filter: drop-shadow(EC0F0A 10rpx 0);
 						// &svg path {
 						// 	fill: rgb(18, 136, 222)
 						// }
@@ -947,7 +947,7 @@
 	.authorizContbutton {
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;
@@ -970,7 +970,7 @@
 
 	.top {
 		height: 190rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		margin-left: -20rpx;
 		margin-right: -20rpx;
 	}

+ 51 - 39
pages/user/user.vue

@@ -4,9 +4,9 @@
 		<view class="top" :style="{background:'#'+themeColor}">
 			<view class="customerMes">
 				<image @click="updateUserInfo" v-if="showSetting.showImageType==0" :src="showSetting.showImage" mode=""
-					style="width: 88rpx;height: 88rpx;border-radius: 44rpx;"></image>
+					style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image>
 				<image @click="updateUserInfo" v-else src="http://dmsphoto.66km.com.cn/thFiles/64CD12A3-588E-4201-90F6-5428F6ACD9F9.png" mode=""
-					style="width: 88rpx;height: 88rpx;border-radius: 44rpx;"></image>
+					style="width: 110rpx;height: 110rpx;border-radius: 55rpx;"></image>
 				<view class="mes">
 					<view class="nick">
 						<view class="nickName" v-if="customerName">{{customerName}}</view>
@@ -22,7 +22,9 @@
 						    <view class="cardNameTb">{{numList.f2ccard.cardName}}</view>
 						</view>
 					</view>
-					<view class="phone">{{phone}}  <span @click="seeQr">{{numList.customerInfo.wxMiniV2OpenID?' / 已绑定微信>':' / 未绑定微信>'}}</span> </view>
+					<view class="phone" >{{phone}}  <span @click="seeQr">{{numList.customerInfo.wxMiniV2OpenID?' / 已绑定微信':' / 未绑定微信'}}</span> 
+					   <image src="../../static/img2/hjt.png" mode="" class="hjtIcon"></image>
+					</view>
 				</view>
 			</view>
 
@@ -120,7 +122,7 @@
 				<view class="shopName">{{numList.shopInfo.shopName}}</view>
 				<view class="shopRightBox">
 					<image src="../../static/img/icon_ditu.png" mode="" class="shopRightImg"
-						style="margin-right: 67rpx;" @click="map"></image>
+						style="margin-right: 30rpx;" @click="map"></image>
 					<image src="../../static/img/icon_phone.png" mode="" class="shopRightImg" @click="call"></image>
 				</view>
 
@@ -193,7 +195,7 @@
 					</view>
 					<view class="orderLineTxt">待成团</view>
 				</view>
-				<view class="orderLine" @click="goorder(3)">
+				<view class="orderLine" style="border-right: 1px dashed #DDDDDD;" @click="goorder(3)">
 					<view class="orderImgBox">
 						<view class="orderNum" v-show="numList.hasOverSize>0">
 							{{numList.hasOverSize>99?'99+':numList.hasOverSize}}
@@ -231,8 +233,9 @@
 				<view class="kline">
 					<view class="klineRow carInfoklineRow" @click="gonavigateTo('./addCar/cailist?type=3')">
 						<image :src="carInfo.brandLogo" mode="" class="carbrandLogo"></image>
-						<view class="carModel KlineTxt">
-							<span>{{carInfo.brand?carInfo.brand:''}}{{carInfo.series?carInfo.series:''}}</span>
+						<view class="carModel KlineTxt" style="display: flex;justify-content: space-between;padding: 0 10rpx;">
+							<span class="carInfobrand">{{carInfo.brand?carInfo.brand:''}}{{carInfo.series?carInfo.series:''}}</span>
+						    <image class="carjt" src="../../static/img2/jt1.png" mode=""></image>
 						</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('historySpend')">
@@ -244,7 +247,8 @@
 					    <view class="KlineTxt">车况报告</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../index/rescue')">
-						<image class="klineIcon" src="../../static/img2/24.png" mode=""></image>
+						<image class="klineIcon"  style="width: 54rpx;height: 44rpx;padding-bottom: 6rpx;"
+						src="../../static/img2/24.png" mode=""></image>
 					    <view class="KlineTxt">24小时救援</view>
 					</view>
 				</view>
@@ -598,11 +602,11 @@
 				if (this.themeColor == 'FF4F00') {
 					var backgroundImage = '/static/tabimg/meFF4F00.png'
 				}
-				if (this.themeColor == 'D53533') {
+				if (this.themeColor == 'EC0F0A') {
 					var backgroundImage = '/static/tabimg/me1.png'
 				}
 				/* uni.setTabBarStyle({
-					// color: '#FF0000',
+					// color: '#EC0F0A',
 					 selectedColor: '#222222',
 				}) */
 				/* uni.setTabBarItem({
@@ -1078,9 +1082,9 @@ margin-top: 30rpx;
 }
 .exit{
 	background: #FFFFFF;
-	line-height: 100rpx;
+	line-height: 90rpx;
 	
-	font-size: 28rpx;
+	font-size: 26rpx;
 	font-family: PingFang;
 	font-weight: 500;
 	color: #ED2323;
@@ -1088,13 +1092,13 @@ margin-top: 30rpx;
 }
 .exit2{
 	background: #FFFFFF;
-	line-height: 100rpx;
-	font-size: 28rpx;
+	line-height: 90rpx;
+	font-size: 26rpx;
 	font-family: PingFang;
 	font-weight: 500;
 	color: #3C3C3C;
 	text-align: center;
-	border-bottom: 1px solid #eaeaea;
+	border-bottom: 1px solid #eeeeee;
 	margin-top: 20rpx;
 }
 .cardNameIcon{
@@ -1137,7 +1141,7 @@ padding-right: 10rpx;
 	/* 	margin-top: -100rpx; */
 }
 .marginTop{
-	margin-top: -190rpx;
+	margin-top: -160rpx;
 }
 .marginTop2{
 	margin-top: -120rpx;
@@ -1267,7 +1271,7 @@ padding-right: 10rpx;
 	.qrBtn{
 		width: 292rpx;
 		height: 64rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 32rpx;
 		color: #FFFFFF;
 		line-height: 64rpx;
@@ -1323,7 +1327,7 @@ padding-right: 10rpx;
 	.top {
 		height: 300rpx;
 		padding: 20rpx 24rpx 0;
-		/* background-color: #D53533; */
+		/* background-color: #EC0F0A; */
 		border-radius: 0 0 5% 5%;
 	}
 
@@ -1334,6 +1338,7 @@ padding-right: 10rpx;
 
 	.mes {
 		margin-left: 20rpx;
+		    padding-top: 14rpx;
 	}
 
 	.nick {
@@ -1346,7 +1351,7 @@ padding-right: 10rpx;
 	}
 
 	.nickName {
-		font-size: 34rpx;
+		font-size: 36rpx;
 		color: #010000;
 		font-weight: bold;
 		line-height: 48rpx;
@@ -1389,9 +1394,10 @@ padding-right: 10rpx;
 	}
 
 	.headerBox {
-		padding: 16rpx 24rpx;
+		padding: 26rpx 24rpx;
 		display: flex;
-		justify-content: space-around;
+		    justify-content: center;
+	/* 	justify-content: space-around; */
 		
 		
 	}
@@ -1405,10 +1411,11 @@ padding-right: 10rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		width: 33%;
 	}
 
 	.numStr {
-		font-size: 32rpx;
+		font-size: 34rpx;
 		font-weight: bold;
 		color: #9A9A9A;
 		line-height: 45rpx;
@@ -1486,7 +1493,7 @@ padding-right: 10rpx;
 
 		height: 26rpx;
 		line-height: 26rpx;
-		background: #FF0000;
+		background: #EC0F0A;
 		padding: 0 8rpx;
 		border-radius: 13rpx;
 		color: #FFFFFF;
@@ -1501,20 +1508,13 @@ padding-right: 10rpx;
 		margin-right: 20rpx;
 		width: 30rpx;
 		height: 30rpx;
-
 	}
 
-
-
 	.rowBoxBg {
-
 		margin: 20rpx 24rpx;
-
 		background: #FFFFFF;
-
-		border-radius: 10rpx;
+		border-radius: 16rpx;
 	}
-
 	.rowBox {
 		display: flex;
 		justify-content: space-between;
@@ -1522,9 +1522,7 @@ padding-right: 10rpx;
 		padding: 35rpx 0rpx;
 		border-radius: 10rpx;
 		align-items: center;
-
 	}
-
 	.leftView {
 		display: flex;
 		align-items: center;
@@ -1590,16 +1588,15 @@ padding-right: 10rpx;
 
 	.appraiseBox {
 		padding: 5rpx 0;
-		margin-top: 10rpx;
-		height: 62rpx;
-
+	/* 	height: 62rpx;
+ */
 		display: flex;
 		align-items: center;
 	}
 
 
 	.appraise {
-		color: #FF0000;
+		color: #EC0F0A;
 		font-size: 38rpx;
 		font-weight: bold;
 
@@ -1647,7 +1644,6 @@ padding-right: 10rpx;
 	.distance {
 		color: #999999;
 		font-size: 24rpx;
-		padding-top: 15rpx;
 
 		/* 隐藏文字显示 ...不换行 */
 		overflow: hidden;
@@ -1721,7 +1717,7 @@ padding-right: 10rpx;
 	.authorizContbutton{
 		width: 210rpx;
 		height: 66rpx;
-		background: #D53533;
+		background: #EC0F0A;
 		border-radius: 44rpx;
 		line-height: 66rpx;
 		text-align: center;
@@ -1749,4 +1745,20 @@ padding-right: 10rpx;
 	.test{
 		
 	}
+	.carjt{
+		width: 10rpx;height: 20rpx;
+		    margin-top: 8rpx;
+	}
+	.carInfobrand{
+		text-align: center;
+		    width: 150rpx;
+	}
+	.hjtIcon{
+		width: 10rpx;height: 20rpx;
+		margin-top: 8rpx;
+		    margin-left: 6rpx;
+	}
+	.phone{
+		display: flex;
+	}
 </style>

BIN
static/img/icon_ditu.png


BIN
static/img/icon_phone.png


BIN
static/img2/hjt.png


BIN
static/img2/jp.png


BIN
static/img2/shwy.png


BIN
static/img2/zp.png


BIN
static/img2/zyfw.png


BIN
static/timg/car1.png


BIN
static/timg/car2.png


BIN
static/timg/car3.png


BIN
static/timg/car4.png