Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

# Conflicts:
#	pages/user/myOrder/mallOrderDetail.vue
#	pages/user/myOrder/myOrder.vue
#	pages/user/user.vue

components/nodata/nodata.vue

@@ -2,7 +2,7 @@
 	<view class="" style="padding-bottom: 20rpx;">
 		
 		<view  class="nodataBox">
-			<image src="../../static/img/nodata.png" mode="widthFix" class="nodataImg"></image>
+			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
 		</view>
 		

components/uni-plate-input/uni-plate-input.less

@@ -0,0 +1,154 @@
+.so-mask {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 998;
+}
+.so-plate {
+	box-sizing: border-box;
+	position: absolute;
+	bottom: 0;
+	width: 100%;
+	left: 0;
+	background: #fff;
+	padding: 25upx 25upx 0 25upx;
+	&-head {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	&-type {			
+		flex:1;
+		display:block;
+		label {
+			display: inline-block;
+			min-height: 32upx;
+			font-size: 26upx;
+			margin-right: 10upx;
+		}
+	}
+	&-body {
+		box-sizing: border-box;
+		padding: 30upx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	&-word {
+		border: 1upx solid #ccc;
+		border-radius: 10upx;
+		height: 0;
+		margin: 0 5upx;
+		box-sizing: border-box;
+		padding-bottom: calc((100% - 70upx) / 7);
+		width: calc((100% - 70upx) / 7);
+		position: relative;
+		&.active {
+			border-color: #007aff;
+			box-shadow: 0 0 15upx 0 #007aff;
+		}
+		text {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translateX(-50%) translateY(-50%);
+			font-weight: 700;
+			font-size: 32upx;
+		}
+	}
+	&-dot {
+		width: 15upx;
+		height: 15upx;
+		background: #ccc;
+		border-radius: 50%;
+		margin: 0 5upx;
+	}
+	&-keyboard {
+		background: #eee;
+		margin-left: -25upx;
+		margin-right: -25upx;
+		padding: 20upx 25upx 10upx 25upx;
+		box-sizing: border-box;
+		transition: all .3s;
+		&>view{
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+	}
+	&-key {
+		display: block;
+		background: #fff;
+		border-radius: 10upx;
+		box-shadow: 0 0 8upx 0 #bbb;
+		width: 80upx;
+		height: 80upx;
+		margin: 5upx 0;
+		font-size: 32upx;
+		text-align: center;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		&.hover {
+			background: #efefef;
+		}
+		&.fill-block {
+			width: 80upx;
+			height: 80upx;
+			background: none;
+			box-shadow: none;
+		}
+	}
+	&-btn {
+		display: inline-block;
+		background: #fff;
+		border-radius: 10upx;
+		box-shadow: 0 0 10upx 0 #bbb;
+		font-size: 28upx;
+		text-align: center;
+		margin:0 0 0 10upx;
+		padding:0 25upx;
+		&-group{
+			display: flex;
+			justify-content: space-between;
+			background: #eee;
+			margin-left: -25upx;
+			margin-right: -25upx;
+			box-sizing: border-box;
+			padding: 0 25upx 10upx 25upx;
+		}
+		&--cancel{
+			margin:0;
+		}
+		&--submit{
+			background:#5773f9;
+			color:#fff;
+		}
+		&--delete{
+			color:#fd6b6d;
+		}
+	}
+}
+
+
+.animation-scale-up {
+	animation-duration: .2s;
+	animation-timing-function: ease-out;
+	animation-fill-mode: both;
+    animation-name: scale-up
+}
+@keyframes scale-up {
+    0% {
+        opacity: .8;
+        transform: scale(.8)
+    }
+
+    100% {
+        opacity: 1;
+        transform: scale(1)
+    }
+}

components/uni-plate-input/uni-plate-input.vue

@@ -0,0 +1,265 @@
+/**
+* @author minisola
+* @version 20190814
+*/
+<template>
+	<view class="so-mask">
+		<view class="so-plate animation-scale-up">
+			<view class="so-plate-head">
+				<view class="so-plate-type">
+					<radio-group @change="typeChange">
+						<label>
+							<radio value="1" :checked="type===1" />
+							普通车牌
+						</label>
+						<label>
+							<radio value="2" :checked="type===2" />
+							新能源车牌
+						</label>
+					</radio-group>
+				</view>
+			</view>
+			<view class="so-plate-body">
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 0 }" @tap="inputSwitch" data-index="0">
+					<text>{{ currentInputValue[0] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 1 }" @tap="inputSwitch" data-index="1">
+					<text>{{ currentInputValue[1] }}</text>
+				</view>
+				<view class="so-plate-dot"></view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 2 }" @tap="inputSwitch" data-index="2">
+					<text>{{ currentInputValue[2] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 3 }" @tap="inputSwitch" data-index="3">
+					<text>{{ currentInputValue[3] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 4 }" @tap="inputSwitch" data-index="4">
+					<text>{{ currentInputValue[4] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 5 }" @tap="inputSwitch" data-index="5">
+					<text>{{ currentInputValue[5] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 6 }" @tap="inputSwitch" data-index="6">
+					<text>{{ currentInputValue[6] }}</text>
+				</view>
+				<view class="so-plate-word" :class="{ active: currentInputIndex == 7 }" @tap="inputSwitch" v-if="type == 2" data-index="7">
+					<text>{{ currentInputValue[7] }}</text>
+				</view>
+			</view>
+			<view class="so-plate-foot">
+				<view class="so-plate-keyboard"  :style="{height:keyboardHeight}">
+					<view id="keyboard">
+						<block v-if="inputType == 1">
+							<view hover-class="hover" class="so-plate-key" v-for="el of provinceText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType == 1">
+							<text class="so-plate-key fill-block"></text>
+							<text class="so-plate-key fill-block"></text>
+						</block>
+						<block v-if="inputType >= 3">
+							<view hover-class="hover" class="so-plate-key" v-for="el of numberText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType >= 2">
+							<view hover-class="hover" class="so-plate-key" v-for="el of wordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+						<block v-if="inputType == 3">
+							<text v-for="el of fillBlock" :key="el.num" class="so-plate-key fill-block"></text>
+						</block>
+						<block v-if="inputType == 4">
+							<view hover-class="hover" class="so-plate-key" v-for="el of lastWordText" :key="el" :data-value="el" @tap="chooseKey">{{ el }}</view>
+						</block>
+							<text v-if="inputType == 4" class="so-plate-key fill-block"></text>
+					</view>
+				</view>
+				<view class="so-plate-btn-group">
+					<view>
+						<button class="so-plate-btn so-plate-btn--cancel" @tap="$emit('close')">取消</button>
+					</view>
+					<view>
+						<button class="so-plate-btn so-plate-btn--delete" @tap="deleteKey">删除</button>
+						<button class="so-plate-btn so-plate-btn--submit" @tap="exportPlate">完成</button>
+						
+					</view>
+					
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: 'uni-plate-input',
+	data() {
+		return {
+			type: 1, //车牌类型
+			currentInputIndex: 0, //当前编辑的输入框
+			currentInputValue: ['', '', '', '', '', '', ''],
+			fillBlock:[{num:11},{num:12},{num:13},{num:14},{num:15},{num:16}],  //避免:key报错
+			keyboardHeightInit:false,
+			keyboardHeight:'auto',
+			provinceText: [
+				'粤',
+				'京',
+				'冀',
+				'沪',
+				'津',
+				'晋',
+				'蒙',
+				'辽',
+				'吉',
+				'黑',
+				'苏',
+				'浙',
+				'皖',
+				'闽',
+				'赣',
+				'鲁',
+				'豫',
+				'鄂',
+				'湘',
+				'桂',
+				'琼',
+				'渝',
+				'川',
+				'贵',
+				'云',
+				'藏',
+				'陕',
+				'甘',
+				'青',
+				'宁',
+				'新'
+			],
+			numberText: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
+			wordText: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'],
+			lastWordText: ['港', '澳', '学', '领', '警']
+		};
+	},
+	props: {
+		plate: {
+			type: String
+		}
+	},
+	computed: {
+		//输入框类型
+		inputType() {
+			switch (this.currentInputIndex) {
+				case 0:
+					return 1;
+					break;
+				case 1:
+					return 2;
+					break;
+				case 2:
+					return 3;
+					break;
+				case 3:
+					return 3;
+					break;
+				case 4:
+					return 3;
+					break;
+				case 5:
+					return 3;
+					break;
+				case 6:
+					return this.type==2 ? 3 :4 ;
+					break;
+				case 7:
+					return 4;
+					break;
+				default:
+					return 1;
+					break;
+			}
+		}
+	},
+	watch:{
+		currentInputIndex:function(n,o){
+			if(!this.keyboardHeightInit) return
+				this.$nextTick(()=>{
+					this.changeKeyboardHeight()
+				})
+		}
+	},
+	methods: {
+		//车牌类型切换
+		typeChange(e) {
+			const {value} = e.detail;
+			this.type = parseInt(value)
+			this.currentInputIndex = 0
+			if(value==1){
+				this.currentInputValue = ['','','','','','','']
+			}else{
+				this.currentInputValue = ['','','','','','','','']
+			}
+		},
+		inputSwitch(e) {
+			const { index } = e.currentTarget.dataset;
+			this.currentInputIndex = parseInt(index);
+		},
+		chooseKey(e) {
+			const { value } = e.currentTarget.dataset;
+			this.$set(this.currentInputValue, this.currentInputIndex, value);
+			if(this.type==1 && this.currentInputIndex<6){
+				this.currentInputIndex++
+			}
+			if(this.type==2 && this.currentInputIndex<7){
+				this.currentInputIndex++
+			}
+		},
+		deleteKey(){
+				this.$set(this.currentInputValue,this.currentInputIndex,'')
+				if(this.currentInputIndex!=0) this.currentInputIndex--
+		},
+		exportPlate(){
+			const plate = this.currentInputValue.join('')
+			let err = false
+			if(this.type===1&&plate.length!=7){
+				err = true
+			}else if(this.type===2&&plate.length!=8){
+				err = true
+			}
+			if(err) return uni.showToast({
+				title:'请输入完整的车牌号码',
+				icon:'none'
+			})
+			
+			this.$emit('export',plate)
+		},
+		changeKeyboardHeight(){
+			const that = this
+			const query = uni.createSelectorQuery().in(this);
+			query.select('#keyboard').boundingClientRect();
+			query.exec(function(res) {
+				if(res&&res[0]){
+					that.keyboardHeight = res[0].height + uni.upx2px(30) + 'px'
+					that.keyboardHeightInit = true
+				}
+			});
+		}
+	},
+	mounted() {
+		console.log(this.plate);
+		const plateKey = this.plate.split('')
+		if(plateKey.length===7){
+			this.type=1
+		}else if(plateKey.length===8){
+			this.type=2
+		}
+		if(plateKey.length===7 || plateKey.length===8){
+			this.currentInputValue = plateKey
+			this.currentInputIndex = plateKey.length-1
+		}
+
+		setTimeout(() => {  //在动画结束之后才开始获取
+			this.$nextTick(()=>{
+				this.changeKeyboardHeight()
+			})
+		}, 500);
+	}
+};
+</script>
+<style scoped lang="less">
+@import './uni-plate-input';
+</style>

pages.json

@@ -180,7 +180,30 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+		    "path" : "pages/user/addCar/addCar",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "添加车辆",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+			"path": "pages/user/addCar/carModel",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/user/addCar/cailist",
+			"style": {
+				"navigationBarTitleText": "我的车库",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
+		}
+		
     ],
 	"tabBar": {
 		"color": "#8a8a8a",

pages/index/index.vue

@@ -346,8 +346,13 @@
 				 this.$http('opencarOwnerHome/queryCarInfoList', {
 				   
 				  },'GET').then(res => {
-				 	this.carInfo=res.data[0]
-				 	 this.$store.commit('mutationscarInfo', this.carInfo)				
+					 if(res.code==401){
+						 this.uniLogin()
+					 }else{
+						 this.carInfo=res.data[0]
+						 this.$store.commit('mutationscarInfo', this.carInfo)
+					 }
+				 	 				
 				  })
 			 },
 			 queryHomeCardList(){

pages/index/onlineBooking.vue

@@ -24,23 +24,23 @@
 			<!-- 门店详情 -->
 			<view class="newshopNames">
 			  <view class="newshopDstop">
-			    <view class="newshopDname">连锁一号</view>
+			    <view class="newshopDname">{{shopInfo.shopName}}</view>
 			    <view class="newshopDtime">
-			      营业时间： <span>08:00 - 17:00</span>
+			      营业时间： <span>{{shopInfo.startTime}} - {{shopInfo.endTime}}</span>
 			    </view>
 			    <view class="newshopDbqbox" >
-			      <view class="newshopDbqline" v-for="(item,index) in 5">大众</view>
+			      <view class="newshopDbqline" v-for="(item,index) in shopInfo.brands.split(',')">{{item}}</view>
 			    </view>
 			  </view>
 			  <view class="newshopDadressBpx">
 			    <view class="newshopDaleft">
 			      <view class="newshopDaleftTop">
 			        <img src="../../static/timg/icon_coordinate@2x.png" alt="" class="shopaddressIcon">
-			        <span class="shopDdistance" v-if="Number(distance)>1">距离{{distance}}km</span>
-			        <span class="shopDdistance" v-else-if="Number(distance)">距离{{distance*1000}}m</span>
+			        <span class="shopDdistance" v-if="Number(shopInfo.distance)>1">距离{{shopInfo.distance}}km</span>
+			        <span class="shopDdistance" v-else-if="Number(shopInfo.distance)">距离{{shopInfo.distance*1000}}m</span>
 			        <span class="shopDdistance" v-else>距离--km</span>
 			      </view>
-			      <view class="newshopDadressName">金智源</view>
+			      <view class="newshopDadressName">{{shopInfo.address}}</view>
 			    </view>
 			    <view class="newshopDaright">
 			      <view class="newshopDrline" @click="goLocation()">
@@ -132,12 +132,30 @@
 				rightData:'',
 				rightTitle:'',
 				selectedItems: [],
-				
+				location: {
+					lng: '',
+					lat: '',
+				},
+				shopInfo:'',
 			}
 		},
 		onLoad() {
 			this.userInfo = uni.getStorageSync("userInfo");
-			this.listBigTags()
+			var that = this;
+			uni.getLocation({
+				type: 'gcj02',
+				success: function(res) {
+					console.log(res)
+					that.location.lat = res.latitude
+					that.location.lng = res.longitude
+					that.getInfo() 
+			
+				},
+				fail(err) {
+			       that.getInfo()
+				}
+			});
+			//this.listBigTags()
 		},
 		computed: {
 		  totalPrice () {
@@ -147,12 +165,25 @@
 		  }
 		},
 		methods: {
+			getInfo(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('openreservation/getInfo', {
+					lat: this.location.lat ? this.location.lat : '',
+					lng: this.location.lng ? this.location.lng : '',
+					
+				}, 'GET').then(res => {
+					this.shopInfo = res.data.shopInfo
+				    this.listBigTags()
+				})
+			},
 			listBigTags(){
 				uni.showLoading({
 					title: '加载中'
 				});
 				this.$http('openreservation/listBigTags', {
-					shopId:this.userInfo.shopId,
+					shopId:this.shopInfo.id,
 					unionId:this.userInfo.unionId
 				}, 'GET').then(res => {
 					uni.hideLoading();
@@ -160,7 +191,6 @@
 					this.rightTitle=res.data[0].Name
 				    this.leftData=res.data;
 					this.GetlistItemWxInfo()
-					//console.log(this.bizTagId)
 				})
 			},
 			GetlistItemWxInfo(){
@@ -170,7 +200,7 @@
 				});
 				console.log("bizTagId"+this.bizTagId)
 				this.$http('openreservation/listItemWxInfo', {
-					shopId:this.userInfo.shopId,
+					shopId:this.shopInfo.id,
 					bizTagId:this.bizTagId
 				}, 'GET').then(res => {
 					//console.log(res)

pages/user/addCar/addCar.vue

@@ -0,0 +1,480 @@
+<template>
+	<view class="content">
+
+		<!-- 填写车辆信息 -->
+		<view class="carMessage">
+
+			<view class="mesView">
+				<view class="leftTitle">车牌号</view>
+				<input class="plateNumber" placeholder-style="color:#999999" placeholder="请输入车牌号" disabled="true"
+					@tap="plateShow=true" v-model.trim="plateNo" />
+				<plate-input v-if="plateShow" :plate="plateNo" @export="setPlate" @close="plateShow=false" />
+
+
+			</view>
+
+			<view class="mesView" @click="goCarModel()">
+				<view class="leftTitle">车型</view>
+				<view class="carModBtn noSelectColor" v-if="!carModelInfo.value">请选择车型</view>
+				<view class="carModBtn selectColor carMod" v-else>{{carModelInfo.value}}</view>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">购车时间</view>
+				<picker class="timeBtn" @change="bindChange" mode="date" :end="currentdate" :value="time">
+					<view class="uni-input selectColor" v-if="time">{{time}}</view>
+					<view class="uni-input noSelectColor" v-else>请选择您的购车时间</view>
+				</picker>
+				<image src="../../static/img/rightArrow.png" class="rightArrow"></image>
+			</view>
+
+			<view class="mesView">
+				<view class="leftTitle">行驶里程</view>
+				<input class="mileageInput selectColor" type="number" v-model="mileage" placeholder="请输入"
+					placeholder-style="color:#999999" />
+				<view class="kmStr">km</view>
+			</view>
+
+
+		</view>
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="saveCar()">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode=""
+					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>保存爱车</view>
+			</view>
+		</view>
+		<view>
+			<!-- <w-picker :visible.sync="visible" mode="selector" value="2" default-type="value"
+				:default-props="defaultProps" :options="sbPlate" @confirm="onConfirm($event,'selector')"
+				@cancel="onCancel" ref="selector"></w-picker> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import plateInput from "@/components/uni-plate-input/uni-plate-input.vue"
+	//import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			plateInput,
+			//wPicker
+		},
+
+		data() {
+			return {
+
+				plateNo: '',
+				plateShow: false,
+				carModelInfo: '',
+				time: '',
+				mileage: '',
+				carId: '',
+				isEditCar: false,
+				currentdate: '',
+				plate_type: '',
+				sbPlate: [],
+				visible: false,
+				defaultProps: {
+					"label": "value",
+					"value": "ids"
+				},
+				vin: '',
+			}
+		},
+		onLoad(opt) {
+			uni.removeStorageSync('carModelInfo');
+
+			this.getNowFormatDate();
+
+			console.log(opt);
+			this.isEditCar = opt.isEditCar
+			this.carId = opt.id
+			if (this.isEditCar == 'true') {
+
+				this.getEditData()
+				uni.setNavigationBarTitle({
+					title: '编辑爱车'
+				})
+			}
+		},
+		onShow() {
+			var carModelInfo = uni.getStorageSync("carModelInfo");
+			if (carModelInfo) {
+				this.carModelInfo = carModelInfo;
+			}
+		},
+		methods: {
+			onConfirm(e) {
+				console.log(e)
+				this.carModelInfo = e.obj
+			},
+			onCancel() {
+				this.visible = false
+			},
+			getNowFormatDate() {
+
+				var date = new Date();
+				var seperator1 = "-";
+				var year = date.getFullYear();
+				var month = date.getMonth() + 1;
+				var day = date.getDate();
+				if (month >= 1 && month <= 9) {
+					month = "0" + month;
+				}
+				if (day >= 0 && day <= 9) {
+					day = "0" + day;
+				}
+				var currentdate = year + seperator1 + month + seperator1 + day;
+				this.currentdate = currentdate;
+			},
+			getEditData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				var carModelInfo = {
+					carModelInfo: {
+
+					}
+				}
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCarDetail', {
+					id: this.carId
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					carModelInfo.carModelInfo.logo = res.data.brandLogo;
+					carModelInfo.carModelInfo.brand = res.data.brand;
+					carModelInfo.carModelInfo.carSeries = res.data.series;
+					carModelInfo.carModelInfo.displacement = res.data.displacement;
+					carModelInfo.carModelInfo.transmissionType = res.data.transmissionType;
+					carModelInfo.carModelInfo.productionYear = res.data.annualmoney;
+					carModelInfo.carModelInfo.carModel = res.data.carModel;
+					carModelInfo.carModelInfo.guidePrice = res.data.guidePrice;
+					carModelInfo.carModelInfo.engineModel = res.data.engineType;
+					carModelInfo.carModelInfo.nLevelID = res.data.nLevelID;
+					carModelInfo.carModelInfo.salesName = res.data.saleName;
+
+
+					// 展示时
+					this.plateNo = res.data.plateNumber;
+					carModelInfo.value = res.data.carModel;
+					if (res.data.acarTime) {
+						this.time = res.data.acarTime.slice(0, res.data.createTime.length - 8);
+					}
+					this.mileage = res.data.milage;
+
+					this.carModelInfo = carModelInfo;
+					this.vin = res.data.vIN
+
+					console.log('this carModelInfo', this.carModelInfo);
+				})
+			},
+			goCarModel() {
+				uni.navigateTo({
+					url: 'carModel'
+				})
+			},
+			setPlate(plate) {
+				console.log(plate)
+				if (plate.length >= 7) this.plateNo = plate;
+				this.plateShow = false;
+				if (plate.length == 7) {
+					this.plate_type = 2
+				} else {
+					this.plate_type = 52
+				}
+				this.queryCarmodelByPlateNumber()
+			},
+			queryCarmodelByPlateNumber() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('worldKeepCar/worldHome/queryCarmodelByPlateNumber', {
+					license_plate: this.plateNo,
+					plate_type: this.plate_type,
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					console.log(res);
+					if (res.data) {
+						this.vin = res.data.vin
+						if (res.data.buyTime) {
+							this.time = res.data.buyTime.slice(0, res.data.buyTime.length - 8);
+						}
+
+					}
+					if (res.data.list && res.data.list.length > 0) {
+						this.sbPlate = res.data.list
+						//this.sbPlate=this.sbPlate.concat(this.sbPlate)
+						if (this.sbPlate.length == 1) {
+							//this.carModelInfo.value=res.data[0].value
+							this.carModelInfo = res.data.list[0]
+						} else {
+							this.visible = true
+						}
+					}
+
+				})
+			},
+
+			bindChange(e) {
+				console.log(e);
+				this.time = e.target.value
+			},
+
+			saveCar() {
+				uni.showLoading({
+					title: '保存中'
+				})
+				if (this.plateNo == '') {
+					uni.showToast({
+						title: '请填写车牌号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.carModelInfo == '') {
+					uni.showToast({
+						title: '请选择车型',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.time == '') {
+					uni.showToast({
+						title: '请选择购车时间',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.mileage == '') {
+					uni.showToast({
+						title: '请输入行驶里程',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				if (this.isEditCar == 'true') {
+					this.updateTMemberCar()
+				} else {
+					this.addTMemberCar()
+				}
+
+			},
+
+			addTMemberCar() {
+				this.$http('worldKeepCar/worldHome/addTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.value,
+					saleName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					acarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					vIN: this.vin,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 3000);
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				})
+			},
+			updateTMemberCar() {
+				this.$http('worldKeepCar/worldHome/updateTMemberCar', {
+					plateNumber: this.plateNo,
+					milage: this.mileage,
+					brand: this.carModelInfo.carModelInfo.brand,
+					displacement: this.carModelInfo.carModelInfo.displacement,
+					series: this.carModelInfo.carModelInfo.carSeries,
+					annualmoney: this.carModelInfo.carModelInfo.productionYear,
+					carModel: this.carModelInfo.value,
+					saleName: this.carModelInfo.carModelInfo.salesName,
+					transmissionType: this.carModelInfo.carModelInfo.transmissionType,
+					model: this.carModelInfo.carModelInfo.carModel,
+					nLevelID: this.carModelInfo.carModelInfo.nLevelID,
+					engineType: this.carModelInfo.carModelInfo.engineModel,
+					brandLogo: this.carModelInfo.carModelInfo.logo,
+					acarTime: this.time,
+					guidePrice: this.carModelInfo.carModelInfo.guidePrice,
+					vIN: this.vin,
+					id: this.carId,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none',
+							duration: 3000
+						});
+						uni.removeStorageSync('carModelInfo');
+						setTimeout(function() {
+							uni.navigateBack({
+
+							})
+						}, 3000);
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		min-height: 100vh;
+		background-color: #F4F5F7;
+		padding-top: 20rpx;
+	}
+
+
+
+	.carMessage {
+		margin: 0rpx 24rpx 40rpx;
+		padding-top: 20rpx;
+		height: 500rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.mesView {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 120rpx;
+		background-color: #FFFFFF;
+	}
+
+	.leftTitle {
+		margin: 28rpx;
+		width: 120rpx;
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+
+	.noSelectColor {
+		color: #999999;
+
+	}
+
+	.selectColor {
+		color: #333333;
+
+	}
+
+	.carMod {
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.rightArrow {
+		margin-right: 28rpx;
+		width: 14rpx;
+		height: 23rpx;
+
+	}
+
+	.cityBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.plateNumber {
+		width: 55%;
+		font-size: 28rpx;
+	}
+
+
+	.carModBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.timeBtn {
+		width: 65%;
+		font-size: 28rpx;
+	}
+
+	.mileageInput {
+		width: 20%;
+		font-size: 28rpx;
+	}
+
+	.kmStr {
+		font-size: 28rpx;
+		color: #333333;
+
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+</style>

pages/user/addCar/cailist.vue

@@ -0,0 +1,320 @@
+<template>
+	<view class="box">
+		<view class="carlistBox">
+			<view class="line" v-for="(item,index) in carList" @click="itemClick(item)">
+				<view class="lineCont">
+					<view>
+						<image :src="item.brandLogo" mode="widthFix" class="brandLogo"></image>
+					</view>
+					<view style="padding-left: 29rpx;">
+						<view class="carName">
+							<span>{{item.brand}} {{item.series}}</span>
+							<view class="plateNumber">{{item.plateNumber}}</view>
+						</view>
+						<view class="carMS">{{item.carModel}}</view>
+					</view>
+				</view>
+				<view class="lineBottom">
+					<view class="lineDel" @click.stop="delCar(item.id)">删除</view>
+					<view class="lineDel" @click.stop="editCar(item.id)">编辑</view>
+					<view class="Default" v-show="item.isDefault!=1" @click.stop="defaultCar(item)">设为默认</view>
+					<view class="DefaultYES" v-show="item.isDefault==1">已设为默认</view>
+				</view>
+				<view class="DefaultIcon" v-show="item.isDefault==1">默认</view>
+			</view>
+		</view>
+		<view v-if="carList==''&&loding" class="nodataBox">
+			<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
+
+
+
+		<view class="bottomView">
+			<view class="saveCar" @click="addBtn">
+				<image src="../../static/img/icon_tianjiacheliang.png" mode=""
+					style="width: 44rpx; height: 36rpx; margin-right: 10rpx;"></image>
+				<view>添加爱车</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				carList: '',
+				loding: false,
+				type: '',
+				carId: '',
+				fromMe: false,
+			}
+		},
+		onLoad(opt) {
+			this.$common.isUserId()
+			this.type = opt.type;
+			// console.log(this.type)
+			this.fromMe = opt.fromMe
+		},
+		onShow() {
+			this.getqueryMyBMemberCar();
+			this.carId = uni.getStorageSync("maintainCarData").id
+		},
+		methods: {
+			getqueryMyBMemberCar() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.loding = false;
+				this.$http('worldKeepCar/worldHome/queryMyTMemberCar', {
+
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.carList = res.data;
+					this.loding = true;
+				})
+			},
+			addBtn() {
+				var length = this.carList.length
+				if (length > 4) {
+					uni.showToast({
+						title: '库最多放五辆车，如果想添加，请先删除',
+						icon: 'none',
+						duration: 3000
+					});
+				} else {
+					uni.navigateTo({
+						url: 'addCar'
+					})
+				}
+
+			},
+			editCar(id) {
+
+				uni.navigateTo({
+					url: 'addCar?id=' + id + '&isEditCar=true'
+				})
+			},
+			delCar(id) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除车辆吗',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({});
+							that.$http('worldKeepCar/worldHome/deleteTMemberCar', {
+								id: id
+							}, 'POST').then(res => {
+								uni.hideLoading();
+								if (res.code == 0) {
+									if (that.carId == id) {
+										uni.removeStorageSync('maintainCarData');
+									}
+								}
+								that.getqueryMyBMemberCar()
+							})
+						} else if (res.cancel) {
+
+						}
+					}
+				});
+			},
+			defaultCar(item) {
+				var that = this;
+				uni.showLoading({
+					title: '保存中'
+				})
+				that.$http('worldKeepCar/worldHome/updateTCarIsdefault', {
+					id: item.id
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code == 0) {
+						uni.showToast({
+							title: '操作成功',
+							icon: 'none',
+							duration: 3000
+						});
+
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					that.getqueryMyBMemberCar()
+				})
+			},
+			itemClick(item) {
+				if (this.fromMe == 'true') {
+					return
+				}
+				uni.setStorage({
+					key: 'maintainCarData',
+					data: item,
+					success: function() {
+						uni.navigateBack({
+							delta: 1
+						})
+
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 100rpx;
+	}
+
+	.noTxt {
+		font-size: 36rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.nodataBox {
+		text-align: center;
+	}
+
+	.bottomView {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+
+		align-items: center;
+		display: flex;
+		justify-content: center;
+	}
+
+	.carlistBox {
+		padding-bottom: 120rpx;
+	}
+
+	.carlistBox {
+		padding: 24rpx;
+		padding-bottom: 120rpx;
+	}
+
+	.brandLogo {
+		width: 63rpx;
+	}
+
+	.line {
+		background: #FFFFFF;
+		padding: 27rpx 20rpx;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+	}
+
+	.lineCont {
+		display: flex;
+	}
+
+	.carName {
+		color: #3C3C3C;
+		font-size: 30rpx;
+		display: flex;
+	}
+
+	.plateNumber {
+		border-radius: 4px;
+		border: 1px solid #F19D01;
+		height: 32rpx;
+		line-height: 32rpx;
+		padding: 0 10rpx;
+		color: #F19D01;
+		font-size: 22rpx;
+		margin-left: 20rpx;
+		margin-top: 5rpx;
+
+	}
+
+	.carMS {
+		color: #666666;
+		font-size: 26rpx;
+		padding-top: 5px;
+	}
+
+	.lineBottom {
+		display: flex;
+		justify-content: flex-end;
+		padding-top: 20rpx;
+	}
+
+	.lineDel {
+		width: 94rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #DDDDDD;
+		text-align: center;
+		line-height: 50rpx;
+		font-size: 26rpx;
+		color: #3C3C3C;
+		margin-right: 29rpx;
+	}
+
+	.Default {
+		width: 148rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #FF4F00;
+		line-height: 50rpx;
+		text-align: center;
+		color: #FF4F00;
+		font-size: 26rpx;
+	}
+
+	.DefaultYES {
+		width: 148rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		border: 1px solid #DDDDDD;
+		line-height: 50rpx;
+		text-align: center;
+		color: #999999;
+		font-size: 26rpx;
+	}
+
+	.DefaultIcon {
+		position: absolute;
+		top: 0;
+		right: 0;
+		width: 109rpx;
+		height: 40rpx;
+		background: linear-gradient(131deg, #FFA72C 0%, #FF450F 100%);
+		border-radius: 0px 10rpx 0px 10rpx;
+		text-align: center;
+		line-height: 40rpx;
+		color: #FFFFFF;
+		font-size: 22rpx;
+	}
+</style>

pages/user/addCar/carModel.vue

@@ -0,0 +1,829 @@
+<template>
+	<view class="box">
+		
+		 <!-- 自定义头部 -->
+		<view class="zdyNav">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view class="zdyNavCont">
+				<view class="zdyNavContLeft">
+					<image src="../../static/img/baiheiback.png" mode="" class="baiheibackImg" @click="gofhj"></image>
+					<!-- <image src="../../static/img/chahao.png" mode="" class="gaunbiIMg" @click="goback"></image> -->
+				</view>
+				<view class="zdyNavContTitle">自主选车</view>
+				<view class="zdyNavContRight"></view>
+			</view>
+		</view>
+		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		<view style="height: 44px;"></view>
+		
+		<!-- <view class="tab">
+			<view class="tabLine" :class="{activeTab:tabIndex==1}" @click="tabIndex=1">手动选车</view>
+			<view class="tabLine" :class="{activeTab:tabIndex==2}" @click="tabIndex=2">VIN识别</view>
+		</view> -->
+		
+		<view class="tab1 " v-if="tabIndex==1">
+			 <scroll-view  class="scroll-view" :scroll-into-view="toView" scroll-y="true" >
+				<view class="brand-select">
+					<template v-for="item in carModelList">
+					  <view :id="item['首字母']" v-if="item['首字母']!='热门'">
+						<view class="brand-select-title" :id="item['首字母']+'-model'">
+						  <h5 :class="{'brand-select-titleselect':item['首字母']==toView}">{{item['首字母']}}</h5>
+						</view>
+					   
+							<view class="brand-select-wrapper">
+								<a class="brand-select-item" v-for="item2 in item['品牌列表']" @click="selectBrand(item2)" :id="item2.brand">
+								  <img :src="item2.logo" class="brand-select-item-icon">
+								  <span>{{item2.brand||item2.name}}</span>
+								</a>
+							</view>
+					   
+					  </view>
+					  <view :id="'rm'" v-if="item['首字母']=='热门'">
+						<view class="brand-select-title" :id="item['首字母']+'-model'">
+						  <h5 :class="{'brand-select-titleselect':item['首字母']==toView}">{{item['首字母']}}</h5>
+						</view>
+   
+							<view class="brand-select-wrapper">
+								<a class="brand-select-item" v-for="item2 in item['品牌列表']" @click="selectBrand(item2)" :id="item2.brand">
+								  <img :src="item2.logo" class="brand-select-item-icon">
+								  <span>{{item2.brand||item2.name}}</span>
+								</a>
+							</view>
+					   
+					  </view>
+					</template>
+				 </view>
+	        </scroll-view >
+			<div class="fast-navigation">
+			  <a class="fast-navigation-sel" :class="{'select':item['首字母']==toView}" v-for="item in carModelList" @tap="bindToView(item)">{{item['首字母']}}</a>
+			</div>
+			
+		</view>
+		<uni-popup ref="popup" type="right" :mask-click="true">
+			<view class="popup-content" >
+				<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				<view style="height: 44px;"></view>
+				<h3 class="carModel-nav-title cell-logo">
+				  <img :src="selectedCarBrand.logo" class="carModel-nav-title-img">
+				  <span class="carModel-nav-title-msg">{{ selectedCarBrand.brand }}</span>
+				</h3>
+				<scroll-view class="brandList" scroll-y="true">
+					<view v-for="item in carSeriesList" :key="item.manufactor" >
+					  <h3 class="cell-item-title">{{ item.manufactor }}</h3>
+					  <span v-for="item2 in item.carSeries" :key="item2" :title="item2" class="span-cell" @click="selectCarFactory(item.manufactor,item2)" >{{item2}}</span>
+					</view>
+				</scroll-view>
+				
+			</view>
+		</uni-popup>
+		
+		<!-- 排量 -->
+		<view class="displacementListBox" v-show="displacementListShow">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 44px;"></view>
+			<h3 class="carModel-nav-title">
+			  <img :src="selectedCarBrand.logo" class="carModel-nav-title-img" @click="$emit('changeStep', 1)">
+			  <span class="carModel-nav-title-msg">{{ selectedCarBrand.brand }} {{ carSeries }}</span>
+			</h3>
+			<scroll-view scroll-y="true" class="brandList">
+			  <view @click="selectDisplacement(item)" v-for="item in displacementList" class="displacementListLine" >
+			    {{item}}
+			  </view>
+			</scroll-view>
+		</view>
+		
+		<!-- 离合器 -->
+		<view class="carGroupListBox" v-show="carGroupListShow">
+			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			<view style="height: 44px;"></view>
+			<h3 class="carModel-nav-title">
+			  <img :src="selectedCarBrand.logo" class="carModel-nav-title-img" @click="$emit('changeStep', 1)">
+			  <span class="carModel-nav-title-msg">{{ selectedCarBrand.brand }} {{ carSeries }}{{displacement}}</span>
+			</h3>
+			<scroll-view scroll-y="true" class="brandList">
+			  <view @click="goAddCar(item)" v-for="item in carGroupList" class="displacementListLine" >
+			    {{item.title}}
+			  </view>
+			</scroll-view>
+		</view>
+		<!-- 离合器 -->
+		
+		
+		<view class="tab2" v-if="tabIndex==2">
+			<view class="vinboxone" v-if="vinboxoneShow">
+				<view class="smvin">请扫描VIN</view>
+				<view class="smvin2">扫描时请保持环境光线充足不要反光</view>
+				<view class="sltp">
+					<!-- <image src="../../static/img/vin.png" mode="" class="sltpImg" ></image> --><!-- v-if="!vinImg" -->
+					<!-- <image :src="vinImg" mode="widthFix" class="vinImg" v-if="vinImg"></image> -->
+				</view>
+				<view class="vinSc" @click="scVinIMg">上传图片</view>
+			</view>
+			<view class="vinboxTwo" v-if="vinboxtwoShow">
+				 <view class="vinboxTwoTopFh" @click="vinboxtwoShow=false"> 返回扫描 </view>
+				<view class="vinboxTwoTopVIn">车辆识别代码：{{vin}}</view>
+				<view class="vinCxNum"> 共{{vinSbList.length}}条查询结果</view>
+				<view class="vinXzBox">
+					<!-- <view class="vinXzLine">
+					 <view class="vinXzLineCx">品牌+车系+排量+变速器描述</view>
+					 <image src="../../static/img/icon_checked.png" mode="" class="loginLogo"></image>
+					</view> -->
+					<view class="vinXzLine" v-for="(vinItem,vIndex) in vinSbList" @click="ckVin(vinItem,vIndex)">
+					 <view class="vinXzLineCx">{{vinItem.title}}</view>
+					 <view class="vinXzLineyk" v-if="vinIndex!=vIndex"></view>
+					<!-- <image src="../../static/img/icon_checked.png" mode="" v-if="vinIndex==vIndex" class="loginLogo"></image> -->
+					</view>
+					<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+				</view>
+			</view>
+			<view class="vinboxTwoBottom" v-if="vinboxtwoShow" :style="{bottom:iStatusBarHeight+'px'}">
+				<view class="shoudonng" @click="shoudong">都不是，手动选车</view>
+				<view class="qrcx" @click="qrcx">确认车型</view>
+			</view>
+			
+		</view>
+		
+		
+	</view>
+</template>
+
+	
+<script>
+
+export default {
+	 components: {  
+	       
+	 },
+	data() {
+		return {
+			carList:'',
+			tabIndex:1,
+			carModelList:'',
+			toView:'',
+			type:'right',
+			brand:'',
+			carSeriesList:'',
+			selectedCarBrand:'',
+			manufactor:'',
+			carSeries:'',
+			displacementList:'',
+			displacementListShow:false,
+			selectedCarSeries:'',
+			displacement:'',
+			carGroupList:'',
+			carGroupListShow:false,
+			type:'',
+			delId:'',
+			vinImg:'',
+			file:'',
+			vin:'',
+			vinboxoneShow:true,
+			vinboxtwoShow:false,
+			addNum:'',
+			iStatusBarHeight:'',
+			popupShow:false,
+			vinSbList:[],
+			vinIndex:0,
+			vincarModelInfo:'',
+		}
+	},
+	onLoad(opt) {
+	  this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+	  if(opt.type==2){
+		  this.type=2
+	  }
+	  if(opt.add){
+		  this.addNum=opt.add
+	  }
+	  this.delId=opt.delId;
+      this.queryCarModelGroupPackage();
+	},
+	methods: {
+		ckVin(vinItem,vIndex){
+			this.vinIndex=vIndex;
+			this.vincarModelInfo=vinItem
+		},
+		qrcx(){
+			this.goAddCar(this.vincarModelInfo)
+		},
+		shoudong(){
+			this.vinboxtwoShow=false;
+			this.tabIndex=1;
+		},
+		goback(){
+			uni.navigateBack({
+				delta:1
+			})
+		},
+		gofhj(){
+			if(this.carGroupListShow){
+				this.carGroupListShow=false
+			}else if(this.displacementListShow){
+				this.displacementListShow=false
+			}else if(this.popupShow){
+				this.popupShow=false
+				this.$refs.popup.close()
+			}else{
+				uni.navigateBack({
+					delta:1
+				})
+			}
+		},
+		scVinIMg(){
+			var that = this;
+			uni.chooseImage({
+				sourceType: ['album','camera'],
+				count:1, 
+				success: (chooseImageRes) => {
+					const tempFilePaths = chooseImageRes.tempFilePaths;
+					that.file=tempFilePaths[0]
+					 uni.uploadFile({
+				            url: that.$request.baseUrl+'accompany/SuperCheckSheet/uploadFile', //仅为示例，非真实的接口地址
+				            filePath: tempFilePaths[0],
+				            name: 'file',
+				            formData: {
+				                'user': 'test'
+				            },
+				            success: (uploadFileRes) => {
+				                console.log(JSON.parse(uploadFileRes.data).data );
+								//that.imgArr=that.imgArr.concat(JSON.parse(uploadFileRes.data).data) ;
+								that.vinImg=JSON.parse(uploadFileRes.data).data[0];
+								that.vinScanner()
+				            }
+				        });
+			
+					/* that.$http('accompany/SuperCheckSheet/uploadFile', tempFilePaths[0], 'POST').then(res => {
+						
+					}) */
+				}
+			});
+		},
+		vinScanner(){
+			uni.showLoading({
+				title:'正在识别中'
+			});
+			/* 
+			this.$http('miniAppMyBMemberCar/vinScanner', {
+			  photo:this.file,
+			
+			 },'POST').then(res => {
+				uni.hideLoading();
+				//this.carGroupList=res.data.carGroupList
+			}) */
+			var that=this;
+			uni.uploadFile({
+			       url: that.$request.baseUrl+'miniAppMyBMemberCar/vinScanner', 
+			       filePath: that.file,
+			       name: 'photo',
+			       formData: {
+			           'user': 'test'
+			       },
+			       success: (uploadFileRes) => {
+					   uni.hideLoading();
+			           console.log(JSON.parse(uploadFileRes.data) );
+					   if(JSON.parse(uploadFileRes.data).code==0){
+						   	that.vin = JSON.parse(uploadFileRes.data).data;
+							that.queryCarModelGroupByVin()
+					   }else{
+						   uni.showToast({
+						   	title: JSON.parse(uploadFileRes.data).msg,
+						   	icon: 'none',
+						   	duration: 2000,
+						   });
+					   }
+					   	
+			       }
+			   });
+		},
+		queryCarModelGroupByVin(){
+			uni.showLoading({ });
+			this.$http('miniAppMyBMemberCar/queryCarModelGroupByVin', {
+			  vin:this.vin,
+			
+			 },'GET').then(res => {
+				uni.hideLoading();
+				if(res.code!=0){
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 2000,
+					});
+				}else{
+					this.vinboxtwoShow=true
+					this.vinSbList=res.data;
+					this.vincarModelInfo=this.vinSbList[0]
+				}
+				
+			})
+			
+		},
+		goAddCar(item){
+			console.log(item)
+			var carModelInfo=item;
+			var that=this;
+			uni.setStorage({
+				key: 'carModelInfo',
+				data: carModelInfo,
+				success: function () {
+					
+					
+						uni.navigateBack({
+							delta:1
+						})
+					
+					 
+				}
+			}); 
+		},
+		selectBrand(item){
+			console.log(item)
+			this.selectedCarBrand=item;
+			this.$refs.popup.open("right")
+			this.popupShow=true;
+			this.brand=item.brand
+			this.getbrand()
+		},
+		selectCarFactory(manufactor,item){
+			this.manufactor=manufactor;
+			this.carSeries=item;
+			//this.selectedCarSeries=item
+			this.displacementListShow=true;
+			this.getdisplacementList()
+		},
+		selectDisplacement(item){
+			this.displacement=item;
+			this.carGroupListShow=true;
+			this.getmodelList();
+		},
+		getmodelList(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
+			  brand:this.brand,
+			  manufactor:this.manufactor,
+			  carSeries:this.carSeries,
+			  displacement:this.displacement
+			 },'GET').then(res => {
+				uni.hideLoading();
+				this.carGroupList=res.data.carGroupList
+			})
+		},
+		getdisplacementList(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
+			  brand:this.brand,
+			  manufactor:this.manufactor,
+			  carSeries:this.carSeries
+			 },'GET').then(res => {
+				uni.hideLoading();
+				this.displacementList=res.data.displacementList
+			})
+		},
+		queryCarModelGroupPackage(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
+			  
+			 },'GET').then(res => {
+				uni.hideLoading();
+				this.carModelList=res.data.brands
+			})
+		},
+		bindToView(item){
+			console.log(item)
+			if(item['首字母']=='热门'){
+					this.toView ='rm'
+			}else{
+					this.toView = item['首字母']
+			}
+		
+			console.log(this.toView)
+			//this.scrollTop = 0
+		
+		},
+       /* login(){
+			uni.navigateTo({
+				url:'../login/login'
+			})
+		} */
+		close(){
+			this.$refs.popup.close()
+		},
+		getbrand(){
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$http('worldKeepCar/worldHome/queryCarModelGroupPackage', {
+			  brand:this.brand
+			 },'GET').then(res => {
+				uni.hideLoading();
+				this.carSeriesList=res.data.carSeriesList
+			})
+		}
+	}
+}
+</script>
+
+<style scoped lang="scss">
+	.box{
+		min-height: 100vh;
+		background:#F4F5F7 ;
+	}
+	.vinboxTwoTopFh{
+		font-size: 26rpx;
+	    padding: 30rpx 24rpx;
+		color: #3F90F7;
+	}
+	.vinboxTwoBottom{
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -2px 20px 0px rgba(153, 153, 153, 0.2);
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-around;
+	}
+	.shoudonng{
+		width: 336rpx;
+		height: 74rpx;
+		border-radius: 37rpx;
+		border: 1px solid #FF4F00;
+		line-height: 74rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #FF4F00;
+		margin-top: 23rpx;
+	}
+	.qrcx{
+		width: 336rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		line-height: 74rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #FFFFFF;
+			margin-top: 23rpx;
+	}
+	.vinXzBox{
+		padding-bottom: 120rpx;
+	}
+	.loginLogo{
+		width: 28rpx;
+		height: 28rpx;
+	}
+	.vinXzLineyk{
+		width: 24rpx;
+		height: 24rpx;
+		border: 2rpx solid #999999;
+		border-radius: 50%;
+	}
+	.vinXzLine{
+		padding: 30rpx 24rpx;
+		display: flex;
+		justify-content: space-between;
+		color: #3C3C3C;
+		font-size: 28rpx;
+		line-height: 28rpx;
+		border-bottom: 1px solid #DDDDDD;
+	}
+	.vinboxTwoTopVIn{
+		font-size: 28rpx;
+		color: #666666;
+		padding-left: 24rpx;
+		padding-bottom: 30rpx;
+	}
+	.zdyNav{
+		width: 100vw;
+		background: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1111111;
+	}
+	.zdyNavCont{
+		height: 44px;
+		font-size: 28rpx;
+		// font-weight: bold;
+		display: flex;
+		justify-content: space-between;
+		line-height: 44px;
+	}
+	.vinCxNum{
+		background: #F4F5F7;
+		font-size: 26rpx;
+		padding: 18rpx 24rpx;
+		color: #999999;
+	}
+	.baiheibackImg{
+		width: 70px;
+		height: 44px;
+	}
+	.gaunbiIMg{
+		width: 20px;
+		height: 20px;
+		padding: 12px;
+	}
+	.zdyNavContLeft{
+		
+	}
+	.zdyNavContTitle{
+		color: #000000;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+	.zdyNavContRight{
+		width: 100px;
+	}
+	.smvin{
+		color: #3C3C3C;
+		font-size: 30rpx;
+	}
+	.smvin2{
+		color: #999999;
+		font-size: 26rpx;
+	}
+	.tab2{
+		padding: 30rpx 24rpx;
+		min-height: calc(100vh - 150rpx - 44px);
+		background: #FFFFFF;
+		position: relative;
+	}
+	.vinboxTwo{
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 750rpx;
+		min-height: calc(100vh - 150rpx - 44px);
+		background: #FFFFFF;
+	}
+	.sltpImg{
+		width: 704rpx;
+		height: 353rpx;
+	}
+	.vinImg{
+		width: 704rpx;
+	}
+	.sltp{
+		padding-top: 20rpx;
+	}
+	.vinSc{
+		width: 690rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 70rpx;
+	}
+	.nodataImg{
+	  width: 400rpx;
+	  padding-top: 100rpx;
+	}
+	.noTxt{
+		font-size: 36rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+	.nodataBox{
+		text-align: center;
+	}
+	.addBtn{
+		width: 690rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		line-height: 74rpx;
+		text-align: center;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		position: fixed;
+		bottom: 23rpx;
+		left: 30rpx;
+	}
+	.carlistBox{
+		padding-bottom: 120rpx;
+	}
+	.tab{
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-around;
+		line-height: 93rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		border-bottom: 1px solid #F4F5F7;
+	}
+	.activeTab{
+		color: #FF4F00;text-decoration: underline
+	}
+	/* .brand-select-title{
+		height: 80px;
+		background:rgba(247,247,247,1);
+		position: relative;
+	} */
+	.brand-select{
+	  .brand-select-title{
+	    height: 80rpx;
+	    background:rgba(247,247,247,1);
+	    position: relative;
+	    h5{
+	      position: absolute;
+	      height:40rpx;
+	      font-size:28rpx;
+	      font-weight:500;
+	      color:rgba(102,102,102,1);
+	      line-height:40rpx;
+	      top: 20rpx;
+	      left: 30rpx;
+	    }
+	  }
+	  .brand-select-wrapper{
+	    display: flex;
+	    flex-wrap: wrap;
+	    background:rgba(255,255,255,1);
+		width: 100vw;
+	    .brand-select-item{
+	      display: block;
+	      width: 80rpx;
+	      height: 100rpx;
+	      padding: 30rpx;
+	      img{
+	        display: inline-block;
+	        margin-left: 10rpx;
+	        width: 60rpx;
+	        height: 60rpx;
+	      }
+	      span{
+	        display: inline-block;
+	        text-align: center;
+	        height:33rpx;
+	        width: 90rpx;
+	        font-size:24rpx;
+	        font-weight:400;
+	        color:rgba(51,51,51,1);
+	        line-height:33rpx;
+	      }
+	    }
+	
+	  }
+	}
+	.fast-navigation{
+	  position: fixed;
+	  text-align: center;
+	  right: 16rpx;
+	  top: 360rpx;
+	  width: 23rpx;
+	  font-size:24rpx;
+	  font-weight:500;
+	  line-height:35rpx;
+	  color: rgb(153, 153, 153);
+	  a{
+	    display: block;
+	  }
+	  .select{
+	    color: #FF4F00;
+	  }
+	}
+	.scroll-view{
+		height: calc(100vh - 93rpx);
+	}
+	.popup-height {
+	
+		width: 200px;
+	}
+	.popup-content{
+		width: 590rpx;
+		background: #FFFFFF;
+		height: 100vh;
+	}
+	.carModel-nav-title{
+	  height:100rpx;
+	  background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+	  line-height: 100rpx;
+	  display: flex;
+	  z-index: 500;
+	  &.cell-logo{
+	    position: sticky;
+	    top: 0;
+	   background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+	  }
+	  .carModel-nav-title-box{
+	    width: 100%;
+	    display: flex;
+	  }
+	  .carModel-nav-title-img{
+	    margin: 20rpx;
+	    width: 60rpx;
+	    height: 60rpx;
+	  }
+	  .carModel-nav-title-msg{
+	    font-size:30rpx;
+	    font-weight:400;
+	    color:rgba(255,255,255,1);
+	    display: block;
+	    padding-right: 20rpx;
+	  }
+	}
+	.cell-item-title{
+	  height:60rpx;
+	  background:rgba(250,250,250,1);
+	  font-size:28rpx;
+	  font-weight:400;
+	  color:rgba(102,102,102,1);
+	  line-height:60rpx;
+	  padding-left: 26rpx;
+	}
+	.span-cell{
+	  position: relative;
+	  display: -webkit-box;
+	  display: -webkit-flex;
+	  display: flex;
+	  box-sizing: border-box;
+	  width: 100%;
+	  padding: 6rpx 30rpx;
+	  overflow: hidden;
+	  color: #323233;
+	  font-size: 3.73333vw;
+	  line-height: 82rpx;
+	  height: 82rpx;
+	  background-color: #fff;
+	  border-bottom: 1px solid #ebedf0;
+	
+	}
+	.carModel-nav-title{
+	  height:100rpx;
+	 background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+	 line-height: 100rpx;
+	  display: flex;
+	  z-index: 500;
+	  &.cell-logo{
+	    position: sticky;
+	    top: 0;
+	    background: linear-gradient(134deg, #FF8635 0%, #FF4828 100%);
+	  }
+	  .carModel-nav-title-box{
+	    width: 100%;
+	    display: flex;
+	  }
+	  .carModel-nav-title-img{
+	    margin: 20rpx;
+	    width: 60rpx;
+	    height: 60rpx;
+	  }
+	  .carModel-nav-title-msg{
+	    font-size:30rpx;
+	    font-weight:400;
+	    color:rgba(255,255,255,1);
+	    display: block;
+	    padding-right: 20px;
+	  }
+	}
+	.displacementListLine{
+		min-height: 50rpx;
+		padding: 20rpx 20rpx 20rpx 30rpx;
+		font-size:28rpx;
+		font-weight:600;
+		color:rgba(51,51,51,1);
+		line-height:50rpx;
+		border-top: 2rpx solid rgb(238, 238, 238);
+		background-color: rgb(255, 255, 255);
+	}
+	.displacementListBox{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background:#F4F5F7 ;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top:44px;
+		/*  #endif  */
+	}
+	.carGroupListBox{
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100vw;
+		height: 100vh;
+		background:#F4F5F7 ;
+		z-index: 11111;
+		/*  #ifdef H5 */
+		top:44px;
+		/*  #endif  */
+	}
+	.brandList{
+		height: calc(100vh - 250rpx);
+	}
+	.brand-select-titleselect{
+		    color: #FF4F00 !important;
+	}
+</style>

pages/user/myOrder/myOrder.vue

@@ -27,9 +27,8 @@
 					<view class="shopName">{{item.SheetContent}}</view>
 					<view class="price">￥{{item.RealMoney}}</view>
 				</view>
-				<view class="itemName">{{item.CreateTime}}</view>
 
-				
+				<view class="itemName">{{item.CreateTime}}</view>
 
 			</view>
 
@@ -78,9 +77,7 @@
 			},
 			goDetail(id) {
 				uni.navigateTo({
-
-					url:"../../myOrder/mallOrderDetail?id=" + '123'
-					
+					url:"../../orderDetail/mallOrderDetail?id=" + item.id
 				})
 			},
 			getData() {
@@ -92,7 +89,6 @@
 					page: this.page,
 					limit: 10,
 					sheetState: this.tabIndex>0?this.tabIndex:''
-
 				}
 
 				this.$http('openOrderManagement/getOpenSheetList', padata, 'GET').then(res => {

utils/request.js

@@ -31,15 +31,15 @@ const http = (url = '', date = {}, type = 'POST', header = {
             let [error, res] = response;
 		 
 			if(res.data.code==401||res.data.code==403){
-				 uni.showToast({
-				     title: res.data.msg,
-				 	 icon:'none',
-				     duration: 3000,
-				 });
+				//  uni.showToast({
+				//      title: res.data.msg,
+				//  	 icon:'none',
+				//      duration: 3000,
+				//  });
 				 uni.clearStorageSync()
-				 uni.navigateTo({
-					url:'../login/login'
-				}) 
+				//  uni.navigateTo({
+				// 	url:'../login/login'
+				// }) 
 			}else if(res.data.code==409){
 				 // getToken(url,date,type,header)
 			}