Commit 06a92134c01bfe29024db8d5fbd1942302cd852d
1 parent
ffba0e20
协助预约修改
Showing
7 changed files
with
21 additions
and
18 deletions
packageA/pages/my_service/appment_main.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "预约服务", | 2 | "navigationBarTitleText": "预约服务", |
3 | - "usingComponents": { | ||
4 | - "warn": "/components/long_warn/long_warn", | ||
5 | - "nav_b": "/components/nav_b/nav_b" | ||
6 | - } | 3 | + "enablePullDownRefresh": false, |
4 | + "usingComponents": { | ||
5 | + "warn": "/components/long_warn/long_warn", | ||
6 | + "nav_b": "/components/nav_b/nav_b" | ||
7 | + } | ||
7 | } | 8 | } |
8 | \ No newline at end of file | 9 | \ No newline at end of file |
packageA/pages/my_service/appment_main.wxml
@@ -83,14 +83,12 @@ | @@ -83,14 +83,12 @@ | ||
83 | <view>注:剩余可预约人数{{tment_count}}人</view> | 83 | <view>注:剩余可预约人数{{tment_count}}人</view> |
84 | </view> | 84 | </view> |
85 | 85 | ||
86 | - <view class="submitMax flex-space-between fs32"> | ||
87 | - <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list"> | 86 | + <view class="submitMax flex-space-center fs32"> |
87 | + <!-- <navigator class="appment flex-center" url="/pages/user/my_service/tment_order_list"> | ||
88 | <view>我的预约</view> | 88 | <view>我的预约</view> |
89 | - </navigator> | 89 | + </navigator> --> |
90 | <form report-submit='true' bindtap="sub_success"> | 90 | <form report-submit='true' bindtap="sub_success"> |
91 | - <button form-type="submit" class="sub_appment flex-center"> | ||
92 | - <view>提交预约</view> | ||
93 | - </button> | 91 | + <button form-type="submit" class="sub_appment flex-center">帮你预约</button> |
94 | </form> | 92 | </form> |
95 | </view> | 93 | </view> |
96 | </view> | 94 | </view> |
packageA/pages/my_service/i_service.js
@@ -29,13 +29,15 @@ Page({ | @@ -29,13 +29,15 @@ Page({ | ||
29 | * 生命周期函数--监听页面加载 | 29 | * 生命周期函数--监听页面加载 |
30 | */ | 30 | */ |
31 | onLoad: function(options) { | 31 | onLoad: function(options) { |
32 | + console.log('options==>', options); | ||
32 | var userinfo = getApp().globalData.userInfo; | 33 | var userinfo = getApp().globalData.userInfo; |
33 | if (userinfo == null) { | 34 | if (userinfo == null) { |
34 | //界面必须使用warn 做ID,并调用 | 35 | //界面必须使用warn 做ID,并调用 |
35 | - return false; | ||
36 | - } | 36 | + // return false; |
37 | + }; | ||
37 | this.setData({ | 38 | this.setData({ |
38 | - userinfo: userinfo | 39 | + userinfo: userinfo, |
40 | + options, | ||
39 | }); | 41 | }); |
40 | var th = this; | 42 | var th = this; |
41 | th.query_service(); | 43 | th.query_service(); |
@@ -48,6 +50,7 @@ Page({ | @@ -48,6 +50,7 @@ Page({ | ||
48 | var my_confirm = th.selectComponent("#my_confirm"); //组件的id | 50 | var my_confirm = th.selectComponent("#my_confirm"); //组件的id |
49 | my_confirm.open_cancel(0); | 51 | my_confirm.open_cancel(0); |
50 | }, | 52 | }, |
53 | + | ||
51 | onReachBottom: function() { | 54 | onReachBottom: function() { |
52 | var th = this; | 55 | var th = this; |
53 | if (this.data.total <= th.data.pageSize) return; | 56 | if (this.data.total <= th.data.pageSize) return; |
@@ -65,7 +68,7 @@ Page({ | @@ -65,7 +68,7 @@ Page({ | ||
65 | getApp().request.promiseGet(url, { | 68 | getApp().request.promiseGet(url, { |
66 | data: { | 69 | data: { |
67 | storeId: a.stoid, | 70 | storeId: a.stoid, |
68 | - userId: d.user_id, | 71 | + userId: th.data.options.UserId, |
69 | page: th.data.curpage, | 72 | page: th.data.curpage, |
70 | pageSize: th.data.pageSize | 73 | pageSize: th.data.pageSize |
71 | } | 74 | } |
@@ -113,7 +116,7 @@ Page({ | @@ -113,7 +116,7 @@ Page({ | ||
113 | data: { | 116 | data: { |
114 | serviceId: service_id, | 117 | serviceId: service_id, |
115 | storeId: a.stoid, | 118 | storeId: a.stoid, |
116 | - userId: d.user_id | 119 | + userId: th.data.options.UserId, |
117 | } | 120 | } |
118 | }).then(res => { | 121 | }).then(res => { |
119 | wx.hideLoading(); | 122 | wx.hideLoading(); |
@@ -190,7 +193,7 @@ Page({ | @@ -190,7 +193,7 @@ Page({ | ||
190 | data: { | 193 | data: { |
191 | serviceId: service_id, | 194 | serviceId: service_id, |
192 | storeId: a.stoid, | 195 | storeId: a.stoid, |
193 | - userId: d.user_id | 196 | + userId: th.data.options.UserId, |
194 | } | 197 | } |
195 | }).then(res => { | 198 | }).then(res => { |
196 | wx.hideLoading(); | 199 | wx.hideLoading(); |
@@ -221,7 +224,7 @@ Page({ | @@ -221,7 +224,7 @@ Page({ | ||
221 | projectId: project_id, | 224 | projectId: project_id, |
222 | serviceId: service_id, | 225 | serviceId: service_id, |
223 | storeId: a.stoid, | 226 | storeId: a.stoid, |
224 | - userId: d.user_id | 227 | + userId: th.data.options.UserId, |
225 | } | 228 | } |
226 | }).then(res => { | 229 | }).then(res => { |
227 | if (res.data.code == 0) { | 230 | if (res.data.code == 0) { |
packageA/pages/my_service/i_service.json
1 | { | 1 | { |
2 | "navigationBarTitleText": "服务项目", | 2 | "navigationBarTitleText": "服务项目", |
3 | + "enablePullDownRefresh": false, | ||
3 | "usingComponents": { | 4 | "usingComponents": { |
4 | "qr_code": "/components/qr_code/qr_code", | 5 | "qr_code": "/components/qr_code/qr_code", |
5 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
packageA/pages/my_service/i_service.wxml
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <view catchtap="close"> | 2 | <view catchtap="close"> |
3 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image> | 3 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image> |
4 | <navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator> | 4 | <navigator class="History fs26" url="/packageA/pages/service_record/service_record" style="left:10px;right:auto;">服务记录</navigator> |
5 | - <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator> | 5 | + <navigator class="History fs26" url="/packageA/pages/my_service/hist_service">历史预约</navigator> |
6 | </view> | 6 | </view> |
7 | 7 | ||
8 | <!-- 预约内容 --> | 8 | <!-- 预约内容 --> |
packageA/pages/my_service/my_service.js deleted
packageA/pages/my_service/my_service.wxml deleted