diff --git a/packageA/pages/jfbuy/jfbuy.wxml b/packageA/pages/jfbuy/jfbuy.wxml index 802e180..e8182f9 100644 --- a/packageA/pages/jfbuy/jfbuy.wxml +++ b/packageA/pages/jfbuy/jfbuy.wxml @@ -52,7 +52,7 @@ 零售价:¥{{item.market_price}} - 销量:{{item.sales_sum}} + 销量:{{item.buy_num}} diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js index ed5dba1..413a898 100644 --- a/packageA/pages/my_service2/appment_main.js +++ b/packageA/pages/my_service2/appment_main.js @@ -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}); - + + + }, diff --git a/packageA/pages/my_service2/appment_main.json b/packageA/pages/my_service2/appment_main.json index d6e82a4..0b45084 100644 --- a/packageA/pages/my_service2/appment_main.json +++ b/packageA/pages/my_service2/appment_main.json @@ -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 diff --git a/packageA/pages/my_service2/appment_main.wxml b/packageA/pages/my_service2/appment_main.wxml index 34b26f9..4fc5fd6 100644 --- a/packageA/pages/my_service2/appment_main.wxml +++ b/packageA/pages/my_service2/appment_main.wxml @@ -3,7 +3,7 @@ - + @@ -54,7 +54,7 @@ - + 时间 @@ -157,4 +157,6 @@ {{sele_project.ServiceName}} --> - + + + \ No newline at end of file