获取手机号组件、时间段组件

@@ -46,21 +46,23 @@ Component({
 			}
 			}
 			let durlist=[];
 			let durlist=[];
 			for(let key in timedur){
 			for(let key in timedur){
-				let arr=timedur[key].split('-');
-				//每个时段的开始时间、结束时间
-				let starttime=Number(arr[0].split(':')[0]);
-				let endtime=Number(arr[1].split(':')[0]);
-				if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){
-					if(currenttimemark+0.5<endtime){
-						if(currenttimemark+0.5>starttime){
-							starttime=Math.round(currenttimemark)+0.5;
+				if(timedur[key]!=""){
+					let arr=timedur[key].split('-');
+					//每个时段的开始时间、结束时间
+					let starttime=Number(arr[0].split(':')[0]);
+					let endtime=Number(arr[1].split(':')[0]);
+					if(util.unixtoTime(date/1000,'YYYY-MM-DD')==this.data.date){      //当天
+						if(currenttimemark+0.5<endtime){
+							if(currenttimemark+0.5>starttime){
+								starttime=Math.round(currenttimemark)+0.5;
+							}
+							let thisdurlist=this.getsinglelist(starttime,endtime)
+							durlist=durlist.concat(thisdurlist)
 						}
 						}
-						let thisdurlist=this.getsinglelist(starttime,endtime)
+					}else{
+						let thisdurlist=this.getsinglelist(starttime,endtime);
 						durlist=durlist.concat(thisdurlist)
 						durlist=durlist.concat(thisdurlist)
 					}
 					}
-				}else{
-					let thisdurlist=this.getsinglelist(starttime,endtime);
-					durlist=durlist.concat(thisdurlist)
 				}	
 				}	
 			}
 			}
 			this.setData({
 			this.setData({

@@ -3,19 +3,24 @@ Component({
 	methods:{
 	methods:{
 		getphone(e){
 		getphone(e){
 			console.log(e)
 			console.log(e)
-			let parmdata={
-				session_key:wx.getStorageSync('customer_session_key'),
-				encryptedData:e.detail.encryptedData,
-				iv:e.detail.iv
-				
-			}
-			App.Customer.GetCustomerTel(parmdata).then((json)=>{
-				console.log(json)
-				if(json.ret==200){
-					let phoneNumber=JSON.parse(json.data).phoneNumber;
-					this.triggerEvent('getphoneNumber',{phone:phoneNumber})
+			if(e.detail.errMsg=="getPhoneNumber:ok"){
+				let parmdata={
+					session_key:wx.getStorageSync('customer_session_key'),
+					encryptedData:e.detail.encryptedData,
+					iv:e.detail.iv
+					
 				}
 				}
-			})
+				App.Customer.GetCustomerTel(parmdata).then((json)=>{
+					console.log(json)
+					if(json.ret==200){
+						let phoneNumber=JSON.parse(json.data).phoneNumber;
+						this.triggerEvent('getphoneNumber',{ret:200,phone:phoneNumber})
+					}else{
+						this.triggerEvent('getphoneNumber',{ret:json.ret,msg:jaon.data})
+					}
+				})
+			}
+			
 		}
 		}
 	}
 	}
 })
 })

-<button class="button-none white-font font28r smooth phone-button flex-cc" open-type="getPhoneNumber" bindgetphonenumber="getphone">一键获取</button>
+<button class="button-none white-font font28r smooth phone-button flex-cc" open-type="getPhoneNumber" bindgetphonenumber="getphone"><slot></slot></button>

-@import "../../app.wxss";
-.phone-button{
-	width:160rpx;
-	height:50rpx;
-	background: #C0A369;
-	color:#ffffff;
-	font-size:28rpx;
-	display:flex;
-	display:-webkit-flex;
-}
+@import "../../app.wxss";

@@ -50,7 +50,9 @@
                        placeholder-class="input-pl"/>
                        placeholder-class="input-pl"/>
                 <view class="flex-rr">
                 <view class="flex-rr">
                     <!-- 一键获取 -->
                     <!-- 一键获取 -->
-					<phone></phone>
+					<phone>
+						<view class="smooth white-font get-phone flex-cc" style="font-size:28rpx;">一键获取</view>
+					</phone>
                 </view>
                 </view>
             </view>
             </view>
         </view>
         </view>

@@ -76,4 +76,9 @@
 }
 }
 .input-pl{
 .input-pl{
     font-size: 28rpx;
     font-size: 28rpx;
+}
+.get-phone{
+	width:160rpx;
+	height:50rpx;
+	background: #C0A369;
 }
 }