Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents b099db07 35b62626
Showing 4 changed files with 38 additions and 24 deletions
packageA/pages/jfbuy/jfbuy.wxml
packageA/pages/my_service2/appment_main.js
packageA/pages/my_service2/appment_main.json
packageA/pages/my_service2/appment_main.wxml
@@ -52,7 +52,7 @@
 								</view>
 								<view class="pdt14 fs22 gray flex jc_sb">
 									<view>零售价：￥{{item.market_price}}</view>
-									<view>销量：{{item.sales_sum}}</view>
+									<view>销量：{{item.buy_num}}</view>
 								</view>
 							</view>
 						</view>
@@ -297,6 +297,8 @@ Page({
 				  th.setData({v:{},col_arr:[]})
 				  //-- 有些时间是全部没有的 --
 				  th.setTimeShow(res.data.data)
+			   }else{
+				   th.setData({md:[]});
 			   }
 		  }
 	  }) 
@@ -807,7 +809,7 @@ Page({
 						for (var i in th.data.v) {
 							if (!th.data.v[i]) continue;
 							for (var j in th.data.v[i]) {
-								if (th.data.v[i][j] && th.data.v[i][j].ProjectID == th.data.sele_project.ProjectID) {
+								if (th.data.v[i][j] && th.data.v[i][j].ServiceID == th.data.sele_project.ServiceID) {
 									num++;
 								    th.data.cur_sele_i=i;
 								    th.data.cur_sele_j=j;
@@ -843,6 +845,9 @@ Page({
 	      query.select('.content_view').boundingClientRect()    // 这段代码的意思是选择Id=productServe的节点，获取节点位置信息的查询请求
 	      query.selectViewport().scrollOffset()                 // 这段代码的意思是获取页面滑动位置的查询请求
 	      query.exec(res => {
+			  if(!res || res.length==0) return false;
+              if(!res[0]) return false;
+
 	          console.log(res);
 			  th.data.f_x=res[0].left;
 			  th.data.f_y=res[0].top;
@@ -874,6 +879,7 @@ Page({
 		 this.setData({
 			 sele_project: name,prj_index:index
 		 });
+		 
 	 },
 	 //-- 项目列表长按 --
@@ -984,11 +990,13 @@ Page({
 				 getApp().request.get("/api/weshop/marketing/reservation/listStaffAndTime",{
 				 		  data:req,
 				 		  success:function(res){
-				 			  if(ut.ajax_ok2(res)){
+				 			   if(ut.ajax_ok2(res)){
 				 			  		th.setData({v:{},col_arr:[]})
 									//-- 有些时间是全部没有的 --
 									th.setTimeShow(res.data.data)
-				 			   }
+				 			   }else{
+								  th.setData({md:[]});
+							   }
 				 		  }
 				 })
 			}	
@@ -1015,23 +1023,25 @@ Page({
 			if(this.data.datet && this.data.datet!=md){
 			     this.setData({md:data});
 				 return false;	
-			}	 
-						
-			for(var i in data){
-			   var ti_time_arr=data[i].listtime;
-			   var arr=[];
-			   for(var j in ti_time_arr){
-				   var d1=md+" "+ti_time_arr[j].stime;
-				   var date1=new Date(d1);
-				   //必须是大于
-				   if(date1.getTime()>now_date.getTime()){
-				     	arr.push(ti_time_arr[j]);
-				   } 	   
-			   }
-			   data[i].listtime=arr;
-			}		
+			}
+
+            for (var i in data) {
+                var ti_time_arr = data[i].listtime;
+                var arr = [];
+                for (var j in ti_time_arr) {
+                    var d1 = md + " " + ti_time_arr[j].stime;
+                    var date1 = new Date(d1);
+                    //必须是大于
+                    if (date1.getTime() > now_date.getTime()) {
+                        arr.push(ti_time_arr[j]);
+                    }
+                }
+                data[i].listtime = arr;
+            }
 			this.setData({md:data});
-					
+
+           
+
 		},
@@ -3,6 +3,8 @@
 	"enablePullDownRefresh": false,
 	"usingComponents": {
 		"warn": "/components/long_warn/long_warn",
-		"nav_b": "/components/nav_b/nav_b"
+		"nav_b": "/components/nav_b/nav_b",
+		"nodata": "/components/nodata/nodata"
+		
 	}
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@
 <!-- 项目的拖动 -->	
-<view wx:if="{{!store && project}}" class="card" catchtouchmove='true'  style="left:{{wp[0]}}px;top:{{wp[1]}}px;">
+<view wx:if="{{!store && project && md && md.length>0}}" class="card" catchtouchmove='true'  style="left:{{wp[0]}}px;top:{{wp[1]}}px;">
 			<view class="cp_btn t-c c-c7" bindtouchend="touchend1" bindtouchmove="touchmove1" catch:touchmove1  style="padding: 15rpx 0;" >
 				<text class="iconfont icon-sandian" style="font-size: 40rpx;"></text>
 			</view>
@@ -54,7 +54,7 @@
 	<!-- 拖入的田框,主内容 -->
-	<view wx:if="{{md}}" class="table flex fs26" style="width: 100%;height: auto; overflow: hidden; margin-bottom: 10rpx;">
+	<view wx:if="{{md && md.length>0}}" class="table flex fs26" style="width: 100%;height: auto; overflow: hidden; margin-bottom: 10rpx;">
 			<view class="left t-c">
 				<view class="td pr" style="width: 120rpx">
 					<view class="time-box" bindtap="pickTime"><view class="time">时间</view></view>
@@ -157,4 +157,6 @@
 	<text class="iconfont icon-meirong fs40"></text>
 	<view class="fs24">{{sele_project.ServiceName}}</view>
 </view>-->
-
+<view class="flex ai-center jc-center">
+  <nodata wx:if="{{md && md.length==0}}" />
+</view>
 \ No newline at end of file