diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js index e25d63b..5bc4d53 100644 --- a/pages/user/my_service/appment_main.js +++ b/pages/user/my_service/appment_main.js @@ -124,7 +124,6 @@ Page({ 'content-type': 'application/json' }, // 设置请求的 header success: function(res) { - console.log("真正提交1111111",res.data); th.setData({ is_sub: 0 }) @@ -209,7 +208,7 @@ Page({ if (store == "") { getApp().my_warnning("请选择服务门店", 0, th); th.setData({ - is_sub:0 + is_sub: 0 }) th.settime(); return false; @@ -220,45 +219,88 @@ Page({ }) th.settime(); return false; - } else if (time==undefined || time=='') { + } else if (time == undefined || time == '') { getApp().my_warnning("请选择预约时间", 0, th); th.setData({ is_sub: 0 }) th.settime(); return false; - }else{ - //获取模版id - getApp().request.promiseGet(temp_url, { - data: { - store_id: a.stoid, - typeid: "1011" - } - }).then(res => { + } else { + var version =""; + //判断微信版本是否达到预约成功订阅的要求 + wx.getSystemInfo({ + success(res) { + version = res.version; + } + }) 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); + if (th.ver(version, '7.0.4') >= 0) { + //获取模版id + getApp().request.promiseGet(temp_url, { + data: { + store_id: a.stoid, + typeid: "1011" + } + }).then(res => { + 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) { + th.success(); + }, + fail(res) { + th.success(); + } + }) + } else { th.success(); } }) } else { - console.log("接口调用失败0000000", res.data); - th.success(); + // 如果希望用户在最新版本的客户端上体验您的小程序,可以这样子提示 + wx.showModal({ + title: '提示', + content: '当前微信版本过低,无法使用该功能,请升级到最新微信版本后重试。' + }) + th.setData({ + is_sub: 0 + }) } - }) + } }, + //版本判断 + ver:function(v1,v2){ + v1 = v1.split('.') + v2 = v2.split('.') + var num1 = "" ; + var num2 = ""; + var len = Math.max(v1.length, v2.length) + + while (v1.length < len) { + v1.push('0') + } + while (v2.length < len) { + v2.push('0') + } + + for (let i = 0; i < len; i++) { + num1 = parseInt(v1[i]) + num2 = parseInt(v2[i]) + + if (num1 > num2) { + return 1 + } else if (num1 < num2) { + return -1 + } + } + return 0 + }, goto: function(e) { var th = this; th.setData({ diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml index e405f80..8c16bd2 100644 --- a/pages/user/my_service/appment_main.wxml +++ b/pages/user/my_service/appment_main.wxml @@ -36,7 +36,7 @@ - {{item.StaffName}} + {{item.StaffName}} diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss index e2ca36d..ba5d2c1 100644 --- a/pages/user/my_service/appment_main.wxss +++ b/pages/user/my_service/appment_main.wxss @@ -14,7 +14,9 @@ font-size: 26rpx; color: rgb(142, 142, 142); } - +.StaffName{ + max-width: 350rpx; +} .angler { transform: rotate(227deg); margin-bottom: 0rpx; diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js index 2c7602a..b9d08e7 100644 --- a/pages/user/my_service/beauty_deta.js +++ b/pages/user/my_service/beauty_deta.js @@ -82,8 +82,6 @@ Page({ // var date = myDate.getHours(); //获取当前小时数(0-23); let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)" let date = str.substring(0, 8); // '10:55:24' - - // console.log("当前时间", date); th.setData({ hours: date }); diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js index c826005..6147a7e 100644 --- a/pages/user/my_service/cosmetology_list.js +++ b/pages/user/my_service/cosmetology_list.js @@ -74,6 +74,7 @@ Page({ if (_Img != undefined) { var _errObj = {}; _errObj[_errImg] = "/miniapp/images/no-head.jpg"; + console.log(_errObj,"zzzzzzz"); this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; } }, diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml index 776817a..02f99a7 100644 --- a/pages/user/my_service/cosmetology_list.wxml +++ b/pages/user/my_service/cosmetology_list.wxml @@ -8,7 +8,7 @@ - + {{item.StaffName}} diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js index 7da34f4..46c8c97 100644 --- a/pages/user/my_service/tment_eval.js +++ b/pages/user/my_service/tment_eval.js @@ -1,4 +1,4 @@ -var e = getApp(), + var e = getApp(), a = e.globalData.setting, os = a, t = e.request, @@ -63,13 +63,14 @@ Page({ }) }, //图片失败,默认图片 - bind_bnerr1: function(e) { + bind_bnerr1: function (e) { + var th = this; var _errImg = e.target.dataset.errorimg; var _Img = e.target.dataset.img; if (_Img != undefined) { var _errObj = {}; _errObj[_errImg] = "/miniapp/images/no-head.jpg"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; } }, //选择标签 @@ -106,7 +107,7 @@ Page({ var data = res.data.data.pageData; var arrangeTime = data[0].ArrangeTime; th.setData({ - beautician: data[0], + beautician: data, arrangeTime: arrangeTime }) } else { @@ -129,7 +130,7 @@ Page({ 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) + EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19) }) } else { getApp().my_warnning(res.data.msg, 0, th); @@ -198,12 +199,14 @@ Page({ }, //图片失败,默认图片 bind_bnerr1: function(e) { + var th = this; var _errImg = e.target.dataset.errorimg; var _Img = e.target.dataset.img; if (_Img != undefined) { + var _errObj = {}; - _errObj[_errImg] = "/miniapp/images/no-head.jpg"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg"; + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; } }, /** diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml index b0a23e5..d89061c 100644 --- a/pages/user/my_service/tment_eval.wxml +++ b/pages/user/my_service/tment_eval.wxml @@ -1,28 +1,29 @@ - + - + + - + 服务美容师: - {{beautician.BeauticianName}} + {{it.BeauticianName}} 服务项目: - {{beautician.StorageName}} + {{it.ServiceName}} 服务时间: - {{arrangeTime}} + {{it.WriteTime}} @@ -85,8 +86,8 @@ - - + + 确认提交 diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js index f246ffc..6e0134e 100644 --- a/pages/user/my_service/tment_order_list.js +++ b/pages/user/my_service/tment_order_list.js @@ -101,6 +101,9 @@ Page({ var arr1 = th.data.tm_order_list; var arr2 = res.data.data.pageData; var arr3 = [...arr1, ...arr2]; + for(var i = 0;i