# Conflicts:

#	pages/index/confirmRescue.vue

pages.json

@@ -582,31 +582,31 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-			"selectedColor": "#1677FF",
+			"selectedColor": "#D53533",
 			"borderStyle": "black",
 			"backgroundColor": "#ffffff",
 			"list": [{
 					"pagePath": "pages/index/index",
 					"iconPath": "./static/tabimg/index2.png",
-					"selectedIconPath": "./static/tabimg/index1677FF.png",
+					"selectedIconPath": "./static/tabimg/index1.png",
 					"text": "首页"
 				},
 				{
 					"pagePath": "pages/shop/shop",
 					"iconPath": "./static/tabimg/shop2.png",
-					"selectedIconPath": "./static/tabimg/shop1677FF.png",
+					"selectedIconPath": "./static/tabimg/shop1.png",
 					"text": "商城"
 				},
 				{
 					"pagePath": "pages/activity/activity",
 					"iconPath": "./static/tabimg/activty2.png",
-					"selectedIconPath": "./static/tabimg/activty1677FF.png",
+					"selectedIconPath": "./static/tabimg/activity1.png",
 					"text": "活动"
 				},
 				{
 					"pagePath": "pages/user/user",
 					"iconPath": "./static/tabimg/me2.png",
-					"selectedIconPath": "./static/tabimg/me1677FF.png",
+					"selectedIconPath": "./static/tabimg/me1.png",
 					"text": "我的"
 				}
 

pages/index/confirmRescue.vue

@@ -135,8 +135,19 @@
 		},
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
+<<<<<<< .mine
 			//this.userInfo = uni.getStorageSync("userInfo");
 			this.userInfo = this.$store.state.userInfo;
+
+
+
+=======
+			//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){
@@ -210,7 +221,7 @@
 					 if(res.code==0){
 						 uni.showModal({
 						     title: '提示',
-						     content: '预约成功',
+						     content: '救援信息提交成功',
 						 	confirmText:'返回首页',
 						 	cancelText:'查看订单',
 						     success: function (res) {

pages/index/index.vue

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

pages/index/onlineBooking.vue

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

pages/index/shopList.vue

@@ -199,6 +199,9 @@
 			},
 			init(){
 				var that = this;
+				uni.showLoading({
+					title: '加载中'
+				})
 				uni.authorize({
 					scope: 'scope.userLocation',
 					success() {
@@ -362,6 +365,7 @@
 							
 						}else{
 							console.log("接口获取失败")
+							uni.hideLoading();
 						}
 						
 					}

pages/subPack/oldhistoryDetail.vue

@@ -21,8 +21,6 @@
 				<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 				<view class="shopCont">
 					<view class="shopName">{{orderData.shopName}}</view>
-				
-
 				</view>
 			
 			</view>
@@ -48,7 +46,14 @@
 					<view class="informationTxt">单号：</view>
 					<view class="informationNum">{{orderData.code}}</view>
 				</view>
-				
+				<view class="informationLine">
+					<view class="informationTxt">接车时间：</view>
+					<view class="informationNum">{{orderData.billDate}}</view>
+				</view>
+				<view class="informationLine">
+					<view class="informationTxt">服务顾问：</view>
+					<view class="informationNum">{{orderData.pickName?orderData.pickName:''}}</view>
+				</view>
 				
 				<view class="informationLine" v-if="Comment">
 					<view class="informationTxt">备注：</view>
@@ -67,12 +72,15 @@
 						<view class="detailedName"><span v-if="item.CardDetailID" class="kaColor">卡</span>{{item.ItemName}}
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listItems.length-1}">
-							<view class="comment" v-if="ItemComment&&item.Comment">{{item.Comment}}</view>
+							<view>
+								<view class="comment" v-if="ItemComment&&item.Comment">{{item.Comment}}</view>
+							</view>
+							
 							<view class="secondRight">
 								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
-								<view class="price" v-if="ItemMoney">
+								<view class="price" v-if="ItemMoney&&item.RealMoney">
 									<span>￥</span>
-									{{item.AmountMoney?item.AmountMoney:0}}
+									{{item.RealMoney}}
 								</view>
 							</view>
 						</view>
@@ -95,12 +103,15 @@
 							<view class="qty">x{{item.SaleQty}}</view>
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listParts.length-1}">
-							<view class="comment" v-if="GoodsComment&&item.Comment">{{item.Comment}}</view>
+							<view>
+								<view class="comment" v-if="GoodsComment&&item.Comment">{{item.Comment}}</view>
+							</view>
+							
 							<view class="secondRight">
 								<!-- <view class="grayPrice">￥{{item.CheckOutTaxRate}}</view> -->
-								<view class="price" v-if="ItemMoney">
+								<view class="price" v-if="ItemMoney&&item.RealMoney">
 									<span>￥</span>
-									{{item.AmountMoney?item.AmountMoney:0}}
+									{{item.RealMoney}}
 								</view>
 							</view>
 						</view>

pages/subPack/rescueOrderOrderDetail.vue

@@ -102,7 +102,7 @@
 				<view class="informationTxt">起点：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.hStartAddress}}</view>
 			</view>
-			<view class="informationLine">
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.helpType==2">
 				<view class="informationTxt">终点：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.hEndAddress}}</view>
 			</view>

pages/user/historySpend.vue

@@ -81,9 +81,9 @@
 				<view v-if="item.EvaluateState == 1" @click.stop="goAppraiseDetail(item)" class="kan">查看评价</view>
 			</view>
 		</view>
-		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail(item)">
+		<view class="itemHistory" v-for="(item,index) in oldlist" :key="index" @click="goDetail2(item)">
 			<view class="topBox">
-				<view class="dan">{{item.code}}</view>
+				<view class="dan">{{item.Code}}</view>
 				
 				<!-- SheetType单据类型(1维修单 2销售单3洗车单4销售退货) -->
 				
@@ -100,7 +100,7 @@
 					
 					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
 				</view>
-				<view v-if="ReceiptsMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.money?item.money:0}}</view>
+				<view v-if="ReceiptsMoney&&item.CheckoutMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.CheckoutMoney}}</view>
 			</view>
 			<view class="time">{{item.time}}</view>
 		
@@ -215,13 +215,15 @@
 				})
 			},
 			goDetail(item) {
-				/* uni.navigateTo({
+				 uni.navigateTo({
 					url: 'historyDetail?id=' + item.id + '&lastDay=' + item.lastDay
-				}) */
+				}) 
+
+			},
+			goDetail2(item){
 				uni.navigateTo({
 					url: '../subPack/oldhistoryDetail?id=' + item.id + '&lastDay=' + item.lastDay
 				})
-				
 			},
 			myOrderCoupon() {
 				let that = this

pages/user/user.vue

@@ -406,7 +406,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '1677FF',
+				themeColor: '',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,