From d45e054e99d3632af1132468ef9bb83ea73f3348 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 28 May 2021 18:03:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=BF=E7=94=A8=E4=B8=AD=20vtest=201.1?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation_order/reservation_order.vue        |  5 ++-
 src/pages.json                                     |  2 +-
 src/pages/order_list/order_list.vue                |  2 +-
 .../write_off/confirm_order/confirm_order.vue      |  9 ++++--
 src/pages/write_off/operate/operate.vue            | 17 +++++++---
 .../reservation_people_detail.vue                  | 37 ++++++++++++++++------
 .../reservation_site_detail.vue                    | 36 +++++++++++++++------
 .../device/pages/order_details/order_details.vue   |  1 +
 8 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/src/components/reservation_order/reservation_order.vue b/src/components/reservation_order/reservation_order.vue
index e3fdf65..acaf26a 100644
--- a/src/components/reservation_order/reservation_order.vue
+++ b/src/components/reservation_order/reservation_order.vue
@@ -2,7 +2,9 @@
     <view class="reservation-order" @click="detailChange">
         <view class="ro-header">
             <view class="rh-view">{{orderInfo.stadium_name || '-'}}</view>
-            <text :class="[ 'rh-text', orderInfo.pay_status == 1?'rh-active':'', orderInfo.pay_status == 4?'rh-red':'' ]">{{zh_order_status(orderInfo.pay_status)}}</text>
+            <text 
+                :class="[ 'rh-text', orderInfo.pay_status == 1?'rh-active':'', orderInfo.pay_status == 4?'rh-red':'' ]"
+            >{{zh_order_status(orderInfo.pay_status)}}</text>
         </view>
         <view class="ro-section">
             <view class="rs-line">
@@ -108,6 +110,7 @@ export default {
         zh_order_status(){
             // 订单状态 -1已作废0未支付1已支付待使用2已使用3已失效4已退款
             return status =>{
+                if(status == 8)return '使用中'; // 20210528 新增状态
                 const _obj = {
                     '-1': '已作废',
                     '0': '未支付',
diff --git a/src/pages.json b/src/pages.json
index 4011ded..48ed0e8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -13,7 +13,7 @@
 		{
 			"path": "pages/site/order_list/order_list",
 			"style": {
-				"navigationBarTitleText": "我的预约订单列表"
+				"navigationBarTitleText": "占用场地"
 			}
 		},
 		{
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index d849b9c..ec2121a 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -11,7 +11,7 @@
               </picker>
           </view>
 		  <view class="ol-select-type" v-if="orderType == 10">
-			  <view class="" v-for="(oitem,oi) in selectOrderType" :class="oitem.active?'als-active':''" @click="tabTypeChange(oi)">{{oitem.name}}</view>
+			  <view v-for="(oitem,oi) in selectOrderType" :key="oi" :class="oitem.active?'als-active':''" @click="tabTypeChange(oi)">{{oitem.name}}</view>
 		  </view>
 		  
           <view class="oh-ctrl">
diff --git a/src/pages/write_off/confirm_order/confirm_order.vue b/src/pages/write_off/confirm_order/confirm_order.vue
index 9deee85..dc2dd20 100644
--- a/src/pages/write_off/confirm_order/confirm_order.vue
+++ b/src/pages/write_off/confirm_order/confirm_order.vue
@@ -99,10 +99,12 @@ import { WRITE_OFF_ORDER_INFO } from '../../../js/once_name';
 export default {
     data(){
         return {
-            orderInfo: {}
+            orderInfo: {},
+            type: '' // verify_code -> 5: 验证码核销(商家助手) | decrypt_text -> 6: 扫码核销(商家助手)
         }
     },
-    onLoad(){
+    onLoad(options){
+        if(options.type)this.type = options.type || '';
         util.$_once(WRITE_OFF_ORDER_INFO, data => {
             console.warn(data)
             this.orderInfo = data;
@@ -113,10 +115,11 @@ export default {
             util.routeTo();
         },
         writeOffBtn: util.debounce(function(){
-            let { orderInfo } = this;
+            let { orderInfo, type } = this;
             servers.get({
                 url: API.writeOff.assistantVerify,
                 data: {
+                    verify_type: type == 'verify_code'? 5 : 6,
                     brand_id: orderInfo.brand_id,
                     stadium_id: orderInfo.stadium_id,
                     verify_code: orderInfo.verify_code,
diff --git a/src/pages/write_off/operate/operate.vue b/src/pages/write_off/operate/operate.vue
index 9143622..a78cace 100644
--- a/src/pages/write_off/operate/operate.vue
+++ b/src/pages/write_off/operate/operate.vue
@@ -81,8 +81,16 @@ export default {
                 brand_id: brandInfo.brand.id,
                 stadium_id: curStadium.id,
             }
-            if(!!verify_code)_query['verify_code'] = verify_code;
-            if(!!decrypt_text)_query['decrypt_text'] = decrypt_text;
+            let type = '';
+            if(!!verify_code){
+                _query['verify_code'] = verify_code;
+                type = 'verify_code';
+            }
+            if(!!decrypt_text){
+                type = 'decrypt_text';
+                _query['decrypt_text'] = decrypt_text;
+            }
+            
             util.showLoad();
             servers.get({
                 url: API.writeOff.enterVerifyOrder,
@@ -94,10 +102,9 @@ export default {
                 if(res.data.code == 0){
                     let _data = res.data.data || {}
                     util.$_emit(WRITE_OFF_ORDER_INFO, {..._data})
-                    util.routeTo(`/pages/write_off/confirm_order/confirm_order`, 'nT');
+                    util.routeTo(`/pages/write_off/confirm_order/confirm_order?type=${type}`, 'nT');
                 }else{
-                    if(!!verify_code)return util.routeTo(`/pages/write_off/null/null?type=${'verify_code'}`, 'nT');
-                    if(!!decrypt_text)return util.routeTo(`/pages/write_off/null/null?type=${'decrypt_text'}`, 'nT');
+                    util.routeTo(`/pages/write_off/null/null?type=${type}`, 'nT');
                 }
                 console.log('订单查询---->', res);
             })
diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
index 21367ac..d1dce09 100644
--- a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
+++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- pageInfo.order_type 人次(1) -->
 	<view class="reservation-people">
 		<view class="rp-head">
 			<view class="rh-store">
@@ -48,7 +49,7 @@
 					<view class="ri-section">
 						<view :class="['rs-view',e.status==1?'rs-active':'']">
 							<view>{{e.verify_code || '-'}} ({{zh_verify_status(e.status)}})</view>
-							<view class="s-btn" v-if="e.status == 2" @click="recoverBtn(e)">恢复</view>
+							<view class="s-btn" v-if="e.is_recovery" @click="recoverBtn(e)">恢复</view>
 						</view>
 						<block v-if="e.status==2">
 							<view class="rs-view"><view>核销方式：{{zh_verify_type(e.verify_type)}}</view></view>
@@ -192,6 +193,7 @@ export default {
 		zh_pay_status(){
 		    // 订单状态 1已支付待使用2已使用3已失效4已退款
 		    return status =>{
+				if(status == 8)return '使用中'; // 20210528 新增状态
 		        const _obj = {
 					'0': '未付款',
 		            '1': '待使用',
@@ -203,21 +205,36 @@ export default {
 		    }
 		},
 		zh_verify_type(){
-		    // 核销方式 1/2/3/4 核销码核销/人脸核销/扫码核销/商家扫码
+			/**
+			 * 20210527 新增核销方式
+			 * verify_type: 核销方式
+			 * 1: 验证码核销(pad)2: 人脸验证(pad)3: 扫码验证(pad)4: 扫码器验证(pad)
+			 * 5: 验证码核销(商家助手)6: 扫码核销(商家助手) 7: 扫码器核销(门闸)
+			*/
 		    return status =>{
-		        const _obj = {
-		            '0': '未核销',
-		            '1': '核销码核销',
-		            '2': '人脸核销',
-		            '3': '扫码核销',
-		            '4': '商家扫码',
-		        }
-		        return _obj[`${status}`] || '-'
+				return [
+					'扫码器核销(门闸)',
+					'验证码核销(pad)',
+					'人脸验证(pad)',
+					'扫码验证(pad)',
+					'扫码器验证(pad)',
+					'验证码核销(商家助手)',
+					'扫码核销(商家助手)',
+				][status] ||　'-';
+		        // const _obj = {
+		        //     '0': '未核销',
+		        //     '1': '核销码核销',
+		        //     '2': '人脸核销',
+		        //     '3': '扫码核销',
+		        //     '4': '商家扫码',
+		        // }
+		        // return _obj[`${status}`] || '-'
 		    }
 		},
 		zh_verify_status(){
 			// 核销状态  -1/0/1/2/3/4 已分享/无效/待使用/已核销/已失效/已退款
 			return status =>{
+				if(status == 8)return '使用中'; // 20210528 新增状态
 			    const _obj = {
 					'-1': '已分享',
 			        '0': '无效',
diff --git a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
index c1f990f..2b73536 100644
--- a/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
+++ b/src/subpackage/device/components/order/reservation_site_detail/reservation_site_detail.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- pageInfo.order_type 场次(0) -->
 	<view class="reservation-site">
 		<view class="rs-head">
 			<view class="rh-store">
@@ -121,6 +122,7 @@ export default {
 		zh_pay_status(){
 		    // 订单状态 1已支付待使用2已使用3已失效4已退款
 		    return status =>{
+				if(status == 8)return '使用中'; // 20210528 新增状态
 		        const _obj = {
 					'0': '未付款',
 		            '1': '待使用',
@@ -132,16 +134,32 @@ export default {
 		    }
 		},
 		zh_verify_type(){
-		    // 核销方式 1/2/3/4 核销码核销/人脸核销/扫码核销/商家扫码
+			/**
+			 * 20210527 新增核销方式
+			 * verify_type: 核销方式
+			 * 1: 验证码核销(pad)2: 人脸验证(pad)3: 扫码验证(pad)4: 扫码器验证(pad)
+			 * 5: 验证码核销(商家助手)6: 扫码核销(商家助手) 7: 扫码器核销(门闸)
+			*/
 		    return status =>{
-		        const _obj = {
-		            '0': '未核销',
-		            '1': '核销码核销',
-		            '2': '人脸核销',
-		            '3': '扫码核销',
-		            '4': '商家扫码',
-		        }
-		        return _obj[`${status}`] || '-'
+				return [
+					'扫码器核销(门闸)',
+					'验证码核销(pad)',
+					'人脸验证(pad)',
+					'扫码验证(pad)',
+					'扫码器验证(pad)',
+					'验证码核销(商家助手)',
+					'扫码核销(商家助手)',
+				][status] ||　'-';
+
+		        // const _obj = {
+		        //     '0': '未核销',
+		        //     '1': '核销码核销',
+		        //     '2': '人脸核销',
+		        //     '3': '扫码核销',
+		        //     '4': '商家扫码',
+		        // }
+
+		        // return _obj[`${status}`] || '-'
 		    }
 		},
 		zh_pay_type(){
diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue
index e3f2469..a012793 100644
--- a/src/subpackage/device/pages/order_details/order_details.vue
+++ b/src/subpackage/device/pages/order_details/order_details.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="order-details">
 		<block v-if="optionsQuery.order_type==3">
+			<!-- pageInfo.order_type 场次(0)/人次(1) -->
 			<reservation-site-detail :orderInfo="pageInfo" v-if="pageInfo.order_type == 0"></reservation-site-detail>
 			<reservation-people-detail :orderInfo="pageInfo" v-if="pageInfo.order_type == 1" @recoverBtn="peopleRecoverBtn" @okChange="okChange"></reservation-people-detail>
 		</block>