From 170260648fc3aa125921ce9791919d4490678be2 Mon Sep 17 00:00:00 2001
From: zmt <mate163@163.com>
Date: Mon, 10 May 2021 11:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A9=E6=89=8B=E7=BA=A6?=
 =?UTF-8?q?=E7=8E=A9=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=E6=96=B0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/organize_order/organize_order.vue   |   4 +-
 src/pages/order_list/order_list.vue                |  61 ++-
 .../order/organize_detail/organize_detail.vue      | 549 +++++++++++++++++++++
 src/subpackage/device/js/device_api.js             |   4 +
 .../device/pages/order_details/order_details.vue   |  23 +-
 src/utils/util.js                                  |   3 +
 6 files changed, 630 insertions(+), 14 deletions(-)

diff --git a/src/components/organize_order/organize_order.vue b/src/components/organize_order/organize_order.vue
index e112bb8..69dac42 100644
--- a/src/components/organize_order/organize_order.vue
+++ b/src/components/organize_order/organize_order.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="timing-order" >
+	<view class="timing-order" @click="toOrderDetails">
 		<view class="ro-header">
 		    <view class="rh-view">{{orderInfo.original_order.extension.stadium_name || '-'}}</view>
 		    <text :class="[ 'rh-text', orderInfo.original_order.pay_status == 0?'rh-active':'' ]">{{zh_order_status(orderInfo.original_order.pay_status)}}</text>
@@ -40,7 +40,7 @@
 		</view>
 		<view class="ro-bot" v-if="orderInfo.original_order.pay_status != 0">
 			<!-- status == End  可发放金额-->
-			<view v-if="orderInfo.status=='End'" class="ro-btn" @click="clickSendAmount">发放金额</view>
+			<!-- <view v-if="orderInfo.status=='End'" class="ro-btn" @click="clickSendAmount">发放金额</view> -->
 			<view class="rb-total">实付款 <text class="rt-txt"> ¥{{orderInfo.original_order.pay_amount || 0}}</text></view>
 		</view>
 	</view>
diff --git a/src/pages/order_list/order_list.vue b/src/pages/order_list/order_list.vue
index 33cd4f7..d849b9c 100644
--- a/src/pages/order_list/order_list.vue
+++ b/src/pages/order_list/order_list.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="order-list">
       <view class="ol-header">
-          <view class="oh-cur-store" v-if="orderType == 3 || orderType == 4 || orderType == 1">
+          <view class="oh-cur-store" v-if="orderType == 3 || orderType == 4 || orderType == 1|| orderType == 10">
               <text>当前门店</text>
               <picker mode="selector" :range="storeList" range-key="name" @change="storeChange">
                 <view class="ocs-store">
@@ -10,6 +10,10 @@
                 </view> 
               </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>
+		  
           <view class="oh-ctrl">
                 <view class="oc-period" @click="showPeriodModal">
                     <text>
@@ -121,10 +125,9 @@
 	]
 	const orgClassify = [   // 约玩tab 全部/计费中/已完成/已退款 [空字符/0/1/4]
 	    {id:'', name:'全部'},
-	 //    {id:0, name:'待使用'},
-	 //    {id:1, name:'已使用'},
-		// {id:2, name:'已失效'},
-		// {id:3, name:'已退款'},
+	    {id:1, name:'已付款'},
+		{id:2, name:'已完成'},
+		{id:4, name:'已退款'},
 	]
     export default {
         components: {
@@ -169,7 +172,7 @@
                     start: '',
                     end: ''
                 },
-                orderType: 3, // 3->预约,4->会员,5->积分,1计时
+                orderType: 3, // 3->预约,4->会员,5->积分,1计时 , 10->约玩
 
                 storeList: [ // 店铺列表
                     { id: '', name: '全部' }
@@ -180,6 +183,21 @@
                 orderInfo: {}, // 订单信息 退款数等
                 orderList: [], // 订单列表
                 page: 1,
+				selectOrderType:[ //约玩订单切换 
+					{
+						name:"发起约玩",
+						active:true,
+						type:"Main"
+					},
+					{
+						name:"参与约玩",
+						active:false,
+						type:"Sub"
+					}
+				],
+				selectedOrderType:"Main",//已选择类型
+				
+				
             }
         },
         onReachBottom(){
@@ -263,6 +281,15 @@
                 this.$nextTick(this.refreshList);
 
             },300,300),
+			//切换订单列表选项卡type
+			tabTypeChange: util.debounce(function(index){
+				for(var i of this.selectOrderType){
+					i.active = false
+				}
+				this.selectOrderType[index].active = true
+				this.selectedOrderType = this.selectOrderType[index].type
+				this.$nextTick(this.refreshList);
+			},300,true),
             storeChange(e){
                 let { value } = e.detail; 
                 let { storeList } = this;
@@ -355,7 +382,13 @@
 					page_size,
 					order_type,
 				}
-				if(this.orderType == "10")postData['type'] = "Main"
+				if(this.orderType == "10"){ //助手约玩订单修改, 按后端荣升0430重写接口重新定制字段.后续后端家兴0507重新接手该接口的修改(涉及约玩订单列表及订单详情)
+					postData['type'] = this.selectedOrderType;
+					postData['filter_start_time'] = begin;
+					postData['filter_end_time'] = end;
+					postData['pay_status'] = status;
+					
+				}
                 servers.get({
                     url: this.getApiUrl(orderType),
                     data: postData,
@@ -370,6 +403,7 @@
                     if(_list.length<=0)return util.showNone('没有更多！');
                     this.page = page;
                     this.orderList = [ ...this.orderList, ..._list ];
+					
                 })
                 .catch(util.hideLoad)
             },
@@ -385,6 +419,7 @@
 			// util.routeTo(`/subpackage/device/pages/order_details/order_details?query=${util.jsonStr(_query)}`,'nT');
 		},
         
+
     }
 </script>
 
@@ -572,4 +607,16 @@
             }
         }
     }
+	//选择订单类型
+	.ol-select-type{
+		width: 750rpx;
+		height: 100rpx;
+		background-color: white;
+		font-size: 32rpx;
+		font-weight: 500;
+		@include centerFlex(space-around);
+		.als-active{
+			color: #009874;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/subpackage/device/components/order/organize_detail/organize_detail.vue b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
index e69de29..297f662 100644
--- a/src/subpackage/device/components/order/organize_detail/organize_detail.vue
+++ b/src/subpackage/device/components/order/organize_detail/organize_detail.vue
@@ -0,0 +1,549 @@
+<template>
+	<view class="timing-details">
+		<view class="td-head">
+			<view class="th-store">
+				<image :src="orderInfo.original_order.extension.stadium_logo || '' "></image>
+				<view>{{orderInfo.original_order.extension.stadium_name || '-'}}</view>
+			</view>
+			<view class="th-line">
+				<view>订单编号：<text>{{orderInfo.order_no || '-'}}</text></view>
+				<view><text :class="[orderInfo.original_order.pay_status == 0?'tl-active':'']">{{yw_order_status(orderInfo.original_order.pay_status)}}</text></view>
+			</view>
+			<view class="th-line">
+				<view>创建时间：<text>{{orderInfo.original_order.created_at || '-'}}</text></view>
+			</view>
+			<view class="th-line">
+				<view>用户昵称：<text>{{orderInfo.user_nickname || '-'}}</text></view>
+			</view>
+			<view class="th-line">
+				<view>约玩类型：<text>{{yw_order_type(orderInfo.type)}}</text></view>
+			</view>
+		</view>
+		<!-- 用户信息 -->
+		<view class="td-box" >
+			<view class="tb-title">用户信息</view>
+			<view class="tb-line">
+				<view>姓名：<text>{{(orderInfo.actual_name|| '-')}}</text></view>
+				<view>身份证：<text>{{orderInfo.id_card || '-'}}</text></view>
+			</view>
+		</view>
+		<!-- 约玩信息 -->
+		<view class="td-box" >
+			<view class="tb-title">约玩信息</view>
+			<view class="tb-line">
+				<view>约玩主题：<text>{{(orderInfo.theme)}}</text></view>
+				<view class="yw-place-box">
+					<view class="yw-title">预定场地：</view>
+					<view class="yw-place">
+						<view v-for="y_item in orderInfo.original_order.sessions">
+							{{y_item.venue_name}} {{y_item.duration}} ( ￥{{y_item.price}}  )
+						</view>
+					</view>
+				</view>
+				<!-- <view>报名费用：<text>{{orderInfo.original_order.sessions[0].price || '-'}}</text></view> -->
+				<!-- <view>订场费用：<text>{{orderInfo.original_order.sessions[0].price || '-'}}</text></view> -->
+			</view>
+		</view>
+		<!-- 报名信息 -->
+		<view class="td-box" v-if="orderInfo.original_order.pay_status==2&&orderInfo.type=='Main'">
+			<view class="tb-title">报名信息</view>
+			<view class="tb-line">
+				<view class="user-images">
+					<view class="u-item" :key="index" v-for="(item,index) in orderInfo.sub_order_data" v-if="(openImages||(!openImages&&index<5))">
+						<image :src="item.user_avatar_url" 	mode=""></image>
+						<text>{{item.user_nickname}}</text>
+					</view>
+
+				</view>
+				<view class="show-ui-all" @click="toggleImages()">
+					<image class="" :class="openImages?'reverse':''" src="../../../../../static/images/icon/retail/dropDown.png" mode=""></image>
+				</view>
+			</view>
+			
+			<view class="bm-info-box">
+				<view class="has_line">报名总金额: <text>{{orderInfo.sign_up_total_amount}}元</text></view>
+				<view class="">已发放: <text>{{orderInfo.amount_already_amount}}元</text></view>
+				<view class="">未发放: <text>{{orderInfo.un_amount_already_amount}}元</text></view>
+			</view>
+			
+			<view class="ff_btn" v-if="orderInfo.status=='End'">
+				<view class="" @click="clickSendAmount">发放金额</view>
+			</view>
+		</view>
+		<!-- 金额小计 -->
+		<view class="td-box">
+			<view class="tb-section " v-if="orderInfo.original_order.pay_status!= 0">
+				<view class="ts-line">
+					<view>金额小计</view>
+					<view>¥{{orderInfo.original_order.amount || 0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>积分抵扣</view>
+					<view>-¥{{orderInfo.original_order.deduction_amount ||0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>折扣金额</view>
+					<view>-¥{{orderInfo.original_order.discount_amount||0}}</view>
+				</view>
+				<view class="ts-line">
+					<view>优惠券优惠</view>
+					<view>-¥{{orderInfo.original_order.coupons_amount || 0}}</view>
+				</view>
+				<view class="ts-total">
+					<view>合计支付：<text>￥</text><text>{{orderInfo.original_order.pay_amount ||0}}</text></view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 支付信息 -->
+		<view class="td-box" v-if="orderInfo.original_order.pay_status == 1||orderInfo.original_order.pay_status == 2">
+			<view class="tb-title">支付信息</view>
+			<view class="tb-line">
+				<view>支付方式：<text>{{zh_pay_type(orderInfo.original_order.pay_type)}}</text></view>
+				<view>支付时间：<text>{{orderInfo.original_order.pay_time || '-'}}</text></view>
+				<view>微信交易号：<text>{{orderInfo.original_order.trade_no || ''}}</text></view>
+			</view>
+		</view>
+		<!-- 退款信息 -->
+		<view class="td-box" v-if="orderInfo.original_order.pay_status == 4">
+			<view class="tb-title">退款信息</view>
+			<view class="tb-line">
+				<view>退款时间：<text>{{orderInfo.original_order.refund_time|| '-'}}</text></view>
+				<view>退款编号：<text>{{orderInfo.original_order.refund_no || '-'}}</text></view>
+				<view>退款金额：<text>{{orderInfo.original_order.refund_amount || ''}}</text></view>
+				<view>退款说明：<text>{{orderInfo.original_order.refund_reason || ''}}</text></view>
+			</view>
+		</view>
+		
+		<!-- <view class="td-btn" @click="isShowEnd = !isShowEnd"  v-if="orderInfo.original_order.pay_status == 0">结束计费</view> -->
+		
+		<!-- 弹框 结束计费 -->
+		<view class="ox-dark-mask" v-if="isShowEnd" @touchmove.stop.prevent="moveHandle">
+			<view class="odm-end-modal">
+				<view class="oem-close">
+					<image src="/static/images/icon/x_close.png" @click="isShowEnd = false"></image>
+				</view>
+				<view class="oem-tit">结束计费</view>
+				<view class="oem-line">操作人：{{orderInfo.end_bill_operator_name || '-'}}</view>
+				<view class="oem-line">时长合计：<text class="ol-txt1">{{orderInfo.extension.duration || '-'}}</text></view>
+				<view class="oem-line">金额合计：<text class="ol-txt2">¥{{orderInfo.amount || '-'}}</text></view>
+				<view class="oem-tips">*<text>请输入金额</text></view>
+				<view class="oem-ipt"><input type="digit" v-model="input_amount"/></view>
+				<view class="oem-btn" hover-class="hover-active" @click="confirmChange" >确认</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import util from '@/utils/util';
+import deviceServer from '../../../js/device_server';
+import deviceApi from '../../../js/device_api';
+
+import { servers } from '@/js/server';
+import { API } from '@/js/api';
+
+import { mapState } from 'vuex';
+export default {
+	props: {
+		orderInfo: {
+			type: Object,
+			default: ()=>({})
+		}
+	},
+	computed: {
+		...mapState(['brandInfo']),
+		yw_order_status(){
+			return status =>{
+				const _obj = {/*  */
+					'1': '已付款',
+					'2': '已完成',
+					'4': '已退款',
+				}
+				return _obj[`${status}`] || '-'
+			}
+		},
+		zh_pay_type(){
+			// 支付类型 0微信支付1支付宝支付2储值卡支付
+			return status =>{
+				const _obj = {
+					'0': '微信支付',
+					'1': '支付宝支付',
+					'2': '储值卡支付',
+					'3': '商家主动结束计费',
+				}
+				return _obj[`${status}`] || '-'
+			}
+		},
+		yw_order_type(){
+			// 约玩类型 type   Main/Sub    发起、参与
+			return status =>{
+				const _obj = {
+					'Main': '发起的约玩',
+					'Sub': '参与的约玩',
+				}
+				return _obj[`${status}`] || '-'
+			}
+		},
+		
+	},
+	data() {
+		return {
+			isShowEnd: false,
+			input_amount: "",
+			userImagesArr:[],
+			openImages:false,
+		}
+	},
+
+	methods: {
+		confirmChange(){
+			let { brandInfo, orderInfo, input_amount } = this
+			if(input_amount == '')return util.showNone('请输入金额！');
+			util.showLoad();
+			this.orderInfo.order_no = "JS20210506171239462527"; //订单号临时修改
+			deviceServer.get({
+			    url: deviceApi.timeOrderEnd,
+			    data: { 
+					brand_id: brandInfo.brand.id,
+					order_no: orderInfo.order_no,
+					pay_amount: parseFloat(input_amount),
+				},
+			    failMsg: '加载失败！'
+			})
+			.then(res=>{
+			    util.hideLoad()
+				util.showNone('操作成功！');
+				this.isShowEnd = false
+				setTimeout(()=>uni.navigateBack(),1200);
+			})
+		},
+		
+		toggleImages(){
+			this.openImages=!this.openImages
+		},
+		clickSendAmount(){
+			let that = this
+			console.log(999,this.orderInfo)
+			uni.showModal({
+			    title: '发放金额',
+			    content: `确定要将未发放金额${that.orderInfo.un_amount_already_amount}全部转给约玩发起人?`,
+				confirmColor:"#469576",
+			    success: function (res) {
+			        if (res.confirm) {
+			            console.log('用户点击确定');
+						servers.get({
+						    url: API.amountIssued,
+						    data: {
+						        order_no: that.orderInfo.order_no,
+						    },
+						    failMsg: '加载失败！'
+						})
+						.then(res=>{
+							console.log(888,res);
+							util.showNone("发放成功")
+							setTimeout(()=>uni.navigateBack(),1200);
+						}).catch(e=>{
+							util.showNone("发放失败")
+						})
+						
+			        } else if (res.cancel) {
+			            console.log('用户点击取消');
+			        }
+			    }
+			});
+		
+		}
+	}
+}
+</script>
+
+<style lang="scss" >
+@import '~style/public.scss';
+.timing-details{
+	margin-bottom: 24rpx;
+	.td-head{
+		margin: 24rpx 24rpx 0rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		border-radius: 10rpx 10rpx 0px 0px;
+		.th-store{
+			padding-bottom: 26rpx;
+			margin-bottom: 18rpx;
+			border-bottom: 2rpx solid #D8D8D8;
+			display: flex;
+			justify-content: flex-start;
+			>image{
+				flex-shrink: 0;
+				width: 40rpx;
+				height: 40rpx;
+				background-color: skyblue;
+				
+			}
+			>view{
+				flex-grow: 1;
+				margin-left: 14rpx;
+				color: #333333;
+				font-size: 28rpx;
+			}
+		}
+		.th-line{
+			margin-top: 8rpx;
+			@include centerFlex(space-between);
+			>view{
+				line-height: 40rpx;
+				font-size: 28rpx;
+				&:first-child{
+					color: #9A9A9D;
+					>text{
+						color: #333333;
+					}
+				}
+				&:nth-child(2){
+					>text{
+						color: #9A9A9D;
+					}
+					.tl-active{
+						color: #009874;
+					}
+				}
+			}
+		}
+	}
+	.td-box{
+		margin: 24rpx 24rpx 0rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		border-radius: 10rpx;
+		.tb-title{
+			color: #9A9A9D;
+			font-size: 28rpx;
+			margin-bottom: 20rpx;
+		}
+		.tb-line{
+
+			.user-images{
+				display: flex;
+				flex-direction: row;
+				justify-content: flex-start;
+				align-items: center;
+				flex-wrap: wrap;
+				
+				.u-item{
+					width: 120rpx;
+					flex-direction: column;
+					@include centerFlex(center);
+					margin-left: 6rpx;
+					image{
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+						// background-color: red;
+						// border: 4rpx solid #009876;
+					}
+					text{
+						font-weight: 400;
+						color: #333333;
+						font-size: 24rpx;
+						text-overflow: ellipsis;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+						word-break: break-all;
+						overflow: hidden;
+						display: -webkit-box;
+					}
+				}
+			}
+			.show-ui-all{
+				width: 100%;
+				text-align: center;
+				.reverse{
+					transform: rotateX(180deg);
+				}
+				image{
+					display: inline-block;
+					width: 24rpx;
+					height: 24rpx;
+				}
+			}
+
+			
+			>view{
+				line-height: 52rpx;
+				font-size: 28rpx;
+				color: #9A9A9D;
+				>text{
+					color: #333333;
+				}
+			}
+			
+		}
+		.tb-section{
+			.has_line{
+				padding-top: 30rpx;
+				border-top: 2rpx solid #D8D8D8;
+			}
+			.ts-line{
+				margin-top: 26rpx;
+				@include centerFlex(space-between);
+				>view{
+					color: #333333;
+					&:first-child{
+						font-size: 28rpx;
+					}
+					&:nth-child(2){
+						font-size: 24rpx;
+						margin-right: 8rpx;
+					}
+				}
+			}
+			.ts-total{
+				margin-top: 22rpx;
+				@include centerFlex(flex-end);
+				>view{
+					color: #333333;
+					font-size: 28rpx;
+					>text{
+						color: #FF873D;
+						&:first-child{
+							font-size: 28rpx;
+						}
+						&:nth-child(2){
+							font-size: 36rpx;
+							margin-right: 8rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.td-btn{
+		height: 112rpx;
+		margin: 80rpx 24rpx;
+		border-radius: 10rpx;
+		background-color: #009874;
+		color: #FFF;
+		font-size: 32rpx;
+		line-height: 112rpx;
+		text-align: center;
+	}
+	.odm-end-modal{
+		position: absolute;
+		left: 65rpx;
+		top: 12%;
+		background-color: #fff;
+		width: 620rpx;
+		padding: 30rpx 0rpx 80rpx;
+		border-radius: 10rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.oem-close{
+			width: 100%;
+			@include centerFlex(flex-end);
+			>image{
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 30rpx;
+			}
+		}
+		.oem-tit {
+			color: #333;
+			font-size: 32rpx;
+			font-weight: 700;
+			margin: 16rpx 0rpx 34rpx;
+		}
+		.oem-line{
+			width: 456rpx;
+			color: #333;
+			font-size: 28rpx;
+			line-height: 48rpx;
+			.ol-txt1{
+				color: #009874;
+			}
+			.ol-txt2{
+				color: #FF873D;
+			}
+		}
+		.oem-tips{
+			width: 456rpx;
+			margin: 34rpx 0rpx 8rpx;
+			color: #EA5061;
+			font-size: 28rpx;
+			>text{
+				color: #333333;
+			}
+		}
+		.oem-ipt{
+			width: 456rpx;
+			border: 2rpx solid #D8D8D8;
+			border-radius: 10rpx;
+			& input {
+				flex-grow: 1;
+				height: 88rpx;
+				color: #333;
+				font-size: 28rpx;
+				padding: 0rpx 20rpx;
+			}
+		}
+		.oem-btn{
+			width: 240rpx;
+			height: 88rpx;
+			margin-top: 60rpx;
+			border-radius: 10rpx;
+			background-color: #009874;
+			color: #FFF;
+			font-size: 32rpx;
+			line-height: 88rpx;
+			text-align: center;
+		}
+	}
+}
+
+.ff_btn{
+	width: 100%;
+	margin-top: 20rpx;
+	@include centerFlex(center);
+	>view{
+		@include centerFlex(center);
+		width: 500rpx;
+		height: 112rpx;
+		background: #009874;
+		border-radius: 10rpx;
+		color: white;
+	}
+}
+.bm-info-box{
+	color: #333333;
+	font-size: 28rpx;
+	>view{
+		margin-bottom: 20rpx;
+	}
+	.has_line{
+		padding-top: 30rpx;
+		border-top: 2rpx solid #D8D8D8;
+	}
+	text{
+		margin-left: 20rpx;
+		color: #FF873D;
+	}
+}
+.yw-place-box{
+	@include centerFlex(flex-start);
+	align-items: flex-start;
+	.yw-title{
+		color: #9A9A9D;
+		font-size: 28rpx;
+	}
+	.yw-place{
+		width: 500rpx;
+		height: auto;
+		@include centerFlex(flex-start);
+		flex-direction: column;
+		align-items: flex-start;
+		color: #333333;
+	}
+}
+
+</style>
diff --git a/src/subpackage/device/js/device_api.js b/src/subpackage/device/js/device_api.js
index 103a00d..5222485 100644
--- a/src/subpackage/device/js/device_api.js
+++ b/src/subpackage/device/js/device_api.js
@@ -34,6 +34,10 @@ export const DEVICE_API = {
 	iccardList:`${ORIGIN}/admin/assistant/iccard/list`,                //k-ic卡列表
 	timeOrderDetail:`${ORIGIN}/admin/assistant/timeOrder/detail`,      //k-订单管理-计时订单详情
 	timeOrderEnd:`${ORIGIN}/admin/assistant/timeOrder/end`,            //k-订单管理-订单计时结束
+	
+	//2021/0507
+	organizeOrderDetail:`${ORIGIN}/assistant/gaPlayTogetherOrder/get`, //助手约玩订单详情
+	
 }
 
 export default DEVICE_API;
\ No newline at end of file
diff --git a/src/subpackage/device/pages/order_details/order_details.vue b/src/subpackage/device/pages/order_details/order_details.vue
index d9fed51..a29535b 100644
--- a/src/subpackage/device/pages/order_details/order_details.vue
+++ b/src/subpackage/device/pages/order_details/order_details.vue
@@ -5,6 +5,7 @@
 			<reservation-people-detail :orderInfo="pageInfo" v-if="pageInfo.order_type == 1" @okChange="okChange"></reservation-people-detail>
 		</block>
 		<timing-detail :orderInfo="pageInfo" v-if="optionsQuery.order_type==1"></timing-detail>
+		<organize-detail :orderInfo="pageInfo" v-if="optionsQuery.order_type==10"></organize-detail>
 	</view>
 </template>
 
@@ -12,6 +13,8 @@
 	import timingDetail from '../../components/order/timing_detail/timing_detail.vue'
 	import reservationSiteDetail from '../../components/order/reservation_site_detail/reservation_site_detail.vue';
 	import reservationPeopleDetail from '../../components/order/reservation_people_detail/reservation_people_detail.vue';
+	import organizeDetail from '../../components/order/organize_detail/organize_detail.vue';
+	
 	import util from '@/utils/util';
 	import deviceServer from '../../js/device_server';
 	import deviceApi from '../../js/device_api';
@@ -21,6 +24,7 @@
 			'timing-detail': timingDetail,
 			'reservation-site-detail': reservationSiteDetail,
 			'reservation-people-detail': reservationPeopleDetail,
+			'organize-detail': organizeDetail,
 		},
 		computed:{
 		    titleName(){
@@ -29,7 +33,7 @@
 		        if(optionsQuery.order_type == 3)return '预约订单详情';  //PM: 2021/4/19 已做
 		        if(optionsQuery.order_type == 4)return '储值卡订单详情';
 		        if(optionsQuery.order_type == 5)return '积分商城订单详情';
-				if(optionsQuery.order_type == 10)return '约玩订单详情';
+				if(optionsQuery.order_type == 10)return '约玩订单详情'; 
 		        return '订单详情'
 		    },
 		    ...mapState(['brandInfo']),
@@ -44,8 +48,10 @@
 			}
 		},
 		onLoad(options) {
+			console.log(options)
 			let _query = util.jsonPar(options.query);
 			this.optionsQuery = _query
+			console.log(_query)
 			this.$nextTick(_=>{
 			    uni.setNavigationBarTitle({
 			        title: this.titleName
@@ -61,15 +67,22 @@
 			getApiUrl(type){
 				if(type == 1)return deviceApi.timeOrderDetail;
 			    if(type == 3)return deviceApi.reservationDetail;
+				if(type == 10)return deviceApi.organizeOrderDetail; 
+				
 			},
 			getPageInfo({orderType, stadium_id, order_no}){
 				util.showLoad();
+				let postData = {
+					stadium_id,
+					order_no
+				}
+				if(orderType == 10){
+					// postData['stadium_id'] = "151"
+					// postData['order_no'] = "JS20210506171239462527"
+				}
 				deviceServer.get({
 				    url: this.getApiUrl(orderType),
-				    data: { 
-						stadium_id,
-						order_no,
-					},
+				    data: postData,
 				    failMsg: '加载失败！'
 				})
 				.then(res=>{
diff --git a/src/utils/util.js b/src/utils/util.js
index c0edb75..4a9722d 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -334,6 +334,9 @@ function changeLowerCase(str){
   return str.toString().toLocaleLowerCase();
 }
 
+function getFilterJson(obj){
+	return obj
+}
 export default {
   formatTime,
   formatNumber,