Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/components/njzz-calendar/njzz-calendar.vue

@@ -53,6 +53,14 @@
 			mode:{
 				type:String,
 				default:"1"    //1:固定月份列表  2:传统日历模式(自由选择日期)
+			},
+			curryear:{
+				type:String,
+				default:"2020"    //初始年份
+			},
+			currmonth:{
+				type:String,
+				default:"1"    //初始月份
 			}
 		},
 		data(){
@@ -69,8 +77,10 @@
 		mounted() {
 			this.today = new Date();
 			this.nowMonth = {
-				year:this.today.getFullYear(),
-				month:(this.today.getMonth()+1<10)?"0"+(this.today.getMonth()+1) : this.today.getMonth()+1
+				// year:this.today.getFullYear(),
+				// month:(this.today.getMonth()+1<10)?"0"+(this.today.getMonth()+1) : this.today.getMonth()+1,
+				year:this.curryear,
+				month:this.currmonth
 			}
 			this.setMonthList()
 		},

pages/guidecar/guidecarGoodsdetails.vue

@@ -82,7 +82,7 @@
 				<view class="row">
 					<span class='skub_text'>导游信息</span>
 					<view class="row" style="margin-left: 20px;">
-						<image :src="g.guide_photo"  style="width: 36px; height: 36px;margin-right: 10px" mode="widthFix"></image>
+						<u-avatar :src="g.guide_photo" :size="68" style='margin-right: 5px;'></u-avatar>
 						<view class="column" style="height: 36px;justify-content: space-between;">
 							<view class="row">
 								<span>{{g.guide_name}}</span>

pages/guidecar/guidedetails.vue

@@ -3,8 +3,9 @@
 	  
 	  <view class="guide" v-if='type==1'>
 		  <view class="guide-top">
-				 <image :src="guideModel.GuidePhoto"  style="width: 60px; height: 60px;margin-right: 10px" mode="widthFix"></image>
-				 <view class="column" style="height: 36px;justify-content: space-between;">
+					<u-avatar :src="guideModel.GuidePhoto" :size="120"></u-avatar>
+				 
+				 <view class="column" style="height: 36px;justify-content: space-between;margin-left: 10px;">
 					<view class="row">
 						<span>{{guideModel.Name}}</span>
 					</view>

pages/guidecar/place_order.vue

@@ -167,7 +167,7 @@
 					</image>
 				</view>
 				<view style="width:48%">
-					<view class="order_big">{{mchs[0].goods_list[0].goods_attr.car_name}}</view>
+					<view class="order_big">{{mchs[0].goods_list[0].goods_attr.name}}</view>
 					<view class="order_carBg" style="margin-top:10px;">
 						<view style="margin-bottom:5px;">天数：{{mchs[0].goods_list[0].goods_attr.advance_day}}天</view>
 						<view style="margin-bottom:5px;">颜色：{{mchs[0].goods_list[0].goods_attr.carcolor_name}}</view>
@@ -183,7 +183,7 @@
 			<view class="order_GName">
 				<view class="order_big order_comLeft">匹配导游</view>
 				<view style="display: flex;align-items: center;">
-					<u-avatar mode="circle" style="margin-top:9px;" :src="mchs[0].goods_list[0].goods_attr.guide_photo"></u-avatar>
+					<u-avatar mode="circle" style="margin-top:9px;" :size="50"  :src="mchs[0].goods_list[0].goods_attr.guide_photo"></u-avatar>
 					<text class="order_big" style="margin-left:3px;">{{mchs[0].goods_list[0].goods_attr.guide_name}}</text>
 				</view>
 			</view>

pages/guidecar/rili.vue

@@ -17,6 +17,8 @@
 		<view>
 			<z-calendar ref="calendar" 
 			:datePrice="datePrice" 
+			:curryear='curryear'
+			:currmonth='currmonth'
 			howManyMonth="6" 
 			mode="2" 
 			@changeDate="changeDate"
@@ -63,6 +65,9 @@
 				},
 				use_day:0,
 				GoodsId:0,
+				
+				curryear:0,
+				currmonth:0,
 			};
 		},
 		onLoad(options){
@@ -85,6 +90,8 @@
 					month = ('0' + month)
 				}
 				let Month = year+'-'+month
+				this.curryear= year
+				this.currmonth= month
 				this.getGoodsDateList(Month)
 			}
 			
@@ -128,11 +135,10 @@
 			goconfirm(){
 				let StartTime = this.STime.year+'-'+this.STime.month+'-'+this.STime.day+' '+this.STime.hour+':'+this.STime.minute+':00';
 				let EndTime = this.ETime.year+'-'+this.ETime.month+'-'+this.ETime.day+' '+this.ETime.hour+':'+this.ETime.minute+':10';
-				console.log(this.qutime)
-				console.log(this.stilltime)
+				
 				let quT = this.timeToSec(this.qutime)
 				let stillT = this.timeToSec(this.stilltime)
-				console.log(quT,stillT)
+				
 				if(this.use_day==0.5){
 					if(quT>=stillT){
 						uni.showToast({
@@ -206,7 +212,7 @@
 				);
 			},
 			btnStart(val){
-				console.log(val)
+				
 				if(this.timeType==1){
 					this.qutime=val.hour+":"+val.minute
 					this.STime.hour = val.hour;