diff --git a/pages/book/book.js b/pages/book/book.js index e6dc48f..1c2ce8f 100644 --- a/pages/book/book.js +++ b/pages/book/book.js @@ -54,6 +54,9 @@ Page({ venuesProjectId : self.data.selectVenuesProject, bookingItemList : self.data.mySelectItem } + wx.showLoading({ + title: '请稍等', + }); app.restAjax.post(app.restAjax.path('{venueUrl}/app/booking/savebookinginfo',[app.venueUrl]), param, {headers : {token:self.data.token}}, function(code,data){ if(code == 200){ wx.showToast({ @@ -67,6 +70,8 @@ Page({ } },function(code,data){ app.dialog.msg(data.msg); + },function(){ + wx.hideLoading(); }); }, @@ -283,7 +288,6 @@ Page({ if(!self.checkPhoneNumber()){ return false; } - console.log('go'); app.restAjax.get(app.restAjax.path('{venueUrl}/api/sms/getverificationcode/' + self.data.phoneNumber, [app.venueUrl]), {}, null, function (code, data) { if (code == 200) { @@ -309,7 +313,6 @@ Page({ } }, function (code, data) { - console.log(data) wx.showToast({ title: data.msg, icon: 'none', diff --git a/pages/center/center.js b/pages/center/center.js index 98033a9..46584e4 100644 --- a/pages/center/center.js +++ b/pages/center/center.js @@ -104,6 +104,14 @@ Page({ }, }) }, + /** + * 跳转到我的预订列表 + */ + toMyOrder: function() { + wx.navigateTo({ + url: '../order/order', + }) + }, /** * 跳转到我的志愿团队页面 */ diff --git a/pages/center/center.wxml b/pages/center/center.wxml index 6f06c29..2c7dbbd 100644 --- a/pages/center/center.wxml +++ b/pages/center/center.wxml @@ -11,6 +11,10 @@ 常用功能 + + + 我的预订 + 我的报名 diff --git a/pages/order/order.js b/pages/order/order.js index 8e1eeab..375b0a6 100644 --- a/pages/order/order.js +++ b/pages/order/order.js @@ -1,3 +1,4 @@ +var app = getApp(); // pages/order/order.js Page({ @@ -5,14 +6,52 @@ Page({ * 页面的初始数据 */ data: { + venueUrl : app.venueUrl, + imgRoute : '/route/file/downloadfile/true/', + token: '', + orderList:[], + page: 1, + rows: 10, + total: 0 + }, + //查询订单列表 + listOrderList: function() { + var self = this; + app.dialog.loading('请稍等'); + app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/listpagemyticket', [app.venueUrl]), + {page: self.data.page,rows: self.data.rows}, {headers:{token : self.data.token}}, + function (code, data) { + data.rows.forEach(element => { + element.venuePanorama = element.venuePanorama.split(',')[0] + }); + self.setData({ + orderList: data.rows, + page: data.page, + total: data.total + }); + console.log(self.data.orderList); + }, + function (code, data) { + app.dialog.msg(data.msg); + },function(){ + wx.hideLoading(); + }) }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + wx.getStorage({ + key: 'token', + success: (result) => { + this.setData({ + token : result.data + }) + this.listOrderList(); + } + }) }, /** diff --git a/pages/order/order.wxml b/pages/order/order.wxml index 5c54771..f8235c3 100644 --- a/pages/order/order.wxml +++ b/pages/order/order.wxml @@ -1,30 +1,17 @@ - + - + - 场馆场馆场馆场馆 - 篮球 + {{item.venuesName}} + {{item.projectName}} - 订单编号:01010101 - 下单时间:2020-01-01 - ¥15元 - - - - - - - - - 场馆场馆场馆场馆 - 篮球 - - 订单编号:01010101 - 下单时间:2020-01-01 - ¥15元 + 订单编号:{{item.serial}} + 下单时间:{{item.gmtCreate}} + ¥15元 + ¥{{item.price}}元 \ No newline at end of file