diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js index 315928e..039c7b1 100644 --- a/pages/user/my_service/appment_main.js +++ b/pages/user/my_service/appment_main.js @@ -49,12 +49,11 @@ Page({ check_text: function() { var th = this; var is_textea = th.data.is_textea; - if (is_textea == 0) { - th.setData({ - is_textea: 1, - beautician: 0 - }) - } + th.setData({ + is_textea: 1, + beautician: 0 + }) + }, onclickstore: function() { var th = this; @@ -140,11 +139,11 @@ Page({ 'content-type': 'application/json' }, // 设置请求的 header success: function(res) { + th.setData({ + is_sub: 0 + }) if (res.data.code == 0) { - th.setData({ - is_success: 1, - is_sub: 0 - }) + getApp().my_warnning("预约成功", 0, th); var store_name = th.data.store_name; //预约门店 var number = res.data.data.Number; var temp_url = "/api/wx/open/app/user/templatMessageSend"; //模版接口 @@ -443,7 +442,7 @@ Page({ var url = "/api/weshop/marketing/reservation/can/reservation/count"; var beauticianID = th.data.beauticianID; //美容师id var projectID = th.data.itemId; //服务id - var seekTime = th.data.time.substring(0, 10); //预约日期 + var seekTime = th.data.time; //预约日期 var storageId = th.data.storageId; //门店id var storeId = a.stoid; //商家id getApp().request.promiseGet(url, { @@ -478,24 +477,24 @@ Page({ th.query_project(); }, //获取单个服务项目信息 - query_project:function(){ + query_project: function() { var th = this; - var url = "/api/weshop/marketing/reservation/sm/page";//获取服务项目接口 - var project_id = th.data.project_id;//服务项目id - getApp().request.promiseGet(url,{ - data:{ - storeId:a.stoid, - userId:d.user_id, - projectId: project_id - } - }).then(res=>{ - if(res.data.code==0){ - th.setData({ - validay: res.data.data.pageData[0].Validay - }) - }else{ - getApp().my_warnning(res.data.msg,0,th); - } + var url = "/api/weshop/marketing/reservation/sm/page"; //获取服务项目接口 + var project_id = th.data.project_id; //服务项目id + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: d.user_id, + projectId: project_id + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + validay: res.data.data.pageData[0].Validay + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } }) } }) \ No newline at end of file diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml index 383c472..29d7681 100644 --- a/pages/user/my_service/appment_main.wxml +++ b/pages/user/my_service/appment_main.wxml @@ -69,7 +69,7 @@ - + @@ -93,12 +93,12 @@ - + diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js index c14b4b4..6ebee00 100644 --- a/pages/user/my_service/beauty_deta.js +++ b/pages/user/my_service/beauty_deta.js @@ -165,7 +165,7 @@ Page({ }, // 设置请求的 header success: function(res) { if (res.data.code == 0) { - getApp().my_warnning(res.data.msg, 0, th); + getApp().my_warnning(res.data.data, 0, th); setTimeout(function() { wx.navigateBack({ //返回 @@ -290,9 +290,11 @@ Page({ } }).then(res => { if (res.data.code == 0) { + if (res.data.data[0].GroupHour!=undefined){ if (res.data.data[0].GroupHour.length > 11) { getApp().my_warnning(res.data.data[0].GroupHour, 0, th); } + } var hours = th.data.hours; var time_list = res.data.data; @@ -323,6 +325,10 @@ Page({ } } } + }else{ + for(var i = 0 ;i - + 预约状态: @@ -76,7 +76,7 @@ - + @@ -88,8 +88,7 @@ 2.如有任何问题可致电咨询; 3.如需退约,需提前取消。 - - + @@ -113,9 +112,11 @@ + + - \ No newline at end of file + diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss index e4f52e6..dd9c0db 100644 --- a/pages/user/my_service/tment_details.wxss +++ b/pages/user/my_service/tment_details.wxss @@ -1,6 +1,5 @@ page { width: 100%; - height: 100%; background-color: rgb(238, 238, 238); } @@ -34,13 +33,15 @@ page { /* 公用 */ .container { - padding: 0rpx 20rpx; padding-bottom:40rpx; } +.padding{ + margin: 0rpx 20rpx; +} + .Subscriber { overflow: hidden; - width: 100%; margin-top: 25rpx; background-color: rgb(255, 255, 255); border-radius: 10rpx; @@ -78,11 +79,12 @@ page { } .subs { - padding: 0rpx 5rpx; - margin-bottom: 20rpx; + width: 710rpx; + padding: 0rpx 20rpx; position: fixed; - width: 705rpx; - bottom:85rpx; + bottom:0rpx; + background-color: rgb(255,255,255); + height: 140rpx; } .sub { diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js index 14d6dcc..d0fdef3 100644 --- a/pages/user/my_service/tment_eval.js +++ b/pages/user/my_service/tment_eval.js @@ -104,7 +104,7 @@ Page({ }).then(res => { if (res.data.code == 0) { var data = res.data.data.pageData; - var arrangeTime = data[0].ArrangeTime.substring(0, 11); + var arrangeTime = data[0].ArrangeTime; th.setData({ beautician: data[0], arrangeTime: arrangeTime @@ -140,10 +140,14 @@ Page({ evaluate_save: function() { var th = this; var stars = th.data.stars_index; //评价星级 + var proposal = th.data.proposal; //判断是否评级 if (stars < 0) { getApp().my_warnning("请进行评分", 0, th); return false; + } else if (proposal==""){ + getApp().my_warnning("给点建议呗", 0, th); + return false; } var labels = th.data.labels; //星级标签数组 var evaLabList = []; //用户选择的评价标签 @@ -182,7 +186,7 @@ Page({ wx.redirectTo({ url: "/pages/user/my_service/tment_order_list" }); - }, 800); + }, 1500); } else { getApp().my_warnning(res.data.msg, 0, th); } diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml index bdeb8f8..f4f7a6a 100644 --- a/pages/user/my_service/tment_eval.wxml +++ b/pages/user/my_service/tment_eval.wxml @@ -7,7 +7,10 @@ - 美容师: + + 美容师 + + {{beautician.BeauticianName}} @@ -38,16 +41,16 @@ - - + + - - {{proposal}} - + + {{proposal}} + @@ -59,11 +62,11 @@ - - {{item.LabelName}} - + + {{item.LabelName}} + - + diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml index da683f7..9d5a99c 100644 --- a/pages/user/my_service/tment_order_list.wxml +++ b/pages/user/my_service/tment_order_list.wxml @@ -69,7 +69,7 @@ 查看评价 - + 到底了