From af044d1e4e6ee40aa899bb0ac361cd01b9c81767 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Thu, 9 Jul 2020 13:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/book/book.js       |  7 +++++--
 pages/center/center.js   |  8 ++++++++
 pages/center/center.wxml |  4 ++++
 pages/order/order.js     | 41 +++++++++++++++++++++++++++++++++++++++-
 pages/order/order.wxml   | 29 ++++++++--------------------
 5 files changed, 65 insertions(+), 24 deletions(-)

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 @@
   <view class="main">
     <view class="main-title">常用功能</view>
     <view class="main-container">
+      <view class="main-box" bindtap="toMyOrder">
+        <image src="../../images/my-sign.png"></image>
+        <view class="title">我的预订</view>
+      </view>
       <view class="main-box">
         <image src="../../images/my-sign.png"></image>
         <view class="title">我的报名</view>
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 @@
 <view class="order">
-  <view class="order-box">
+  <view class="order-box" wx:for="{{orderList}}" wx:key="inedx">
     <view class="order-img">
-      <image src="../../images/center-bg.png"></image>
+      <image src="{{venueUrl}}{{imgRoute}}{{item.venuePanorama}}"></image>
     </view>
     <view class="order-info">
       <view class="venue-project">
-        <view class="venue">场馆场馆场馆场馆</view>
-        <view class="project">篮球</view>
+        <view class="venue">{{item.venuesName}}</view>
+        <view class="project">{{item.projectName}}</view>
       </view>
-      <view class="order-text">订单编号：01010101</view>
-      <view class="order-text">下单时间：2020-01-01</view>
-      <view class="price">￥15元</view>
-    </view>
-  </view>
-  <view class="order-box">
-    <view class="order-img">
-      <image src="../../images/center-bg.png"></image>
-    </view>
-    <view class="order-info">
-      <view class="venue-project">
-        <view class="venue">场馆场馆场馆场馆</view>
-        <view class="project">篮球</view>
-      </view>
-      <view class="order-text">订单编号：01010101</view>
-      <view class="order-text">下单时间：2020-01-01</view>
-      <view class="price">￥15元</view>
+      <view class="order-text">订单编号：{{item.serial}}</view>
+      <view class="order-text">下单时间：{{item.gmtCreate}}</view>
+      <view class="price" wx:if="{{item.price == '0' || item.price == ''}}">￥15元</view>
+      <view class="price" wx:else>￥{{item.price}}元</view>
     </view>
   </view>
 </view>
\ No newline at end of file