Commit c260f2e40af3cf22629245754de34d07cbc14de6
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
6 additions
and
5 deletions
packageA/pages/my_service/appment_main.js
| @@ -132,11 +132,11 @@ Page({ | @@ -132,11 +132,11 @@ Page({ | ||
| 132 | wx.hideLoading(); | 132 | wx.hideLoading(); |
| 133 | if (res.data.code == 0) { | 133 | if (res.data.code == 0) { |
| 134 | getApp().my_warnning("预约成功", 1, th); | 134 | getApp().my_warnning("预约成功", 1, th); |
| 135 | - var store_name = th.data.store_name; //预约门店 | 135 | + // var store_name = th.data.store_name; //预约门店 |
| 136 | var number = res.data.data.Number; | 136 | var number = res.data.data.Number; |
| 137 | - var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口 | ||
| 138 | - var userinfo = getApp().globalData.userInfo; | ||
| 139 | - var name = d.userInfo.nickname; | 137 | + // var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口 |
| 138 | + //var userinfo = getApp().globalData.userInfo; | ||
| 139 | + //var name = d.userInfo.nickname; | ||
| 140 | // var json = { | 140 | // var json = { |
| 141 | // // "formId": formid, | 141 | // // "formId": formid, |
| 142 | // "keyWord": [{ | 142 | // "keyWord": [{ |
packageA/pages/my_service/beauty_deta.js
| @@ -163,9 +163,10 @@ Page({ | @@ -163,9 +163,10 @@ Page({ | ||
| 163 | var json = { | 163 | var json = { |
| 164 | "arrangeTime": time, | 164 | "arrangeTime": time, |
| 165 | "number": th.data.number, | 165 | "number": th.data.number, |
| 166 | - "remark": "更改时间", | 166 | + "remark": "更改预约时间", |
| 167 | "states": 0, | 167 | "states": 0, |
| 168 | "storeId": a.stoid, | 168 | "storeId": a.stoid, |
| 169 | + "isxz": 1 | ||
| 169 | }; | 170 | }; |
| 170 | var data = JSON.stringify(json); | 171 | var data = JSON.stringify(json); |
| 171 | var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 | 172 | var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址 |