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

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  order

# Conflicts:
#	pages/user/addCar/addCar.vue
#	pages/user/addCar/cailist.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/w-picker/date-picker.vue

@@ -1,742 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-		</picker-view>
-		<picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-		</picker-view>
-		<picker-view v-if="fields=='day'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
-			</picker-view-column>
-		</picker-view>
-		<picker-view v-if="fields=='hour'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
-			</picker-view-column>
-		</picker-view>
-		<picker-view v-if="fields=='minute'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
-			</picker-view-column>
-		</picker-view>
-		<picker-view v-if="fields=='second'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{
-					years:[],
-					months:[],
-					days:[],
-					hours:[],
-					minutes:[],
-					seconds:[]
-				},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			startYear:{
-				type:[String,Number],
-				default:""
-			},
-			endYear:{
-				type:[String,Number],
-				default:""
-			},
-			value:{
-				type:[String,Array,Number],
-				default:""
-			},
-			current:{//是否默认选中当前日期
-				type:Boolean,
-				default:false
-			},
-			disabledAfter:{//是否禁用当前之后的日期
-				type:Boolean,
-				default:false
-			},
-			fields:{
-				type:String,
-				default:"day"
-			}
-		},
-		watch:{
-			fields(val){
-				this.initData();
-			},
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			formatNum(n){
-				return (Number(n)<10?'0'+Number(n):Number(n)+'');
-			},
-			checkValue(value){
-				let strReg,example
-				switch(this.fields){
-					case "year":
-						strReg=/^\d{4}$/;
-						example="2019";
-						break;
-					case "month":
-						strReg=/^\d{4}-\d{2}$/;
-						example="2019-02";
-						break;
-					case "day":
-						strReg=/^\d{4}-\d{2}-\d{2}$/;
-						example="2019-02-01";
-						break;
-					case "hour":
-						strReg=/^\d{4}-\d{2}-\d{2} \d{2}(:\d{2}){1,2}?$/;
-						example="2019-02-01 18:00:00或2019-02-01 18";
-						break;
-					case "minute":
-						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2}){0,1}?$/;
-						example="2019-02-01 18:06:00或2019-02-01 18:06";
-						break;
-					case "second":
-						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
-						example="2019-02-01 18:06:01";
-						break;
-				}
-				if(!strReg.test(value)){
-					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
-				}
-				return strReg.test(value);
-			},
-			resetData(year,month,day,hour,minute){
-				let curDate=this.getCurrenDate();
-				let curFlag=this.current;
-				let curYear=curDate.curYear;
-				let curMonth=curDate.curMonth;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let curMinute=curDate.curMinute;
-				let curSecond=curDate.curSecond;
-				let months=[],days=[],hours=[],minutes=[],seconds=[];
-				let disabledAfter=this.disabledAfter;
-				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
-				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
-				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
-				let hoursLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)?24:curHour+1):24;
-				let minutesLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour)?60:curMinute+1):60;
-				let secondsLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour||minute*1<curMinute)?60:curSecond+1):60;
-				for(let month=1;month<=monthsLen;month++){
-					months.push(this.formatNum(month));
-				};
-				for(let day=1;day<=daysLen;day++){
-					days.push(this.formatNum(day));
-				}
-				for(let hour=0;hour<hoursLen;hour++){
-					hours.push(this.formatNum(hour));
-				}
-				for(let minute=0;minute<minutesLen;minute++){
-					minutes.push(this.formatNum(minute));
-				}
-				for(let second=0;second<secondsLen;second++){
-					seconds.push(this.formatNum(second));
-				}
-				return{
-					months,
-					days,
-					hours,
-					minutes,
-					seconds
-				}
-			},
-			isLeapYear (Year) {
-				if (((Year % 4)==0) && ((Year % 100)!=0) || ((Year % 400)==0)) {
-					return true;
-				} else { 
-					return false; 
-				}
-			},
-			getData(dVal){
-				//用来处理初始化数据
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let fields=this.fields;
-				let curDate=this.getCurrenDate();
-				let curYear=curDate.curYear;
-				let curMonthdays=curDate.curMonthdays;
-				let curMonth=curDate.curMonth;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let curMinute=curDate.curMinute;
-				let curSecond=curDate.curSecond;
-				let defaultDate=this.getDefaultDate();
-				let startYear=this.getStartDate().getFullYear();
-				let endYear=this.getEndDate().getFullYear();
-				//颗粒度，禁用当前之后日期仅对year,month,day,hour生效;分钟秒禁用没有意义,
-				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
-				let year=dVal[0]*1;
-				let month=dVal[1]*1;
-				let day=dVal[2]*1;
-				let hour=dVal[3]*1;
-				let minute=dVal[4]*1;
-				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
-				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
-				let hoursLen=disabledAfter?((year<curYear||month<curMonth||day<curDay)?24:curHour+1):24;
-				let minutesLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour)?60:curMinute+1):60;
-				let secondsLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour||minute<curMinute)?60:curSecond+1):60;
-				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
-					years.push(year.toString())
-				}
-				for(let month=1;month<=monthsLen;month++){
-					months.push(this.formatNum(month));
-				}
-				for(let day=1;day<=daysLen;day++){
-					days.push(this.formatNum(day));
-				}
-				for(let hour=0;hour<hoursLen;hour++){
-					hours.push(this.formatNum(hour));
-				}
-				for(let minute=0;minute<minutesLen;minute++){
-					minutes.push(this.formatNum(minute));
-				}
-				// for(let second=0;second<(disabledAfter?curDate.curSecond+1:60);second++){
-				// 	seconds.push(this.formatNum(second));
-				// }
-				for(let second=0;second<60;second++){
-					seconds.push(this.formatNum(second));
-				}
-				return {
-					years,
-					months,
-					days,
-					hours,
-					minutes,
-					seconds
-				}
-			},
-			getCurrenDate(){
-				let curDate=new Date();
-				let curYear=curDate.getFullYear();
-				let curMonth=curDate.getMonth()+1;
-				let curMonthdays=new Date(curYear,curMonth,0).getDate();
-				let curDay=curDate.getDate();
-				let curHour=curDate.getHours();
-				let curMinute=curDate.getMinutes();
-				let curSecond=curDate.getSeconds();
-				return{
-					curDate,
-					curYear,
-					curMonth,
-					curMonthdays,
-					curDay,
-					curHour,
-					curMinute,
-					curSecond
-				}
-			},
-			getDefaultDate(){
-				let value=this.value;
-				let reg=/-/g;
-				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
-				let defaultYear=defaultDate.getFullYear();
-				let defaultMonth=defaultDate.getMonth()+1;
-				let defaultDay=defaultDate.getDate();
-				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
-				return{
-					defaultDate,
-					defaultYear,
-					defaultMonth,
-					defaultDay,
-					defaultDays
-				}
-			},
-			getStartDate(){
-				let start=this.startYear;
-				let startDate="";
-				let reg=/-/g;
-				if(start){
-					startDate=new Date(start+"/01/01");
-				}else{
-					startDate=new Date("1970/01/01");
-				}
-				return startDate;
-			},
-			getEndDate(){
-				let end=this.endYear;
-				let reg=/-/g;
-				let endDate="";
-				if(end){
-					endDate=new Date(end+"/12/01");
-				}else{
-					endDate=new Date();
-				}
-				return endDate;
-			},
-			getDval(){
-				let value=this.value;
-				let fields=this.fields;
-				let dVal=null;
-				let aDate=new Date();
-				let year=this.formatNum(aDate.getFullYear());
-				let month=this.formatNum(aDate.getMonth()+1);
-				let day=this.formatNum(aDate.getDate());
-				let hour=this.formatNum(aDate.getHours());
-				let minute=this.formatNum(aDate.getMinutes());
-				let second=this.formatNum(aDate.getSeconds());
-				if(value){
-					let flag=this.checkValue(value);
-					if(!flag){
-						dVal=[year,month,day,hour,minute,second]
-					}else{
-						switch(this.fields){
-							case "year":
-								dVal=value?[value]:[];	
-								break;
-							case "month":
-								dVal=value?value.split("-"):[];
-								break;
-							case "day":
-								dVal=value?value.split("-"):[];
-								break;
-							case "hour":
-								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
-								break;
-							case "minute":
-								dVal=value?[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")]:[];
-								break;
-							case "second":
-								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
-								break;
-						}
-					}
-				}else{
-					dVal=[year,month,day,hour,minute,second]
-				}
-				return dVal;
-			},
-			initData(){
-				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
-				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
-				let dVal=[],pickVal=[];
-				let value=this.value;
-				let reg=/-/g;
-				let range={};
-				let result="",full="",year,month,day,hour,minute,second,obj={};
-				let defaultDate=this.getDefaultDate();
-				let defaultYear=defaultDate.defaultYear;
-				let defaultMonth=defaultDate.defaultMonth;
-				let defaultDay=defaultDate.defaultDay;
-				let defaultDays=defaultDate.defaultDays;
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let curDate=this.getCurrenDate();
-				let curYear=curDate.curYear;
-				let curMonth=curDate.curMonth;
-				let curMonthdays=curDate.curMonthdays;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let curMinute=curDate.curMinute;
-				let curSecond=curDate.curSecond;
-				let dateData=[];
-				dVal=this.getDval();
-				
-				startDate=this.getStartDate();
-				endDate=this.getEndDate();
-				startYear=startDate.getFullYear();
-				startMonth=startDate.getMonth();
-				startDay=startDate.getDate();
-				endYear=endDate.getFullYear();
-				endMonth=endDate.getMonth();
-				endDay=endDate.getDate();
-				dateData=this.getData(dVal);
-				years=dateData.years;
-				months=dateData.months;
-				days=dateData.days;
-				hours=dateData.hours;
-				minutes=dateData.minutes;
-				seconds=dateData.seconds;
-				switch(this.fields){
-					case "year":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
-						]:(curFlag?[
-							years.indexOf(curYear+'')
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
-						]);
-						range={years};
-						year=dVal[0]?dVal[0]:years[0];
-						result=full=`${year}`;
-						obj={
-							year
-						}
-						break;
-					case "month":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
-						]:(curFlag?[
-							years.indexOf(curYear+''),
-							months.indexOf(this.formatNum(curMonth))
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
-						]);
-						range={years,months};
-						year=dVal[0]?dVal[0]:years[0];
-						month=dVal[1]?dVal[1]:months[0];
-						result=full=`${year+'-'+month}`;
-						obj={
-							year,
-							month
-						}
-						break;
-					case "day":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
-						]:(curFlag?[
-							years.indexOf(curYear+''),
-							months.indexOf(this.formatNum(curMonth)),
-							days.indexOf(this.formatNum(curDay)),
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
-						]);
-						range={years,months,days};
-						year=dVal[0]?dVal[0]:years[0];
-						month=dVal[1]?dVal[1]:months[0];
-						day=dVal[2]?dVal[2]:days[0];
-						result=full=`${year+'-'+month+'-'+day}`;
-						obj={
-							year,
-							month,
-							day
-						}
-						break;
-					case "hour":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
-						]:(curFlag?[
-							years.indexOf(curYear+''),
-							months.indexOf(this.formatNum(curMonth)),
-							days.indexOf(this.formatNum(curDay)),
-							hours.indexOf(this.formatNum(curHour)),
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
-						]);
-						range={years,months,days,hours};
-						year=dVal[0]?dVal[0]:years[0];
-						month=dVal[1]?dVal[1]:months[0];
-						day=dVal[2]?dVal[2]:days[0];
-						hour=dVal[3]?dVal[3]:hours[0];
-						result=`${year+'-'+month+'-'+day+' '+hour}`;
-						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
-						obj={
-							year,
-							month,
-							day,
-							hour
-						}
-						break;
-					case "minute":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
-							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
-						]:(curFlag?[
-							years.indexOf(curYear+''),
-							months.indexOf(this.formatNum(curMonth)),
-							days.indexOf(this.formatNum(curDay)),
-							hours.indexOf(this.formatNum(curHour)),
-							minutes.indexOf(this.formatNum(curMinute)),
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
-							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
-						]);
-						range={years,months,days,hours,minutes};
-						year=dVal[0]?dVal[0]:years[0];
-						month=dVal[1]?dVal[1]:months[0];
-						day=dVal[2]?dVal[2]:days[0];
-						hour=dVal[3]?dVal[3]:hours[0];
-						minute=dVal[4]?dVal[4]:minutes[0];
-						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
-						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
-						obj={
-							year,
-							month,
-							day,
-							hour,
-							minute
-						}
-						break;
-					case "second":
-						pickVal=disabledAfter?[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
-							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
-							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
-						]:(curFlag?[
-							years.indexOf(curYear+''),
-							months.indexOf(this.formatNum(curMonth)),
-							days.indexOf(this.formatNum(curDay)),
-							hours.indexOf(this.formatNum(curHour)),
-							minutes.indexOf(this.formatNum(curMinute)),
-							seconds.indexOf(this.formatNum(curSecond)),
-						]:[
-							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
-							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
-							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
-						]);
-						range={years,months,days,hours,minutes,seconds};
-						year=dVal[0]?dVal[0]:years[0];
-						month=dVal[1]?dVal[1]:months[0];
-						day=dVal[2]?dVal[2]:days[0];
-						hour=dVal[3]?dVal[3]:hours[0];
-						minute=dVal[4]?dVal[4]:minutes[0];
-						second=dVal[5]?dVal[5]:seconds[0];
-						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
-						obj={
-							year,
-							month,
-							day,
-							hour,
-							minute,
-							second
-						}
-						break;
-					default:
-						range={years,months,days};
-						break;
-				}
-				this.range=range;
-				this.checkObj=obj;
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				});
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let data=this.range;
-				let year="",month="",day="",hour="",minute="",second="";
-				let result="",full="",obj={};
-				let months=null,days=null,hours=null,minutes=null,seconds=null;
-				let disabledAfter=this.disabledAfter;
-				let leapYear=false,resetData={};
-				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
-				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
-				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
-				hour=(arr[3]||arr[3]==0)?data.hours[arr[3]]||data.hours[data.hours.length-1]:"";
-				minute=(arr[4]||arr[4]==0)?data.minutes[arr[4]]||data.minutes[data.minutes.length-1]:"";
-				second=(arr[5]||arr[5]==0)?data.seconds[arr[5]]||data.seconds[data.seconds.length-1]:"";
-				resetData=this.resetData(year,month,day,hour,minute);//重新拉取当前日期数据;
-				leapYear=this.isLeapYear(year);//判断是否为闰年;
-				switch(this.fields){
-					case "year":
-						result=full=`${year}`;
-						obj={
-							year
-						};
-						break;
-					case "month":
-						result=full=`${year+'-'+month}`;
-						if(this.disabledAfter)months=resetData.months;
-						if(months)this.range.months=months;
-						obj={
-							year,
-							month
-						}
-						break;
-					case "day":
-						result=full=`${year+'-'+month+'-'+day}`;
-						if(this.disabledAfter){
-							months=resetData.months;
-							days=resetData.days;
-						}else{
-							if(leapYear||(month!=this.checkObj.month)||month==2){
-								days=resetData.days;
-							}
-						}
-						if(months)this.range.months=months;
-						if(days)this.range.days=days;
-						obj={
-							year,
-							month,
-							day
-						}
-						break;
-					case "hour":
-						result=`${year+'-'+month+'-'+day+' '+hour}`;
-						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
-						if(this.disabledAfter){
-							months=resetData.months;
-							days=resetData.days;
-							hours=resetData.hours;
-						}else{
-							if(leapYear||(month!=this.checkObj.month)||month==2){
-								days=resetData.days;
-							}
-						}
-						if(months)this.range.months=months;
-						if(days)this.range.days=days;
-						if(hours)this.range.hours=hours;
-						obj={
-							year,
-							month,
-							day,
-							hour
-						}
-						break;
-					case "minute":
-						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
-						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
-						if(this.disabledAfter){
-							months=resetData.months;
-							days=resetData.days;
-							hours=resetData.hours;
-							minutes=resetData.minutes;
-						}else{
-							if(leapYear||(month!=this.checkObj.month)||month==2){
-								days=resetData.days;
-							}
-						}
-						if(months)this.range.months=months;
-						if(days)this.range.days=days;
-						if(hours)this.range.hours=hours;
-						if(minutes)this.range.minutes=minutes;
-						obj={
-							year,
-							month,
-							day,
-							hour,
-							minute
-						};
-						break;
-					case "second":
-						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
-						if(this.disabledAfter){
-							months=resetData.months;
-							days=resetData.days;
-							hours=resetData.hours;
-							minutes=resetData.minutes;
-							//seconds=resetData.seconds;
-						}else{
-							if(leapYear||(month!=this.checkObj.month)||month==2){
-								days=resetData.days;
-							}
-						}
-						if(months)this.range.months=months;
-						if(days)this.range.days=days;
-						if(hours)this.range.hours=hours;
-						if(minutes)this.range.minutes=minutes;
-						//if(seconds)this.range.seconds=seconds;
-						obj={
-							year,
-							month,
-							day,
-							hour,
-							minute,
-							second
-						}
-						break;
-				}
-				this.checkObj=obj;
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";
-</style>

components/w-picker/half-picker.vue

@@ -1,345 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.sections" :key="index">{{item}}</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			startYear:{
-				type:String,
-				default:""
-			},
-			endYear:{
-				type:String,
-				default:""
-			},
-			value:{
-				type:[String,Array,Number],
-				default:""
-			},
-			current:{//是否默认选中当前日期
-				type:Boolean,
-				default:false
-			},
-			disabledAfter:{//是否禁用当前之后的日期
-				type:Boolean,
-				default:false
-			}
-		},
-		watch:{
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			formatNum(n){
-				return (Number(n)<10?'0'+Number(n):Number(n)+'');
-			},
-			checkValue(value){
-				let strReg=/^\d{4}-\d{2}-\d{2} [\u4e00-\u9fa5]{2}$/,example;
-				if(!strReg.test(value)){
-					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
-				}
-				return strReg.test(value);
-			},
-			resetData(year,month,day){
-				let curDate=this.getCurrenDate();
-				let curFlag=this.current;
-				let curYear=curDate.curYear;
-				let curMonth=curDate.curMonth;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let months=[],days=[],sections=[];
-				let disabledAfter=this.disabledAfter;
-				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
-				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
-				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
-				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
-				sections=["上午","下午"];
-				for(let month=1;month<=monthsLen;month++){
-					months.push(this.formatNum(month));
-				};
-				for(let day=1;day<=daysLen;day++){
-					days.push(this.formatNum(day));
-				}
-				if(sectionFlag){
-					sections=["上午"];
-				}
-				return{
-					months,
-					days,
-					sections
-				}
-			},
-			getData(dVal){
-				//用来处理初始化数据
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let curDate=this.getCurrenDate();
-				let curYear=curDate.curYear;
-				let curMonthdays=curDate.curMonthdays;
-				let curMonth=curDate.curMonth;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let defaultDate=this.getDefaultDate();
-				let startYear=this.getStartDate().getFullYear();
-				let endYear=this.getEndDate().getFullYear();
-				let years=[],months=[],days=[],sections=[];
-				let year=dVal[0]*1;
-				let month=dVal[1]*1;
-				let day=dVal[2]*1;
-				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
-				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
-				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
-				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
-					years.push(year.toString())
-				}
-				for(let month=1;month<=monthsLen;month++){
-					months.push(this.formatNum(month));
-				}
-				for(let day=1;day<=daysLen;day++){
-					days.push(this.formatNum(day));
-				}
-				if(sectionFlag){
-					sections=["下午"];
-				}else{
-					sections=["上午","下午"];
-				}
-				return {
-					years,
-					months,
-					days,
-					sections
-				}
-			},
-			getCurrenDate(){
-				let curDate=new Date();
-				let curYear=curDate.getFullYear();
-				let curMonth=curDate.getMonth()+1;
-				let curMonthdays=new Date(curYear,curMonth,0).getDate();
-				let curDay=curDate.getDate();
-				let curHour=curDate.getHours();
-				let curSection="上午";
-				if(curHour>=12){
-					curSection="下午";
-				}
-				return{
-					curDate,
-					curYear,
-					curMonth,
-					curMonthdays,
-					curDay,
-					curHour,
-					curSection
-				}
-			},
-			getDefaultDate(){
-				let value=this.value;
-				let reg=/-/g;
-				let defaultDate=value?new Date(value.split(" ")[0].replace(reg,"/")):new Date();
-				let defaultYear=defaultDate.getFullYear();
-				let defaultMonth=defaultDate.getMonth()+1;
-				let defaultDay=defaultDate.getDate();
-				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
-				return{
-					defaultDate,
-					defaultYear,
-					defaultMonth,
-					defaultDay,
-					defaultDays
-				}
-			},
-			getStartDate(){
-				let start=this.startYear;
-				let startDate="";
-				let reg=/-/g;
-				if(start){
-					startDate=new Date(start+"/01/01");
-				}else{
-					startDate=new Date("1970/01/01");
-				}
-				return startDate;
-			},
-			getEndDate(){
-				let end=this.endYear;
-				let reg=/-/g;
-				let endDate="";
-				if(end){
-					endDate=new Date(end+"/12/31");
-				}else{
-					endDate=new Date();
-				}
-				return endDate;
-			},
-			getDval(){
-				let value=this.value;
-				let dVal=null;
-				let aDate=new Date();
-				let year=this.formatNum(aDate.getFullYear());
-				let month=this.formatNum(aDate.getMonth()+1);
-				let day=this.formatNum(aDate.getDate());
-				let hour=aDate.getHours();
-				let section="上午";
-				if(hour>=12)section="下午";
-				if(value){
-					let flag=this.checkValue(value);
-					if(!flag){
-						dVal=[year,month,day,section]
-					}else{
-						let v=value.split(" ");
-						dVal=[...v[0].split("-"),v[1]];
-					}
-				}else{
-					dVal=[year,month,day,section]
-				}
-				return dVal;
-			},
-			initData(){
-				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
-				let years=[],months=[],days=[],sections=[];
-				let dVal=[],pickVal=[];
-				let value=this.value;
-				let reg=/-/g;
-				let range={};
-				let result="",full="",year,month,day,section,obj={};
-				let defaultDate=this.getDefaultDate();
-				let defaultYear=defaultDate.defaultYear;
-				let defaultMonth=defaultDate.defaultMonth;
-				let defaultDay=defaultDate.defaultDay;
-				let defaultDays=defaultDate.defaultDays;
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let curDate=this.getCurrenDate();
-				let curYear=curDate.curYear;
-				let curMonth=curDate.curMonth;
-				let curMonthdays=curDate.curMonthdays;
-				let curDay=curDate.curDay;
-				let curSection=curDate.curSection;
-				let dateData=[];
-				dVal=this.getDval();
-				startDate=this.getStartDate();
-				endDate=this.getEndDate();
-				startYear=startDate.getFullYear();
-				startMonth=startDate.getMonth();
-				startDay=startDate.getDate();
-				endYear=endDate.getFullYear();
-				endMonth=endDate.getMonth();
-				endDay=endDate.getDate();
-				dateData=this.getData(dVal);
-				years=dateData.years;
-				months=dateData.months;
-				days=dateData.days;
-				sections=dateData.sections;
-				pickVal=disabledAfter?[
-					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
-				]:(curFlag?[
-					years.indexOf(curYear+''),
-					months.indexOf(this.formatNum(curMonth)),
-					days.indexOf(this.formatNum(curDay)),
-					sections.indexOf(curSection),
-				]:[
-					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
-					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
-					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
-					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
-				]);
-				range={years,months,days,sections};
-				year=dVal[0]?dVal[0]:years[0];
-				month=dVal[1]?dVal[1]:months[0];
-				day=dVal[2]?dVal[2]:days[0];
-				section=dVal[3]?dVal[3]:sections[0];
-				result=full=`${year+'-'+month+'-'+day+' '+section}`;
-				obj={
-					year,
-					month,
-					day,
-					section
-				}
-				this.range=range;
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let data=this.range;
-				let year="",month="",day="",section="";
-				let result="",full="",obj={};
-				let months=null,days=null,sections=null;
-				let disabledAfter=this.disabledAfter;
-				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
-				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
-				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
-				section=(arr[3]||arr[3]==0)?data.sections[arr[3]]||data.sections[data.sections.length-1]:"";
-				result=full=`${year+'-'+month+'-'+day+' '+section}`;
-				let resetData=this.resetData(year,month,day);
-				if(this.disabledAfter){
-					months=resetData.months;
-					days=resetData.days;
-					sections=resetData.sections;
-				}else{
-					if(year%4==0||(month!=this.checkObj.month)){
-						days=resetData.days;
-					}
-				}
-				if(months)this.range.months=months;
-				if(days)this.range.days=days;
-				if(sections)this.range.sections=sections;
-				obj={
-					year,
-					month,
-					day,
-					section
-				}
-				this.checkObj=obj;
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";
-</style>

components/w-picker/linkage-picker.vue

@@ -1,274 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column v-for="(group,gIndex) in range" :key="gIndex">
-				<view class="w-picker-item" v-for="(item,index) in group" :key="index">{{item[nodeKey]}}</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:[],
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			value:{
-				type:[Array,String],
-				default:""
-			},
-			defaultType:{
-				type:String,
-				default:"label"
-			},
-			options:{
-				type:Array,
-				default(){
-					return []
-				}
-			},
-			defaultProps:{
-				type:Object,
-				default(){
-					return{
-						lable:"label",
-						value:"value",
-						children:"children"
-					}
-				}
-			},
-			level:{
-				//多级联动层级，表示几级联动
-				type:[Number,String],
-				default:2
-			}
-		},
-		computed:{
-			nodeKey(){
-				return this.defaultProps.label;
-			},
-			nodeVal(){
-				return this.defaultProps.value;
-			},
-			nodeChild(){
-				return this.defaultProps.children;
-			}
-		},
-		watch:{
-			value(val){
-				if(this.options.length!=0){
-					this.initData();
-				}
-			},
-			options(val){
-				this.initData();
-			}
-		},
-		created() {
-			if(this.options.length!=0){
-				this.initData();
-			}
-		},
-		methods:{
-			getData(){
-				//用来处理初始化数据
-				let options=this.options;
-				let col1={},col2={},col3={},col4={};
-				let arr1=options,arr2=[],arr3=[],arr4=[];
-				let col1Index=0,col2Index=0,col3Index=0,col4Index=0;
-				let a1="",a2="",a3="",a4="";
-				let dVal=[],obj={};
-				let value=this.value;
-				let data=[];
-				a1=value[0];
-				a2=value[1];
-				if(this.level>2){
-					a3=value[2];
-				}
-				if(this.level>3){
-					a4=value[3];
-				};
-				/*第1列*/
-				col1Index=arr1.findIndex((v)=>{
-					return v[this.defaultType]==a1
-				});
-				col1Index=value?(col1Index!=-1?col1Index:0):0;
-				col1=arr1[col1Index];
-				
-				/*第2列*/
-				arr2=arr1[col1Index][this.nodeChild];
-				col2Index=arr2.findIndex((v)=>{
-					return v[this.defaultType]==a2
-				});
-				col2Index=value?(col2Index!=-1?col2Index:0):0;
-				col2=arr2[col2Index];
-				
-				/*第3列*/
-				if(this.level>2){
-					arr3=arr2[col2Index][this.nodeChild];
-					col3Index=arr3.findIndex((v)=>{
-						return v[this.defaultType]==a3;
-					});
-					col3Index=value?(col3Index!=-1?col3Index:0):0;
-					col3=arr3[col3Index];
-				};
-				
-				
-				/*第4列*/
-				if(this.level>3){
-					arr4=arr3[col4Index][this.nodeChild];
-					col4Index=arr4.findIndex((v)=>{
-						return v[this.defaultType]==a4;
-					});
-					col4Index=value?(col4Index!=-1?col4Index:0):0;
-					col4=arr4[col4Index];
-				};
-				switch(this.level*1){
-					case 2:
-						dVal=[col1Index,col2Index];
-						obj={
-							col1,
-							col2
-						}
-						data=[arr1,arr2];
-						break;
-					case 3:
-						dVal=[col1Index,col2Index,col3Index];
-						obj={
-							col1,
-							col2,
-							col3
-						}
-						data=[arr1,arr2,arr3];
-						break;
-					case 4:
-						dVal=[col1Index,col2Index,col3Index,col4Index];
-						obj={
-							col1,
-							col2,
-							col3,
-							col4
-						}
-						data=[arr1,arr2,arr3,arr4];
-						break
-				}
-				return {
-					data,
-					dVal,
-					obj
-				}
-			},
-			initData(){
-				let dataData=this.getData();
-				let data=dataData.data;
-				let arr1=data[0];
-				let arr2=data[1];
-				let arr3=data[2]||[];
-				let arr4=data[3]||[];
-				let obj=dataData.obj;
-				let col1=obj.col1,col2=obj.col2,col3=obj.col3||{},col4=obj.col4||{};
-				let result="",value=[];
-				let range=[];
-				switch(this.level){
-					case 2:
-						value=[col1[this.nodeVal],col2[this.nodeVal]];
-						result=`${col1[this.nodeKey]+col2[this.nodeKey]}`;
-						range=[arr1,arr2];
-						break;
-					case 3:
-						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal]];
-						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]}`;
-						range=[arr1,arr2,arr3];
-						break;
-					case 4:
-						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal],col4[this.nodeVal]];
-						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]+col4[this.nodeKey]}`;
-						range=[arr1,arr2,arr3,arr4];
-						break;
-				}
-				this.range=range;
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=dataData.dVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:value,
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let col1Index=arr[0],col2Index=arr[1],col3Index=arr[2]||0,col4Index=arr[3]||0;
-				let arr1=[],arr2=[],arr3=[],arr4=[];
-				let col1,col2,col3,col4,obj={};
-				let result="",value=[];
-				arr1=this.options;
-				arr2=(arr1[col1Index]&&arr1[col1Index][this.nodeChild])||arr1[arr1.length-1][this.nodeChild]||[];
-				col1=arr1[col1Index]||arr1[arr1.length-1]||{};
-				col2=arr2[col2Index]||arr2[arr2.length-1]||{};
-				if(this.level>2){
-					arr3=(arr2[col2Index]&&arr2[col2Index][this.nodeChild])||arr2[arr2.length-1][this.nodeChild];
-					col3=arr3[col3Index]||arr3[arr3.length-1]||{};
-				}
-				if(this.level>3){
-					arr4=(arr3[col3Index]&&arr3[col3Index][this.nodeChild])||arr3[arr3.length-1][this.nodeChild]||[];
-					col4=arr4[col4Index]||arr4[arr4.length-1]||{};
-				}
-				switch(this.level){
-					case 2:
-						obj={
-							col1,
-							col2
-						}
-						this.range=[arr1,arr2];
-						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')}`;
-						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||''];
-						break;
-					case 3:
-						obj={
-							col1,
-							col2,
-							col3
-						}
-						this.range=[arr1,arr2,arr3];
-						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')}`;
-						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||''];
-						break;
-					case 4:
-						obj={
-							col1,
-							col2,
-							col3,
-							col4
-						}
-						this.range=[arr1,arr2,arr3,arr4];
-						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')+(col4[this.nodeKey]||'')}`;
-						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||'',col4[this.nodeVal]||''];
-						break;
-				}
-				this.checkObj=obj;
-				this.pickVal=arr;
-				this.$emit("change",{
-					result:result,
-					value:value,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";	
-</style>
-

components/w-picker/range-picker.vue

@@ -1,344 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view  class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.fyears" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.fmonths" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.fdays" :key="index">{{item}}日</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex1">
-				<view class="w-picker-item">-</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.tyears" :key="index">{{item}}年</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.tmonths" :key="index">{{item}}月</view>
-			</picker-view-column>
-			<picker-view-column class="w-picker-flex2">
-				<view class="w-picker-item" v-for="(item,index) in range.tdays" :key="index">{{item}}日</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			value:{
-				type:[String,Array],
-				default(){
-					return []
-				}
-			},
-			current:{//是否默认选中当前日期
-				type:Boolean,
-				default:false
-			},
-			startYear:{
-				type:[String,Number],
-				default:1970
-			},
-			endYear:{
-				type:[String,Number],
-				default:new Date().getFullYear()
-			}
-		},
-		watch:{
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			formatNum(n){
-				return (Number(n)<10?'0'+Number(n):Number(n)+'');
-			},
-			checkValue(value){
-				let strReg=/^\d{4}-\d{2}-\d{2}$/,example="2020-04-03";
-				if(!strReg.test(value[0])||!strReg.test(value[1])){
-					console.log(new Error("请传入与mode匹配的value值，例["+example+","+example+"]"))
-				}
-				return strReg.test(value[0])&&strReg.test(value[1]);
-			},
-			resetToData(fmonth,fday,tyear,tmonth){
-				let range=this.range;
-				let tmonths=[],tdays=[];
-				let yearFlag=tyear!=range.tyears[0];
-				let monthFlag=tyear!=range.tyears[0]||tmonth!=range.tmonths[0];
-				let ttotal=new Date(tyear,tmonth,0).getDate();
-				for(let i=yearFlag?1:fmonth*1;i<=12;i++){
-					tmonths.push(this.formatNum(i))
-				}
-				for(let i=monthFlag?1:fday*1;i<=ttotal;i++){
-					tdays.push(this.formatNum(i))
-				}
-				return{
-					tmonths,
-					tdays
-				}
-			},
-			resetData(fyear,fmonth,fday,tyear,tmonth){
-				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
-				let startYear=this.startYear;
-				let endYear=this.endYear;
-				let ftotal=new Date(fyear,fmonth,0).getDate();
-				let ttotal=new Date(tyear,tmonth,0).getDate();
-				for(let i=startYear*1;i<=endYear;i++){
-					fyears.push(this.formatNum(i))
-				}
-				for(let i=1;i<=12;i++){
-					fmonths.push(this.formatNum(i))
-				}
-				for(let i=1;i<=ftotal;i++){
-					fdays.push(this.formatNum(i))
-				}
-				for(let i=fyear*1;i<=endYear;i++){
-					tyears.push(this.formatNum(i))
-				}
-				for(let i=fmonth*1;i<=12;i++){
-					tmonths.push(this.formatNum(i))
-				}
-				for(let i=fday*1;i<=ttotal;i++){
-					tdays.push(this.formatNum(i))
-				}
-				return {
-					fyears,
-					fmonths,
-					fdays,
-					tyears,
-					tmonths,
-					tdays
-				}
-			},
-			getData(dVal){
-				let start=this.startYear*1;
-				let end=this.endYear*1;
-				let value=dVal;
-				let flag=this.current;
-				let aToday=new Date();
-				let tYear,tMonth,tDay,tHours,tMinutes,tSeconds,pickVal=[];
-				let initstartDate=new Date(start.toString());
-				let endDate=new Date(end.toString());
-				if(start>end){
-					initstartDate=new Date(end.toString());
-					endDate=new Date(start.toString());
-				};
-				let startYear=initstartDate.getFullYear();
-				let startMonth=initstartDate.getMonth()+1;
-				let endYear=endDate.getFullYear();
-				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[],returnArr=[],startDVal=[],endDVal=[];
-				let curMonth=flag?value[1]*1:(startDVal[1]*1+1);
-				let curMonth1=flag?value[5][1]*1:(value[5]*1+1);
-				let totalDays=new Date(value[0],value[1],0).getDate();
-				let totalDays1=new Date(value[4],value[5],0).getDate();
-				for(let s=startYear;s<=endYear;s++){
-					fyears.push(this.formatNum(s));
-				};
-				for(let m=1;m<=12;m++){
-					fmonths.push(this.formatNum(m));
-				};
-				for(let d=1;d<=totalDays;d++){
-					fdays.push(this.formatNum(d));
-				};
-				for(let s=value[0]*1;s<=endYear;s++){
-					tyears.push(this.formatNum(s));
-				};
-				
-				if(value[4]*1>value[0]*1){
-					for(let m=1;m<=12;m++){
-						tmonths.push(this.formatNum(m));
-					};
-					for(let d=1;d<=totalDays1;d++){
-						tdays.push(this.formatNum(d));
-					};
-				}else{
-					for(let m=value[1]*1;m<=12;m++){
-						tmonths.push(this.formatNum(m));
-					};
-					for(let d=value[2]*1;d<=totalDays1;d++){
-						tdays.push(this.formatNum(d));
-					};
-				};
-				
-				pickVal=[
-					fyears.indexOf(value[0])==-1?0:fyears.indexOf(value[0]),
-					fmonths.indexOf(value[1])==-1?0:fmonths.indexOf(value[1]),
-					fdays.indexOf(value[2])==-1?0:fdays.indexOf(value[2]),
-					0,
-					tyears.indexOf(value[4])==-1?0:tyears.indexOf(value[4]),
-					tmonths.indexOf(value[5])==-1?0:tmonths.indexOf(value[5]),
-					tdays.indexOf(value[6])==-1?0:tdays.indexOf(value[6])
-				];
-				return {
-					fyears,
-					fmonths,
-					fdays,
-					tyears,
-					tmonths,
-					tdays,
-					pickVal
-				}
-			},
-			getDval(){
-				let value=this.value;
-				let fields=this.fields;
-				let dVal=null;
-				let aDate=new Date();
-				let fyear=this.formatNum(aDate.getFullYear());
-				let fmonth=this.formatNum(aDate.getMonth()+1);
-				let fday=this.formatNum(aDate.getDate());
-				let tyear=this.formatNum(aDate.getFullYear());
-				let tmonth=this.formatNum(aDate.getMonth()+1);
-				let tday=this.formatNum(aDate.getDate());
-				if(value&&value.length>0){
-					let flag=this.checkValue(value);
-					if(!flag){
-						dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
-					}else{
-						dVal=[...value[0].split("-"),"-",...value[1].split("-")];
-					}
-				}else{
-					dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
-				}
-				return dVal;
-			},
-			initData(){
-				let range=[],pickVal=[];
-				let result="",full="",obj={};
-				let dVal=this.getDval();
-				let dateData=this.getData(dVal);
-				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
-				let fyear,fmonth,fday,tyear,tmonth,tday;
-				pickVal=dateData.pickVal;
-				fyears=dateData.fyears;
-				fmonths=dateData.fmonths;
-				fdays=dateData.fdays;
-				tyears=dateData.tyears;
-				tmonths=dateData.tmonths;
-				tdays=dateData.tdays;
-				range={
-					fyears,
-					fmonths,
-					fdays,
-					tyears,
-					tmonths,
-					tdays,
-				}
-				fyear=range.fyears[pickVal[0]];
-				fmonth=range.fmonths[pickVal[1]];
-				fday=range.fdays[pickVal[2]];
-				tyear=range.tyears[pickVal[4]];
-				tmonth=range.tmonths[pickVal[5]];
-				tday=range.tdays[pickVal[6]];
-				obj={
-					fyear,
-					fmonth,
-					fday,
-					tyear,
-					tmonth,
-					tday
-				}
-				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
-				this.range=range;
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:result.split("至"),
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let result="",full="",obj={};
-				let year="",month="",day="",hour="",minute="",second="",note=[],province,city,area;
-				let checkObj=this.checkObj;
-				let days=[],months=[],endYears=[],endMonths=[],endDays=[],startDays=[];
-				let mode=this.mode;
-				let col1,col2,col3,d,a,h,m;
-				let xDate=new Date().getTime();
-				let range=this.range;
-				let fyear=range.fyears[arr[0]]||range.fyears[range.fyears.length-1];
-				let fmonth=range.fmonths[arr[1]]||range.fmonths[range.fmonths.length-1];
-				let fday=range.fdays[arr[2]]||range.fdays[range.fdays.length-1];
-				let tyear=range.tyears[arr[4]]||range.tyears[range.tyears.length-1];
-				let tmonth=range.tmonths[arr[5]]||range.tmonths[range.tmonths.length-1];
-				let tday=range.tdays[arr[6]]||range.tdays[range.tdays.length-1];
-				let resetData=this.resetData(fyear,fmonth,fday,tyear,tmonth);
-				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth||fday!=checkObj.fday){
-					arr[4]=0;
-					arr[5]=0;
-					arr[6]=0;
-					range.tyears=resetData.tyears;
-					range.tmonths=resetData.tmonths;
-					range.tdays=resetData.tdays;
-					tyear=range.tyears[0];
-					checkObj.tyears=range.tyears[0];
-					tmonth=range.tmonths[0];
-					checkObj.tmonths=range.tmonths[0];
-					tday=range.tdays[0];
-					checkObj.tdays=range.tdays[0];
-				}
-				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth){
-					range.fdays=resetData.fdays;
-				};
-				if(tyear!=checkObj.tyear){
-					arr[5]=0;
-					arr[6]=0;
-					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
-					range.tmonths=toData.tmonths;
-					range.tdays=toData.tdays;
-					tmonth=range.tmonths[0];
-					checkObj.tmonths=range.tmonths[0];
-					tday=range.tdays[0];
-					checkObj.tdays=range.tdays[0];
-				};
-				if(tmonth!=checkObj.tmonth){
-					arr[6]=0;
-					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
-					range.tdays=toData.tdays;
-					tday=range.tdays[0];
-					checkObj.tdays=range.tdays[0];
-				};
-				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
-				obj={
-					fyear,fmonth,fday,tyear,tmonth,tday
-				}
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=arr;
-				})
-				this.$emit("change",{
-					result:result,
-					value:result.split("至"),
-					obj:obj
-				})
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";
-</style>

components/w-picker/region-picker.vue

@@ -1,183 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.provinces" :key="index">{{item.label}}</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.citys" :key="index">{{item.label}}</view>
-			</picker-view-column>
-			<picker-view-column v-if="!hideArea">
-				<view class="w-picker-item" v-for="(item,index) in range.areas" :key="index">{{item.label}}</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	import areaData from "./areadata/areadata.js"
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{
-					provinces:[],
-					citys:[],
-					areas:[]
-				},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			value:{
-				type:[Array,String],
-				default:""
-			},
-			defaultType:{
-				type:String,
-				default:"label"
-			},
-			hideArea:{
-				type:Boolean,
-				default:false
-			}
-		},
-		watch:{
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			getData(){
-				//用来处理初始化数据
-				let provinces=areaData;
-				let dVal=[];
-				let value=this.value;
-				let a1=value[0];//默认值省
-				let a2=value[1];//默认值市
-				let a3=value[2];//默认值区、县
-				let province,city,area;
-				let provinceIndex=provinces.findIndex((v)=>{
-					return v[this.defaultType]==a1
-				});
-				provinceIndex=value?(provinceIndex!=-1?provinceIndex:0):0;
-				let citys=provinces[provinceIndex].children;
-				let cityIndex=citys.findIndex((v)=>{
-					return v[this.defaultType]==a2
-				});
-				cityIndex=value?(cityIndex!=-1?cityIndex:0):0;
-				let areas=citys[cityIndex].children;
-				let areaIndex=areas.findIndex((v)=>{
-					return v[this.defaultType]==a3;
-				});
-				areaIndex=value?(areaIndex!=-1?areaIndex:0):0;
-				dVal=this.hideArea?[provinceIndex,cityIndex]:[provinceIndex,cityIndex,areaIndex];
-				province=provinces[provinceIndex];
-				city=citys[cityIndex];
-				area=areas[areaIndex];
-				let obj=this.hideArea?{
-					province,
-					city
-				}:{
-					province,
-					city,
-					area
-				}
-				return this.hideArea?{
-					provinces,
-					citys,
-					dVal,
-					obj
-				}:{
-					provinces,
-					citys,
-					areas,
-					dVal,
-					obj
-				}
-			},
-			initData(){
-				let dataData=this.getData();
-				let provinces=dataData.provinces;
-				let citys=dataData.citys;
-				let areas=this.hideArea?[]:dataData.areas;
-				let obj=dataData.obj;
-				let province=obj.province,city=obj.city,area=this.hideArea?{}:obj.area;
-				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
-				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
-				this.range=this.hideArea?{
-					provinces,
-					citys,
-				}:{
-					provinces,
-					citys,
-					areas
-				};
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=dataData.dVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:value,
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let provinceIndex=arr[0],cityIndex=arr[1],areaIndex=this.hideArea?0:arr[2];
-				let provinces=areaData;
-				let citys=(provinces[provinceIndex]&&provinces[provinceIndex].children)||provinces[provinces.length-1].children||[];
-				let areas=this.hideArea?[]:((citys[cityIndex]&&citys[cityIndex].children)||citys[citys.length-1].children||[]);
-				let province=provinces[provinceIndex]||provinces[provinces.length-1],
-				city=citys[cityIndex]||[citys.length-1],
-				area=this.hideArea?{}:(areas[areaIndex]||[areas.length-1]);
-				let obj=this.hideArea?{
-					province,
-					city
-				}:{
-					province,
-					city,
-					area
-				}
-				if(this.checkObj.province.label!=province.label){
-					//当省更新的时候需要刷新市、区县的数据;
-					this.range.citys=citys;
-					if(!this.hideArea){
-						this.range.areas=areas;
-					}
-					
-				}
-				if(this.checkObj.city.label!=city.label){
-					//当市更新的时候需要刷新区县的数据;
-					if(!this.hideArea){
-						this.range.areas=areas;
-					}
-				}
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=arr;
-				})
-				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
-				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
-				this.$emit("change",{
-					result:result,
-					value:value,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";	
-</style>
-

components/w-picker/selector-picker.vue

@@ -1,129 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range" :key="index">{{item[nodeKey]}}</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			options:{
-				type:[Array,Object],
-				default(){
-					return []
-				}
-			},
-			value:{
-				type:String,
-				default:""
-			},
-			defaultType:{
-				type:String,
-				default:"label"
-			},
-			defaultProps:{
-				type:Object,
-				default(){
-					return{
-						label:"label",
-						value:"value"
-					}
-				}
-			}
-		},
-		data() {
-			return {
-				pickVal:[]
-			};
-		},
-		computed:{
-			nodeKey(){
-				return this.defaultProps.label;
-			},
-			nodeValue(){
-				return this.defaultProps.value;
-			},
-			range(){
-				return this.options
-			}
-		},
-		watch:{
-			value(val){
-				if(this.options.length!=0){
-					this.initData();
-				}
-			},
-			options(val){
-				this.initData();
-			}
-		},
-		created() {
-			if(this.options.length!=0){
-				this.initData();
-			}
-		},
-		methods:{
-			initData(){
-				let dVal=this.value||"";
-				let data=this.range;
-				let pickVal=[0];
-				let cur=null;
-				let label="";
-				let value,idx;
-				if(this.defaultType==this.nodeValue){
-					value=data.find((v)=>v[this.nodeValue]==dVal);
-					idx=data.findIndex((v)=>v[this.nodeValue]==dVal);
-				}else{
-					value=data.find((v)=>v[this.nodeKey]==dVal);
-					idx=data.findIndex((v)=>v[this.nodeKey]==dVal);
-				}
-				pickVal=[idx!=-1?idx:0];
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				if(this.defaultType==this.nodeValue){
-					this.$emit("change",{
-						result:value?value[this.nodeKey]:data[0][this.nodeKey],
-						value:dVal||data[0][this.nodeKey],
-						obj:value?value:data[0]
-					})
-				}else{
-					this.$emit("change",{
-						result:dVal||data[0][this.nodeKey],
-						value:value?value[this.nodeValue]:data[0][this.nodeValue],
-						obj:value?value:data[0]
-					})
-				}
-				
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let pickVal=[arr[0]||0];
-				let data=this.range;
-				let cur=data[arr[0]];
-				let label="";
-				let value="";
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				this.$emit("change",{
-					result:cur[this.nodeKey],
-					value:cur[this.nodeValue],
-					obj:cur
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";
-</style>

components/w-picker/shortterm-picker.vue

@@ -1,250 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.dates" :key="index">{{item.label}}</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item.label}}时</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item.label}}分</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			value:{
-				type:[String,Array,Number],
-				default:""
-			},
-			current:{//是否默认选中当前日期
-				type:Boolean,
-				default:false
-			},
-			expand:{
-				type:[Number,String],
-				default:30
-			}
-		},
-		watch:{
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			formatNum(n){
-				return (Number(n)<10?'0'+Number(n):Number(n)+'');
-			},
-			checkValue(value){
-				let strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/,example="2019-12-12 18:05:00或者2019-12-12 18:05";
-				if(!strReg.test(value)){
-					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
-				}
-				return strReg.test(value);
-			},
-			resetData(year,month,day){
-				let curDate=this.getCurrenDate();
-				let curFlag=this.current;
-				let curYear=curDate.curYear;
-				let curMonth=curDate.curMonth;
-				let curDay=curDate.curDay;
-				let curHour=curDate.curHour;
-				let months=[],days=[],sections=[];
-				let disabledAfter=this.disabledAfter;
-				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
-				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
-				for(let month=1;month<=monthsLen;month++){
-					months.push(this.formatNum(month));
-				};
-				for(let day=1;day<=daysLen;day++){
-					days.push(this.formatNum(day));
-				}
-				return{
-					months,
-					days,
-					sections
-				}
-			},
-			getData(dVal){
-				//用来处理初始化数据
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let dates=[],hours=[],minutes=[];
-				let curDate=new Date();
-				let curYear=curDate.getFullYear();
-				let curMonth=curDate.getMonth();
-				let curDay=curDate.getDate();
-				let aDate=new Date(curYear,curMonth,curDay);
-				for(let i=0;i<this.expand*1;i++){
-					aDate=new Date(curYear,curMonth,curDay+i);
-					let year=aDate.getFullYear();
-					let month=aDate.getMonth()+1;
-					let day=aDate.getDate();
-					let label=year+"-"+this.formatNum(month)+"-"+this.formatNum(day);
-					switch(i){
-						case 0:
-							label="今天";
-							break;
-						case 1:
-							label="明天";
-							break;
-						case 2:
-							label="后天";
-							break
-					}
-					dates.push({
-						label:label,
-						value:year+"-"+this.formatNum(month)+"-"+this.formatNum(day)
-					})
-				};
-				for(let i=0;i<24;i++){
-					hours.push({
-						label:this.formatNum(i),
-						value:this.formatNum(i)
-					})
-				}
-				for(let i=0;i<60;i++){
-					minutes.push({
-						label:this.formatNum(i),
-						value:this.formatNum(i)
-					})
-				}
-				return {
-					dates,
-					hours,
-					minutes
-				}
-			},
-			getDefaultDate(){
-				let value=this.value;
-				let reg=/-/g;
-				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
-				let defaultYear=defaultDate.getFullYear();
-				let defaultMonth=defaultDate.getMonth()+1;
-				let defaultDay=defaultDate.getDate();
-				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
-				return{
-					defaultDate,
-					defaultYear,
-					defaultMonth,
-					defaultDay,
-					defaultDays
-				}
-			},
-			getDval(){
-				let value=this.value;
-				let dVal=null;
-				let aDate=new Date();
-				let year=this.formatNum(aDate.getFullYear());
-				let month=this.formatNum(aDate.getMonth()+1);
-				let day=this.formatNum(aDate.getDate());
-				let date=this.formatNum(year)+"-"+this.formatNum(month)+"-"+this.formatNum(day);
-				let hour=aDate.getHours();
-				let minute=aDate.getMinutes();
-				if(value){
-					let flag=this.checkValue(value);
-					if(!flag){
-						dVal=[date,hour,minute]
-					}else{
-						let v=value.split(" ");
-						dVal=[v[0],...v[1].split(":")];
-					}
-				}else{
-					dVal=[date,hour,minute]
-				}
-				return dVal;
-			},
-			initData(){
-				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
-				let dates=[],hours=[],minutes=[];
-				let dVal=[],pickVal=[];
-				let value=this.value;
-				let reg=/-/g;
-				let range={};
-				let result="",full="",date,hour,minute,obj={};
-				let defaultDate=this.getDefaultDate();
-				let defaultYear=defaultDate.defaultYear;
-				let defaultMonth=defaultDate.defaultMonth;
-				let defaultDay=defaultDate.defaultDay;
-				let defaultDays=defaultDate.defaultDays;
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let dateData=[];
-				dVal=this.getDval();
-				dateData=this.getData(dVal);
-				dates=dateData.dates;
-				hours=dateData.hours;
-				minutes=dateData.minutes;
-				pickVal=[
-					dates.findIndex(n => n.value == dVal[0])!=-1?dates.findIndex(n => n.value == dVal[0]):0,
-					hours.findIndex(n => n.value == dVal[1])!=-1?hours.findIndex(n => n.value == dVal[1]):0,
-					minutes.findIndex(n => n.value == dVal[2])!=-1?minutes.findIndex(n => n.value == dVal[2]):0,
-				];
-				range={dates,hours,minutes};
-				date=dVal[0]?dVal[0]:dates[0].label;
-				hour=dVal[1]?dVal[1]:hours[0].label;
-				minute=dVal[2]?dVal[2]:minutes[0].label;
-				result=full=`${date+' '+hour+':'+minute}`;
-				obj={
-					date,
-					hour,
-					minute
-				}
-				this.range=range;
-				this.checkObj=obj;
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let data=this.range;
-				let date="",hour="",minute="";
-				let result="",full="",obj={};
-				let disabledAfter=this.disabledAfter;
-				date=(arr[0]||arr[0]==0)?data.dates[arr[0]]||data.dates[data.dates.length-1]:"";
-				hour=(arr[1]||arr[1]==0)?data.hours[arr[1]]||data.hours[data.hours.length-1]:"";
-				minute=(arr[2]||arr[2]==0)?data.minutes[arr[2]]||data.minutes[data.minutes.length-1]:"";
-				result=full=`${date.label+' '+hour.label+':'+minute.label+':00'}`;
-				obj={
-					date,
-					hour,
-					minute
-				}
-				this.checkObj=obj;
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";
-</style>

components/w-picker/time-picker.vue

@@ -1,218 +0,0 @@
-<template>
-	<view class="w-picker-view">
-		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
-			</picker-view-column>
-			<picker-view-column>
-				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
-			</picker-view-column>
-			<picker-view-column v-if="second">
-				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
-			</picker-view-column>
-		</picker-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				pickVal:[],
-				range:{},
-				checkObj:{}
-			};
-		},
-		props:{
-			itemHeight:{
-				type:String,
-				default:"44px"
-			},
-			value:{
-				type:[String,Array,Number],
-				default:""
-			},
-			current:{//是否默认选中当前日期
-				type:Boolean,
-				default:false
-			},
-			second:{
-				type:Boolean,
-				default:true
-			}
-		},
-		watch:{
-			value(val){
-				this.initData();
-			}
-		},
-		created() {
-			this.initData();
-		},
-		methods:{
-			formatNum(n){
-				return (Number(n)<10?'0'+Number(n):Number(n)+'');
-			},
-			checkValue(value){
-				let strReg=/^\d{2}:\d{2}:\d{2}$/,example="18:00:05";
-				if(!strReg.test(value)){
-					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
-				}
-				return strReg.test(value);
-			},
-			resetData(year,month,day,hour,minute){
-				let curDate=this.getCurrenDate();
-				let curFlag=this.current;
-				let curHour=curDate.curHour;
-				let curMinute=curDate.curMinute;
-				let curSecond=curDate.curSecond;
-				for(let hour=0;hour<24;hour++){
-					hours.push(this.formatNum(hour));
-				}
-				for(let minute=0;minute<60;minute++){
-					minutes.push(this.formatNum(minute));
-				}
-				for(let second=0;second<60;second++){
-					seconds.push(this.formatNum(second));
-				}
-				return{
-					hours,
-					minutes,
-					seconds
-				}
-			},
-			getData(curDate){
-				//用来处理初始化数据
-				let hours=[],minutes=[],seconds=[];
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let fields=this.fields;
-				let curHour=curDate.curHour;
-				let curMinute=curDate.curMinute;
-				let curSecond=curDate.curSecond;
-				for(let hour=0;hour<24;hour++){
-					hours.push(this.formatNum(hour));
-				}
-				for(let minute=0;minute<60;minute++){
-					minutes.push(this.formatNum(minute));
-				}
-				for(let second=0;second<60;second++){
-					seconds.push(this.formatNum(second));
-				}
-				return this.second?{
-					hours,
-					minutes,
-					seconds
-				}:{
-					hours,
-					minutes
-				}
-			},
-			getCurrenDate(){
-				let curDate=new Date();
-				let curHour=curDate.getHours();
-				let curMinute=curDate.getMinutes();
-				let curSecond=curDate.getSeconds();
-				return this.second?{
-					curHour,
-					curMinute,
-					curSecond
-				}:{
-					curHour,
-					curMinute,
-				}
-			},
-			getDval(){
-				let value=this.value;
-				let fields=this.fields;
-				let dVal=null;
-				let aDate=new Date();
-				let hour=this.formatNum(aDate.getHours());
-				let minute=this.formatNum(aDate.getMinutes());
-				let second=this.formatNum(aDate.getSeconds());
-				if(value){
-					let flag=this.checkValue(value);
-					if(!flag){
-						dVal=[hour,minute,second]
-					}else{
-						dVal=value?value.split(":"):[];
-					}
-				}else{
-					dVal=this.second?[hour,minute,second]:[hour,minute]
-				}
-				return dVal;
-			},
-			initData(){
-				let curDate=this.getCurrenDate();
-				let dateData=this.getData(curDate);
-				let pickVal=[],obj={},full="",result="",hour="",minute="",second="";
-				let dVal=this.getDval();
-				let curFlag=this.current;
-				let disabledAfter=this.disabledAfter;
-				let hours=dateData.hours;
-				let minutes=dateData.minutes;
-				let seconds=dateData.seconds;
-				let defaultArr=this.second?[
-					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
-					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0,
-					dVal[2]&&seconds.indexOf(dVal[2])!=-1?seconds.indexOf(dVal[2]):0
-				]:[
-					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
-					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0
-				];
-				pickVal=disabledAfter?defaultArr:(curFlag?(this.second?[
-					hours.indexOf(this.formatNum(curDate.curHour)),
-					minutes.indexOf(this.formatNum(curDate.curMinute)),
-					seconds.indexOf(this.formatNum(curDate.curSecond)),
-				]:[
-					hours.indexOf(this.formatNum(curDate.curHour)),
-					minutes.indexOf(this.formatNum(curDate.curMinute))
-				]):defaultArr);
-				this.range=dateData;
-				this.checkObj=obj;
-				hour=dVal[0]?dVal[0]:hours[0];
-				minute=dVal[1]?dVal[1]:minutes[0];
-				if(this.second)second=dVal[2]?dVal[0]:seconds[0];
-				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
-				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
-				this.$nextTick(()=>{
-					this.pickVal=pickVal;
-				});
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			},
-			handlerChange(e){
-				let arr=[...e.detail.value];
-				let data=this.range;
-				let hour="",minute="",second="",result="",full="",obj={};
-				hour=(arr[0]||arr[0]==0)?data.hours[arr[0]]||data.hours[data.hours.length-1]:"";
-				minute=(arr[1]||arr[1]==0)?data.minutes[arr[1]]||data.minutes[data.minutes.length-1]:"";
-				if(this.second)second=(arr[2]||arr[2]==0)?data.seconds[arr[2]]||data.seconds[data.seconds.length-1]:"";
-				obj=this.second?{
-					hour,
-					minute,
-					second
-				}:{
-					hour,
-					minute
-				};
-				this.checkObj=obj;
-				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
-				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
-				this.$emit("change",{
-					result:result,
-					value:full,
-					obj:obj
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "./w-picker.css";	
-</style>
-

components/w-picker/w-picker.css

@@ -1,26 +0,0 @@
-.w-picker-flex2{
-	flex:2;
-}
-.w-picker-flex1{
-	flex:1;
-}
-.w-picker-view {
-	width: 100%;
-	height: 476upx;
-	overflow: hidden;
-	background-color: rgba(255, 255, 255, 1);
-	z-index: 666;
-}
-.d-picker-view{
-	height: 100%;
-}
-
-.w-picker-item {
-  text-align: center;
-  width: 100%;
-  height: 88upx;
-  line-height: 88upx;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-size: 30upx;
-}

components/w-picker/w-picker.vue

@@ -1,340 +0,0 @@
-<template name="w-picker">
-	<view class="w-picker" :key="createKey" :data-key="createKey">
-		<view class="mask" :class="{'visible':visible}" @tap="onCancel" @touchmove.stop.prevent catchtouchmove="true"></view>
-		<view class="w-picker-cnt" :class="{'visible':visible}">
-			<view class="w-picker-header"  @touchmove.stop.prevent catchtouchmove="true">
-				<text @tap.stop.prevent="onCancel">取消</text>
-				<slot></slot>
-				<text :style="{'color':themeColor}" @tap.stop.prevent="pickerConfirm">确定</text>
-			</view>
-			<date-picker 
-				v-if="mode=='date'" 
-				class="w-picker-wrapper"
-				:startYear="startYear"
-				:endYear="endYear"
-				:value="value"
-				:fields="fields"
-				:item-height="itemHeight"
-				:current="current"
-				:disabled-after="disabledAfter"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</date-picker>
-			
-			<range-picker
-				v-if="mode=='range'" 
-				class="w-picker-wrapper"
-				:startYear="startYear"
-				:endYear="endYear"
-				:value="value"
-				:item-height="itemHeight"
-				:current="current"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</range-picker>
-			
-			<half-picker
-				v-if="mode=='half'" 
-				class="w-picker-wrapper"
-				:startYear="startYear"
-				:endYear="endYear"
-				:value="value"
-				:item-height="itemHeight"
-				:current="current"
-				:disabled-after="disabledAfter"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</half-picker>
-			
-			<shortterm-picker
-				v-if="mode=='shortTerm'" 
-				class="w-picker-wrapper"
-				:startYear="startYear"
-				:endYear="endYear"
-				:value="value"
-				:item-height="itemHeight"
-				:current="current"
-				expand="60"
-				:disabled-after="disabledAfter"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</shortterm-picker>
-			
-			<time-picker
-				v-if="mode=='time'"
-				class="w-picker-wrapper"
-				:value="value"
-				:item-height="itemHeight"
-				:current="current"
-				:disabled-after="disabledAfter"
-				:second="second"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</time-picker>
-			
-			<selector-picker
-				v-if="mode=='selector'"
-				class="w-picker-wrapper"
-				:value="value"
-				:item-height="itemHeight"
-				:options="options"
-				:default-type="defaultType"
-				:default-props="defaultProps"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</selector-picker>
-			
-			<region-picker
-				v-if="mode=='region'"
-				class="w-picker-wrapper"
-				:value="value"
-				:hide-area="hideArea"
-				:default-type="defaultType"
-				:item-height="itemHeight"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</region-picker>
-			
-			<linkage-picker
-				v-if="mode=='linkage'"
-				class="w-picker-wrapper"
-				:value="value"
-				:options="options"
-				:level="level"
-				:default-type="defaultType"
-				:default-props="defaultProps"
-				:item-height="itemHeight"
-				@change="handlerChange"
-				@touchstart="touchStart" 
-				@touchend="touchEnd">
-			</linkage-picker>
-		</view>
-	</view>
-</template>
-
-<script>
-	import datePicker from "./date-picker.vue"
-	import rangePicker from "./range-picker.vue"
-	import halfPicker from "./half-picker.vue"
-	import shorttermPicker from "./shortterm-picker.vue"
-	import timePicker from "./time-picker.vue"
-	import selectorPicker from "./selector-picker.vue"
-	import regionPicker from "./region-picker.vue"
-	import linkagePicker from "./linkage-picker.vue"
-	export default {
-		name:"w-picker",
-		components:{
-			datePicker,
-			rangePicker,
-			halfPicker,
-			timePicker,
-			selectorPicker,
-			shorttermPicker,
-			regionPicker,
-			linkagePicker
-		},
-		props:{
-			mode:{
-				type:String,
-				default:"date"
-			},
-			value:{//默认值
-				type:[String,Array,Number],
-				default:""
-			},
-			current:{//是否默认显示当前时间，如果是，传的默认值将失效
-				type:Boolean,
-				default:false
-			},
-			themeColor:{//确认按钮主题颜色
-				type:String,
-				default:"#f5a200"
-			},
-			fields:{//日期颗粒度:year、month、day、hour、minute、second
-				type:String,
-				default:"date"
-			},
-			disabledAfter:{//是否禁用当前之后的日期
-				type:Boolean,
-				default:false
-			},
-			second:{//time-picker是否显示秒
-				type:Boolean,
-				default:true
-			},
-			options:{//selector,region数据源
-				type:[Array,Object],
-				default(){
-					return []
-				}
-			},
-			defaultProps:{//selector,linkagle字段转换配置
-				type:Object,
-				default(){
-					return{
-						label:"label",
-						value:"value",
-						children:"children"
-					}
-				}
-			},
-			defaultType:{
-				type:String,
-				default:"label"
-			},
-			hideArea:{//mode=region时，是否隐藏区县列
-				type:Boolean,
-				default:false
-			},
-			level:{
-				//多级联动层级，表示几级联动,区间2-4;
-				type:[Number,String],
-				default:2
-			},
-			timeout:{//是否开启点击延迟,当快速滚动 还没有滚动完毕点击关闭时得到的值是不准确的
-				type:Boolean,
-				default:false
-			},
-			expand:{//mode=shortterm 默认往后拓展天数
-				type:[Number,String],
-				default:30
-			},
-			startYear:{
-				type:[String,Number],
-				default:1970
-			},
-			endYear:{
-				type:[String,Number],
-				default:new Date().getFullYear()
-			},
-			visible:{
-				type:Boolean,
-				default:false
-			}
-		},
-		created() {
-			this.createKey=Math.random()*1000;
-		},
-		data() {
-			return {
-				itemHeight:`height: ${uni.upx2px(88)}px;`,
-				result:{},
-				confirmFlag:true
-			};
-		},
-		methods:{
-			touchStart(){
-				if(this.timeout){
-					this.confirmFlag=false;
-				}
-			},
-			touchEnd(){
-				if(this.timeout){
-					setTimeout(()=>{
-						this.confirmFlag=true;
-					},500)
-				}
-			},
-			handlerChange(res){
-				let _this=this;
-				this.result={...res};
-			},
-			show(){
-				this.$emit("update:visible",true);
-			},
-			hide(){
-				this.$emit("update:visible",false);
-			},
-			onCancel(res){
-				this.$emit("update:visible",false);
-				this.$emit("cancel");
-			},
-			pickerConfirm(){
-				if(!this.confirmFlag){
-					return;
-				};
-				this.$emit("confirm",this.result);
-				this.$emit("update:visible",false);
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.w-picker-item {
-	  text-align: center;
-	  width: 100%;
-	  height: 88upx;
-	  line-height: 88upx;
-	  text-overflow: ellipsis;
-	  white-space: nowrap;
-	  font-size: 30upx;
-	}
-	.w-picker{
-		z-index: 888;
-		.mask {
-		  position: fixed;
-		  z-index: 1000;
-		  top: 0;
-		  right: 0;
-		  left: 0;
-		  bottom: 0;
-		  background: rgba(0, 0, 0, 0.6);
-		  visibility: hidden;
-		  opacity: 0;
-		  transition: all 0.3s ease;
-		}
-		.mask.visible{
-			visibility: visible;
-			opacity: 1;
-		}
-		.w-picker-cnt {
-		  position: fixed;
-		  bottom: 0;
-		  left: 0;
-		  width: 100%;
-		  transition: all 0.3s ease;
-		  transform: translateY(100%);
-		  z-index: 3000;
-		  background-color: #fff;
-		}
-		.w-picker-cnt.visible {
-		  transform: translateY(0);
-		}
-		.w-picker-header{
-		  display: flex;
-		  align-items: center;
-		  padding: 0 30upx;
-		  height: 88upx;
-		  background-color: #fff;
-		  position: relative;
-		  text-align: center;
-		  font-size: 32upx;
-		  justify-content: space-between;
-		  border-bottom: solid 1px #eee;
-		  .w-picker-btn{
-		  	font-size: 30upx;
-		  }
-		}
-		
-		.w-picker-hd:after {
-		  content: ' ';
-		  position: absolute;
-		  left: 0;
-		  bottom: 0;
-		  right: 0;
-		  height: 1px;
-		  border-bottom: 1px solid #e5e5e5;
-		  color: #e5e5e5;
-		  transform-origin: 0 100%;
-		  transform: scaleY(0.5);
-		}
-	}
-</style>

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

@@ -52,7 +52,9 @@
 
 
 		<view class="bottomView">
+
 			<view class="saveCar" @click="saveCar()">保存</view>
+
 		</view>
 		
 
@@ -64,6 +66,7 @@
 	export default {
 		components: {
 			plateInput
+
 		},
 
 		data() {

pages/user/addCar/cailist.vue

@@ -24,7 +24,9 @@
 			</view>
 		</view>
 		<view v-if="carList==''&&loding" 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>
 

pages/user/myOrder/mallOrderDetail.vue

@@ -520,6 +520,8 @@
 	.goodsName {
 		padding: 20rpx 20rpx 15rpx;
 		border-top: 1rpx solid #EEEEEE;
+		color: #333333;
+		font-size: 26rpx;
 	}
 
 	.informationNum {
@@ -625,5 +627,4 @@
 		justify-content: space-between;
 		align-content: center;
 	}
-
 </style>

pages/user/myOrder/myOrder.vue

@@ -8,7 +8,7 @@
 			
 		</view>
 		<view class="main">
-			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item)">
+			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
 				<view class="itemTop">
 					<view style="itemType" v-if="item.SheetType==1">商城-商品订单</view>
 					<view style="itemType" v-if="item.SheetType==2">商城-项目订单</view>
@@ -29,7 +29,6 @@
 				</view>
 
 				<view class="itemName">{{item.CreateTime}}</view>
-				
 
 			</view>
 
@@ -48,7 +47,7 @@
 			return {
 				page: 1,
 				tabIndex: '',
-				items: [1,2,3],
+				items: [],
 				isload: false,
 				 
 			}
@@ -76,10 +75,9 @@
 				this.page = 1;
 				this.getData()
 			},
-			goDetail(item) {
+			goDetail(id) {
 				uni.navigateTo({
 					url:"../../orderDetail/mallOrderDetail?id=" + item.id
-
 				})
 			},
 			getData() {

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)
 			}