Merge branch 'dev' of https://git.ouxuan.net/APP/ox_zhiNengZhuShou into dev

src/components/site/order_modal/order_modal.vue

@@ -66,7 +66,7 @@
 			<view class="om-name-line">
 				<view class="onl-view">预订信息</view>
 			</view>
-			<view class="om-info-line">
+			<view class="om-info-line" v-if="orderInfo.type == 'fixed_venue'">
 				<view class="oil-view">固定场名称：</view>
 				<view class="oil-view">
 					<view class="ov-view">{{ orderInfo.fix_name || '-' }}</view>
@@ -94,9 +94,9 @@
 			</view>
 			<view class="om-total" v-if="isShowTotalAmoutn" >实付款 ￥{{ orderInfo.amount || '0' }}</view>
 			<!-- 管理员占用 -->
-			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'">
+			<view class="om-btns" v-if="orderInfo.type == 'take_up_venue'&&orderInfo.overdue != true">
 				<block v-if="orderInfo.pay_status == 0 || orderInfo.pay_status == 1">
-					<view class="ob-view" @click="toShare">分享给朋友</view>
+					<view class="ob-view" @click="toShare" v-if="orderInfo.is_take_up_can_share">分享给朋友</view>
 					<view class="ob-view red" @click="cancelOccupy">取消占用</view>
 				</block>
 			</view>
@@ -113,7 +113,7 @@
 			<view class="om-btns" v-if="orderInfo.type == 'fixed_venue'">
 				<!-- 测试：固定场地没有详情 -->
 				<view class="ob-view" v-if="orderInfo.pay_status != 0" @click="toOrderInfo">订单详情</view>
-				<view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status!=2">取消订场</view>
+				<view class="ob-view red" @click="fixedCancelOccupy" v-if="orderInfo.pay_status==0&&orderInfo.overdue != true">取消订场</view>
 				<!-- <view class="ob-view red">退款</view> -->
 			</view>
 		</view>

src/pages/site/confirm/confirm.vue

@@ -50,12 +50,11 @@
                 </view>
             </view>
         </view>
-        <view class="sc-fixed-bot">
-            <view hover-class="hover-active" @click="confirmOccupy">确定</view>
-        </view>
+        <cover-view class="sc-fixed-bot">
+            <cover-view class="sfb-view" hover-class="hover-active" @click="confirmOccupy">确定</cover-view>
+        </cover-view>
     </view>
 </template>
-
 <script>
 import { mapState } from 'vuex';
 import { API } from '../../../js/api';
@@ -91,7 +90,7 @@ export default {
         confirmOccupy: util.debounce(function(){
             let { storeInfo, dateInfo, venueList, typeInfo } = this.occupyInfo;
             let { ocPrice, ocReaon, light_up } = this;
-            
+            util.showLoad();
             servers.post({
                 url: API.venue.venueTakeUp,
                 data: {
@@ -113,6 +112,7 @@ export default {
                 isDefaultGet: false
             })
             .then(res=>{
+                util.hideLoad();
                 if(res.data.code == 0){
                     
                     util.showNone(res.data.message || '操作成功！');
@@ -130,6 +130,7 @@ export default {
                     util.showNone(res.data.message || '操作失败！');
                 }
             })
+            .catch(util.hideLoad)
 
         }, 300, true),
     },
@@ -299,7 +300,7 @@ export default {
             padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
             padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
             background-color: #fff;
-            >view{
+            .sfb-view{
                 margin: 0 auto;
                 width: 702upx;
                 height: 88upx;

src/pages/site/occupy_success/occupy_success.vue

@@ -37,10 +37,10 @@ export default {
         },
         backBtn(){
             util.routeTo();
-            util.previousPageFunction({ // 刷新占用列表
-                fnName: 'refreshList',
-                query: null
-            })
+            // util.previousPageFunction({ // 刷新占用列表
+            //     fnName: 'refreshList',
+            //     query: null
+            // })
         },
         getPageInfo({
             brand_id,

src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue

@@ -27,7 +27,7 @@
 				<view :class="['rl-code1', orderInfo.pay_status==2?'rl-code2':'', orderInfo.pay_status==3?'rl-code3':'', orderInfo.pay_status==4?'rl-code4':'']" >{{orderInfo.verify_code || '-'}}<text>({{zh_pay_status(orderInfo.pay_status)}})</text></view>
 			</view>
 			<!-- 已使用 -->
-			<block v-if="orderInfo.pay_status==2">
+			<block v-if="orderInfo.pay_status==2 || orderInfo.pay_status==8">
 				<view class="rb-line">
 					<view class="rl-view">核销方式：</view>
 					<text class="rl-text">{{orderInfo.verify_desc || '-'}}</text>
@@ -36,14 +36,17 @@
 					<view class="rl-view">核销时间：</view>
 					<text class="rl-text">{{orderInfo.verify_time || '-'}}</text>
 				</view>
-				<view class="rb-line">
-					<view class="rl-view">离场方式：</view>
-					<text class="rl-text">{{orderInfo.verify_leave_desc || '-'}}</text>
-				</view>
-				<view class="rb-line">
-					<view class="rl-view">离场时间：</view>
-					<text class="rl-text">{{orderInfo.verify_leave_time || '-'}}</text>
-				</view>
+				<block v-if="orderInfo.pay_status==2">
+					<view class="rb-line">
+						<view class="rl-view">离场方式：</view>
+						<text class="rl-text">{{orderInfo.verify_leave_desc || '-'}}</text>
+					</view>
+					<view class="rb-line">
+						<view class="rl-view">离场时间：</view>
+						<text class="rl-text">{{orderInfo.verify_leave_time || '-'}}</text>
+					</view>
+				</block>
+				
 			</block>
 		</view>
 		<view class="rs-box">