优化

pages/index/confirmRescue.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="box">
   <view class="top-box" :style="{background:'#'+themeColor}">
-	  <view class="topTis">需提前2小时取消订单，不足2小时需联系门</view>
+	  <view class="topTis"><!-- 需提前2小时取消订单，不足2小时需联系门 --></view>
   </view>
   <view class="topTime">
 	  <img src="../../static/timg/icon_shijian.png" alt="" class="topTimeImg">
@@ -134,20 +134,12 @@
 			}
 		},
 		onLoad(opt) {
-			this.themeColor = uni.getStorageSync("themeColor");
-<<<<<<< .mine
-			//this.userInfo = uni.getStorageSync("userInfo");
-			this.userInfo = this.$store.state.userInfo;
-
-
-
-=======
+			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;
->>>>>>> .theirs
 			this.shopName=opt.shopName;
 			this.opt=opt;
 			if(this.opt.type==2){

pages/index/confirmYuyue.vue

@@ -1,8 +1,8 @@
 <template>
 <view class="box">
-	<view class="yuyuCheckTis">
-	  温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用不同）
-	</view>
+	<!-- <view class="yuyuCheckTis" :style="{background:'#'+themeColor}">
+	   温馨提示：该报价仅为参考价格，实际以门店为准（不同品牌和车型费用不同） 
+	</view> -->
 	<view class="cont">
 		<view class="contkk">
 		  <view class="kkline">

pages/index/index.vue

@@ -282,7 +282,7 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
-				themeColor:'',
+				themeColor:'1677FF',
 				getwxLoing:false,
 				shareID:'',
 				discount:'',

pages/index/onlineBooking.vue

@@ -960,7 +960,8 @@
 	.authorizContbutton{
 		width: 422rpx;
 		height: 88rpx;
-		background: #D53533;
+		/* background: #D53533; */
+		background: #1677FF;
 		border-radius: 44rpx;
 		line-height: 88rpx;
 		text-align: center;

pages/subPack/oldhistoryDetail.vue

@@ -127,12 +127,12 @@
 				<view class="detailedTitle">费用明细</view>
 				
 				<view class="goodscostLine" v-if="TotalDiscountMoney">
-					<view class="goodscostTxt">优惠总计</view>
+					<view class="goodscostTxt">整单优惠</view>
 					<view class="goodsCostNum">￥{{orderData.discountMoney?orderData.discountMoney:0}}</view>
 				</view>
 				
 				<view class="goodscostLine" v-if="ReceiptsMoney">
-					<view class="goodscostTxt">支付金额</view>
+					<view class="goodscostTxt">金额</view>
 					<view class="goodsCostNum">￥{{orderData.checkoutMoney?orderData.checkoutMoney:0}}</view>
 				</view>
 			</view>
@@ -278,7 +278,9 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
-
+                        if (item.fieldValue == 'TotalDiscountMoney') {
+                        	this.TotalDiscountMoney = item.isChecked
+                        }
 
 
 					})

pages/user/historyDetail.vue

@@ -338,6 +338,9 @@
 						if (item.fieldValue == 'ReceiptsMoney') {
 							this.ReceiptsMoney = item.isChecked
 						}
+						if (item.fieldValue == 'TotalDiscountMoney') {
+							this.TotalDiscountMoney = item.isChecked
+						}
 
 
 

pages/user/user.vue

@@ -406,7 +406,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '',
+				themeColor: '1677FF',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
@@ -791,7 +791,7 @@
 .cardNameBOx{
 	background: linear-gradient(327deg, #FEA917 0%, #FFC635 100%);
 	border-radius: 16rpx;display: flex;
-	line-height: 30rpx;font-weight: 500;
+	line-height: 30rpx;font-weight: 500;
 color: #764700;font-size: 22rpx;
 margin-left: 15rpx;
 padding-right: 10rpx;
@@ -1385,4 +1385,4 @@ padding-right: 10rpx;
 		margin-top: 62rpx;
 		margin-left: 71rpx;
 	}
-</style>
+</style>