diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js index 0a08aa0..e25d63b 100644 --- a/pages/user/my_service/appment_main.js +++ b/pages/user/my_service/appment_main.js @@ -90,9 +90,6 @@ Page({ var bea_name = th.data.beautician_name; //美容师名称 var time = th.data.time; //预约时间 var is_sub = th.data.is_sub; //是否重复提交 - wx.showLoading({ - title: '加载中', - }) var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径 var serviceId = th.data.itemId; //服务id var beauticianID = th.data.beauticianID; //美容师id @@ -127,6 +124,7 @@ Page({ 'content-type': 'application/json' }, // 设置请求的 header success: function(res) { + console.log("真正提交1111111",res.data); th.setData({ is_sub: 0 }) @@ -237,19 +235,25 @@ Page({ typeid: "1011" } }).then(res => { + wx.showLoading({ + title: '加载中', + }) if (res.data.code == 0 && res.data.data.pageData.length > 0) { template_id = res.data.data.pageData[0].template_id; // //授权订阅 wx.requestSubscribeMessage({ tmplIds: [template_id], success(res) { + console.log("成功的回调222222", res); th.success(); }, fail(res) { + console.log("失败的回调1111111", res.data); th.success(); } }) } else { + console.log("接口调用失败0000000", res.data); th.success(); } }) diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js index c4da462..3bf0d52 100644 --- a/pages/user/my_service/tment_eval.js +++ b/pages/user/my_service/tment_eval.js @@ -21,37 +21,37 @@ Page({ beautician: "", //美容师信息 fromType: "服务评价", //评价来源 arrangeTime: "", //服务日期 - is_evaluate:0,//是否评价 - EvaluateDatetime:"",//评价时间 + is_evaluate: 0, //是否评价 + EvaluateDatetime: "", //评价时间 }, //点击星级 check_stars: function(e) { var th = this; - var is_evaluate = th.data.is_evaluate;//0可点击 - if (is_evaluate==0){ - var index = e.currentTarget.dataset.index; - var stars_index = th.data.stars_index; - if (index != stars_index) { - var url = "/api/weshop/marketing/reservation/star/label/list"; - getApp().request.promiseGet(url, { - data: { - Star: index+1, - storeId: a.stoid - } - }).then(res => { - if (res.data.code == 0) { - th.setData({ - labels: res.data.data - }) - } else { - getApp().my_warnning(res.data.msg, 0, th); - return; - } - }) - th.setData({ - stars_index: index - }) - } + var is_evaluate = th.data.is_evaluate; //0可点击 + if (is_evaluate == 0) { + var index = e.currentTarget.dataset.index; + var stars_index = th.data.stars_index; + if (index != stars_index) { + var url = "/api/weshop/marketing/reservation/star/label/list"; + getApp().request.promiseGet(url, { + data: { + Star: index + 1, + storeId: a.stoid + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + labels: res.data.data + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + return; + } + }) + th.setData({ + stars_index: index + }) + } } }, //输入评价意见和建议 @@ -75,19 +75,19 @@ Page({ //选择标签 check_label: function(e) { var th = this; - var evaluate = th.data.is_evaluate;//0为未评价,未评价才可点击标签 - if (evaluate==0){ - var index = e.currentTarget.dataset.index; - var label_id = th.data.labels[index].check; - var labels = 'labels[' + index + '].check'; - if (label_id) { - label_id = 0 - } else { - label_id = 1 - } - th.setData({ - [labels]: label_id - }) + var evaluate = th.data.is_evaluate; //0为未评价,未评价才可点击标签 + if (evaluate == 0) { + var index = e.currentTarget.dataset.index; + var label_id = th.data.labels[index].check; + var labels = 'labels[' + index + '].check'; + if (label_id) { + label_id = 0 + } else { + label_id = 1 + } + th.setData({ + [labels]: label_id + }) } }, //查询美容师信息 @@ -118,22 +118,22 @@ Page({ evaluate_get: function() { var th = this; var url = "/api/weshop/evaluation/evaluate/get"; - getApp().request.promiseGet(url,{ + getApp().request.promiseGet(url, { data: { number: th.data.number, storeId: a.stoid } }).then(res => { - if(res.data.code == 0){ - th.setData({ - stars_index: res.data.data.Star, - labels: res.data.data.EvaluationList, - proposal: res.data.data.Remark, - EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0,19) - }) - }else{ - getApp().my_warnning(res.data.msg,0,th); - } + if (res.data.code == 0) { + th.setData({ + stars_index: res.data.data.Star-1, + labels: res.data.data.EvaluationList, + proposal: res.data.data.Remark, + EvaluateDatetime: res.data.data.WriteTime.substring(0, 19) + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } }) }, //提交评价 @@ -145,7 +145,7 @@ Page({ if (stars < 0) { getApp().my_warnning("请进行评分", 0, th); return false; - } else if (proposal==""){ + } else if (proposal == "") { getApp().my_warnning("给点建议呗", 0, th); return false; } @@ -222,8 +222,8 @@ Page({ onShow: function() { var th = this; var is_evaluate = th.data.is_evaluate; - if (is_evaluate==1){ + if (is_evaluate == 1) { th.evaluate_get(); - } + } }, }) \ No newline at end of file diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml index 502fc30..411452c 100644 --- a/pages/user/my_service/tment_eval.wxml +++ b/pages/user/my_service/tment_eval.wxml @@ -35,7 +35,7 @@ - +