Merge remote-tracking branch 'remotes/origin/dev' into ats

# Conflicts:
#	pages.json
#	pages/index/confirmRescue.vue
#	pages/subPack/chooseCity.vue
#	pages/subPack/oldhistoryDetail.vue
#	pages/user/historyDetail.vue
#	utils/common.js
#	utils/request.js

ext.json

@@ -6,6 +6,7 @@
 		"shopId": "E37BB296-5A08-4534-859D-B351BA611AF9",
 		"url":"http://api.dms.66km.com.cn",
 		"unionId":"EEADACCD-8A19-499D-8AD7-6975D2C93243",
-		"appId":"wx33053a645546ec31"
+		"appId":"wx33053a645546ec31",
+		"themeColor":"0"
 	}
 }

pages.json

@@ -1,6 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -29,8 +28,8 @@
 			"path": "pages/user/user",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"navigationBarBackgroundColor": "#D53533",
-				"navigationBarTextStyle": "white",
+				/* "navigationBarBackgroundColor": "#D53533",
+				"navigationBarTextStyle": "white", */
 				"enablePullDownRefresh": true
 			}
 		}, {
@@ -582,33 +581,34 @@
 	
 		"tabBar": {
 			"color": "#8a8a8a",
-						"selectedColor": "#1677FF",
-						"borderStyle": "black",
-						"backgroundColor": "#ffffff",
-						"list": [{
-								"pagePath": "pages/index/index",
-								"iconPath": "./static/tabimg/index2.png",
-								"selectedIconPath": "./static/tabimg/index1677FF.png",
-								"text": "首页"
-							},
-							{
-								"pagePath": "pages/shop/shop",
-								"iconPath": "./static/tabimg/shop2.png",
-								"selectedIconPath": "./static/tabimg/shop1677FF.png",
-								"text": "商城"
-							},
-							{
-								"pagePath": "pages/activity/activity",
-								"iconPath": "./static/tabimg/activty2.png",
-								"selectedIconPath": "./static/tabimg/activty1677FF.png",
-								"text": "活动"
-							},
-							{
-								"pagePath": "pages/user/user",
-								"iconPath": "./static/tabimg/me2.png",
-								"selectedIconPath": "./static/tabimg/me1677FF.png",
-								"text": "我的"
-							}
+			"selectedColor": "#8a8a8a",
+			"borderStyle": "black",
+			"backgroundColor": "#ffffff",
+			"list": [{
+					"pagePath": "pages/index/index",
+					"iconPath": "./static/tabimg/index2.png",
+					"selectedIconPath": "./static/tabimg/index2.png",
+					"text": "首页"
+				},
+				{
+					"pagePath": "pages/shop/shop",
+					"iconPath": "./static/tabimg/shop2.png",
+					"selectedIconPath": "./static/tabimg/shop2.png",
+					"text": "商城"
+				},
+				{
+					"pagePath": "pages/activity/activity",
+					"iconPath": "./static/tabimg/activty2.png",
+					"selectedIconPath": "./static/tabimg/activty2.png",
+					"text": "活动"
+				},
+				{
+					"pagePath": "pages/user/user",
+					"iconPath": "./static/tabimg/me2.png",
+					"selectedIconPath": "./static/tabimg/me2.png",
+					"text": "我的"
+				}
+
 			]
 		},
 		"globalStyle": {

pages/index/confirmYuyue.vue

@@ -19,8 +19,8 @@
 				  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
-		  </view>
-		  <view class="kkline lineborderNo">
+		  </view> 
+		  <view class="kkline ">
 			  <view class="kklineLeft">
 				<span class="stars">*</span> <span>预约时间</span>
 			  </view>
@@ -29,6 +29,13 @@
 				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
 		  </view>
+		  <!-- <view class=" lineborderNo" >
+		  	<view class="bzline">
+		  		<view class="beiz">手机号</view>
+		  		<input type="number" v-model="mobilePhone" placeholder="请输入手机号" class="beizInput" placeholder-style="color:#cccccc;">
+		  	</view>
+		  	
+		  </view> -->
 		</view>
 		
 		<view class="contkk" style="margin-top: 20rpx;">
@@ -83,6 +90,7 @@
 				themeColor:'',
 				isgo:true,
 				stationID:'',
+				mobilePhone:'',
 			}
 		},
 		onLoad(opt) {
@@ -109,7 +117,7 @@
 				})
 			},
 			yuyue(){
-				if(!this.carInfo){
+				/* if(!this.carInfo){
 					uni.showToast({
 						title: '请选择车辆',
 						icon: 'none',
@@ -124,7 +132,7 @@
 						duration: 3000
 					});
 					return false;
-				}
+				} */
 				if(!this.billDate){
 					uni.showToast({
 						title: '请选择预约时间',

pages/index/index.vue

@@ -282,7 +282,7 @@
 				InsuranceExpireDate:'',
 				NextCareDate:'',
 				NextAuditDate:'',
-				themeColor:'1677FF',
+				themeColor:'',
 				getwxLoing:false,
 				shareID:'',
 				discount:'',
@@ -297,6 +297,7 @@
 			 //this.$common.getExtStoreId()
 			 var ext=this.$common.getExtStoreId();
 			 this.ext=ext
+			 console.log("ext--themeColor")
 			 console.log(ext)
 			//console.log( String(Date.now()))
 			this.shopId=ext.shopId;
@@ -1148,7 +1149,7 @@
 		margin-left: 24rpx;
 	}
 	.indexTop{
-		background: #D53533;
+		/* background: #D53533; */
 		width: 750rpx;
 		position: fixed;
 		top: 0;
@@ -1228,12 +1229,12 @@
 	.topBox{
 		width: 750rpx;
 		height: 150rpx;
-		background: #D53533;
+		/* background: #D53533; */
 	}
 	.yuanhu{
 		width: 750rpx;
 		height: 50rpx;
-		background: #D53533;
+		/* background: #D53533; */
 		border-radius: 0 0 100% 100%;
 	}
 	.carinfoBox{

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/subPack/chooseCity.vue

@@ -17,20 +17,20 @@
 					</view>
 				</view>
 
-				<!-- 字母列表 -->
-				<view class="zhimubox">
-					<view v-for="(item, index) in alphabet">
-						<view class="alphabet" :class="{select:toIndex == item}" @click="tap(item)">
-							{{item}}
-						</view>
-					</view>
-				</view>
+				
 			</view>
 
 
 
 		</scroll-view>
-		
+		<!-- 字母列表 -->
+		<view class="zhimubox">
+			<view v-for="(item, index) in alphabet">
+				<view class="alphabet" :class="{select:toIndex == item}" @click="tap(item)">
+					{{item}}
+				</view>
+			</view>
+		</view>
 		
 
 	</view>
@@ -239,12 +239,13 @@
 </script>
 
 <style scoped>
+	
 	.zhimubox{
 		position: fixed;
 		right: 30rpx;
 		top: 200rpx;
 		height: 80vh;
-		    overflow-y: scroll;
+		overflow-y: scroll;
 	}
 	.content {
 		
@@ -280,7 +281,7 @@
 		/* height: calc(100vh - 80rpx); */
 		height: 100vh;
 		box-sizing: border-box;
-		padding: 20rpx 24rpx 20rpx;
+	
 
 	}
 
@@ -327,6 +328,7 @@
 	.listContent {
 		display: flex;
 		justify-content: space-between;
+			padding: 20rpx 24rpx 20rpx;
 	}
 
 	.city-list {
@@ -358,9 +360,9 @@
 		font-weight: bold;
 		color: #999999;
 		width: 4%;
-		margin: 20rpx 0;
+		margin: 2rpx 0;
 		text-align: center;
-		padding: 2rpx 10rpx;
+		padding: 10rpx 10rpx 10rpx 15rpx;
 	}
 
 	.select {

pages/user/addCar/addCar.vue

@@ -289,6 +289,14 @@
 					});
 					return false;
 				}
+				if(!this.carModelInfo.value){
+					uni.showToast({
+						title: '请选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
 				
 				if (this.isEditCar == 'true') {
 					this.updateTMemberCar()

pages/user/historyDetail.vue

@@ -1201,4 +1201,4 @@
 		border-radius: 36rpx;
 		border: 2rpx solid #DDDDDD;
 	}
-</style>
+</style>

pages/user/user.vue

@@ -240,13 +240,15 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-		    <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+
+		   <!-- <view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+
 				<view class="leftView">
 					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的寄存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> 
+			</view> -->
 			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/timg/sos.png" mode="" class="liftIcon"></image>
@@ -406,7 +408,7 @@
 				nickName: '',
 				phone: '',
 				ext: '',
-				themeColor: '1677FF',
+				themeColor: '',
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
@@ -1006,7 +1008,7 @@ padding-right: 10rpx;
 	.top {
 		height: 350rpx;
 		padding: 20rpx 24rpx 0;
-		background-color: #D53533;
+		/* background-color: #D53533; */
 		border-radius: 0 0 5% 5%;
 	}