From 3656764d80b5f1d0417300ee1e29ba691458e2e4 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Thu, 9 Jul 2020 23:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=92=8C?=
=?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/order.js | 14 +++-
pages/order/order.wxml | 15 ++--
pages/orderDetail/orderDetail.js | 107 ++++++++++++++++++++++++++++-
pages/orderDetail/orderDetail.wxml | 67 ++++++------------
4 files changed, 148 insertions(+), 55 deletions(-)
diff --git a/pages/order/order.js b/pages/order/order.js
index 375b0a6..f19e0c9 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -30,7 +30,6 @@ Page({
page: data.page,
total: data.total
});
- console.log(self.data.orderList);
},
function (code, data) {
app.dialog.msg(data.msg);
@@ -39,6 +38,17 @@ Page({
})
},
+ //订单详情页
+ toOrderDetail: function(options){
+ var groundBookingId = options.currentTarget.dataset.id;
+ if(!groundBookingId){
+ return false;
+ }
+ wx.navigateTo({
+ url: '../orderDetail/orderDetail?groundBookingId=' + groundBookingId,
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
@@ -86,14 +96,12 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
-
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
-
},
/**
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index 5024ecf..a7e5539 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -1,5 +1,5 @@
-
+
@@ -10,9 +10,16 @@
订单编号：{{item.serial}}
下单时间：{{item.gmtCreate}}
- ￥15元
- ￥{{item.price}}元
- 已过期
+
+ ￥15元
+ ￥{{item.price}}元
+
+
+ 已取消
+
+
+ 已过期
+
\ No newline at end of file
diff --git a/pages/orderDetail/orderDetail.js b/pages/orderDetail/orderDetail.js
index 1fbd268..276c389 100644
--- a/pages/orderDetail/orderDetail.js
+++ b/pages/orderDetail/orderDetail.js
@@ -1,3 +1,4 @@
+var app = getApp();
// pages/orderDetail/orderDetail.js
Page({
@@ -5,14 +6,118 @@ Page({
* 页面的初始数据
*/
data: {
+ venueUrl : app.venueUrl,
+ imgRoute : '/route/file/downloadfile/true/',
+ token:'',
+ groundBookingId: '',
+ serial: '',
+ venuesName: '',
+ projectName: '',
+ venuePanorama: '',
+ gmtCreate: '',
+ price: '',
+ itemList:[],
+ cancelType: false,
+ },
+
+ //查询订单详情
+ getDetail: function(){
+ var self = this;
+ app.dialog.loading('请稍等');
+ app.restAjax.get(app.restAjax.path('{venueUrl}/app/booking/getmyticketdetail/{groundBookingId}', [app.venueUrl,self.data.groundBookingId]),
+ {}, {headers:{token : self.data.token}},
+ function (code, data) {
+ self.setData({
+ serial: data.data.serial,
+ venuesName: data.data.venuesName,
+ projectName: data.data.projectName,
+ venuePanorama: data.data.venuePanorama.split(',')[0],
+ gmtCreate: data.data.gmtCreate.substring(0,19),
+ itemList: data.data.itemDTOList,
+ cancelType: false
+ })
+ var totalPrice = 0;
+ self.data.itemList.forEach(element => {
+ if(element.orderType != '1'){
+ totalPrice += Number(element.price);
+ }
+ if(element.orderType == '0'){
+ self.setData({
+ cancelType: true
+ })
+ }
+ });
+ self.setData({
+ price: totalPrice
+ })
+ },
+ function (code, data) {
+ app.dialog.msg(data.msg);
+ },function(){
+ wx.hideLoading();
+ })
+ },
+ //取消预订场次
+ cancelItem: function(options){
+ var self = this;
+ var bookingItemId = options.currentTarget.dataset.id;
+ var unCancelNum = 0;
+ self.data.itemList.forEach(element => {
+ if(element.orderType == '0'){
+ unCancelNum++;
+ }
+ });
+ //取消一个
+ if(unCancelNum > 1){
+ app.dialog.loading('请稍等');
+ app.restAjax.delete(app.restAjax.path('{venueUrl}/app/booking/removemyticketitem/{groundBookingId}/{bookingItemId}',
+ [app.venueUrl,self.data.groundBookingId,bookingItemId]), {}, {headers:{token : self.data.token}},
+ function (code, data) {
+ self.getDetail();
+ },
+ function (code, data) {
+ app.dialog.msg(data.msg);
+ },function(){
+ wx.hideLoading();
+ })
+ }
+ //取消全部
+ if(unCancelNum <= 1){
+ self.cancelAll();
+ }
+ },
+
+ //全部取消
+ cancelAll: function(){
+ var self = this;
+ app.dialog.loading('请稍等');
+ app.restAjax.delete(app.restAjax.path('{venueUrl}/app/booking/removemyticket/{groundBookingId}',
+ [app.venueUrl,self.data.groundBookingId]), {}, {headers:{token : self.data.token}},
+ function (code, data) {
+ self.getDetail();
+ },
+ 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,
+ groundBookingId: options.groundBookingId
+ })
+ this.getDetail();
+ }
+ })
},
/**
diff --git a/pages/orderDetail/orderDetail.wxml b/pages/orderDetail/orderDetail.wxml
index ec46aab..0839f96 100644
--- a/pages/orderDetail/orderDetail.wxml
+++ b/pages/orderDetail/orderDetail.wxml
@@ -1,67 +1,40 @@
-
+
- 场馆
+ {{venuesName}}
- 订单编号：123456789
+ 订单编号：{{serial}}
- 下单时间：10:10:10
+ 下单时间：{{gmtCreate}}
-
- 价 格：15元
+
+ 价 格： -
+
+
+ 价 格： {{price}}元
- 预定详情
+ {{projectName}}-预定详情
-
+
- 2020-01-01
- 12:00-13:00
+ {{item.bookingOrderDate}}
+ {{item.timeStr}}-{{item.timeEnd}}
- 场地1
- 15元
- 取消预定
-
-
-
-
- 2020-01-01
- 12:00-13:00
-
-
- 场地1
- 15元
- 已过期
-
-
-
-
- 2020-01-01
- 12:00-13:00
-
-
- 场地1
- 15元
- 已取消
-
-
-
-
- 2020-01-01
- 12:00-13:00
-
-
- 场地1
- 15元
- 取消预定
+ {{item.groundName}}
+ 免费
+ {{item.price}}元
+ 取消预定
+ 已取消
+ 已过期
-全部取消
\ No newline at end of file
+全部取消
\ No newline at end of file