From fbea281f163b26d0d98305d2a008b659246149f3 Mon Sep 17 00:00:00 2001
From: wans <747101512@qq.com>
Date: Thu, 16 Jul 2020 14:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/book/book.js     | 12 ++++++++----
 pages/book/book.wxml   |  3 ++-
 pages/order/order.js   |  1 +
 pages/order/order.wxml |  2 +-
 pages/order/order.wxss |  3 +++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/book/book.js b/pages/book/book.js
index 1c2ce8f..9ab872a 100644
--- a/pages/book/book.js
+++ b/pages/book/book.js
@@ -55,8 +55,9 @@ Page({
       bookingItemList : self.data.mySelectItem
     }
     wx.showLoading({
-      title: '请稍等',
-    });
+      title: '请稍等...',
+      mask: true
+    })
     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({
@@ -288,16 +289,18 @@ Page({
     if(!self.checkPhoneNumber()){
       return false;
     }
+    wx.showLoading({
+      title: '请稍等...',
+      mask: true
+    })
     app.restAjax.get(app.restAjax.path('{venueUrl}/api/sms/getverificationcode/' + self.data.phoneNumber, [app.venueUrl]), {}, null, 
       function (code, data) {
         if (code == 200) {
-          console.log(data)
           self.setData({
             gotCode: true
           })
           self.data.timer = setInterval(function () {
             var cur = self.data.restTime - 1
-            console.log(cur)
             if (cur == 0) {
               clearInterval(self.data.timer)
               self.setData({
@@ -310,6 +313,7 @@ Page({
               })
             }
           }, 1000)
+          wx.hideLoading();
         }
       },
       function (code, data) {
diff --git a/pages/book/book.wxml b/pages/book/book.wxml
index 92ec643..38ac246 100644
--- a/pages/book/book.wxml
+++ b/pages/book/book.wxml
@@ -68,7 +68,8 @@
         </view>
         <view class="bottom-info">
           <view>{{item.groundName}}</view>
-          <view>{{item.price == '0' ? '免费' : item.price + '元'}}</view>
+          <view wx:if="{{!item.price}}">免费</view>
+          <view wx:else >{{item.price}}元</view>
         </view>
       </view>
     </view>
diff --git a/pages/order/order.js b/pages/order/order.js
index f19e0c9..a8aae2c 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -22,6 +22,7 @@ Page({
     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) {
+        console.log(data);
         data.rows.forEach(element => {
           element.venuePanorama = element.venuePanorama.split(',')[0]
         });
diff --git a/pages/order/order.wxml b/pages/order/order.wxml
index a7e5539..242b03b 100644
--- a/pages/order/order.wxml
+++ b/pages/order/order.wxml
@@ -11,7 +11,7 @@
       <view class="order-text">订单编号：{{item.serial}}</view>
       <view class="order-text">下单时间：{{item.gmtCreate}}</view>
       <view wx:if="{{item.orderType == '0'}}">
-        <view class="price" wx:if="{{item.price == '0' || item.price == ''}}">￥15元</view>
+        <view class="price" wx:if="{{item.price == '0' || item.price == ''}}">免费</view>
         <view class="price" wx:else>￥{{item.price}}元</view>
       </view>
       <view wx:if="{{item.orderType == '1'}}">
diff --git a/pages/order/order.wxss b/pages/order/order.wxss
index bba20db..2b9f1f5 100644
--- a/pages/order/order.wxss
+++ b/pages/order/order.wxss
@@ -36,6 +36,9 @@
   background:rgba(159,21,18,.1);
   color: #9F1512;
   padding: 0 10rpx;
+  display: flex;
+  align-items: center;
+  font-size: 20rpx;
 }
 .order-text{
   font-size: 30rpx;