diff --git a/package-lock.json b/package-lock.json
index c2187ad..f9e1fdf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2773,11 +2773,46 @@
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
+        "chalk": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "hash-sum": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
           "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
           "dev": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.2.0",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz",
+          "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -14071,50 +14106,6 @@
         "vue-style-loader": "^4.1.0"
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
-      "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "hash-sum": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
-      }
-    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
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/static/images/icon/retail/alipay.png b/src/static/images/icon/retail/alipay.png
new file mode 100644
index 0000000..ac4640e
Binary files /dev/null and b/src/static/images/icon/retail/alipay.png differ
diff --git a/src/static/images/icon/retail/card.png b/src/static/images/icon/retail/card.png
new file mode 100644
index 0000000..d077fec
Binary files /dev/null and b/src/static/images/icon/retail/card.png differ
diff --git a/src/static/images/icon/retail/cash.png b/src/static/images/icon/retail/cash.png
new file mode 100644
index 0000000..c95d079
Binary files /dev/null and b/src/static/images/icon/retail/cash.png differ
diff --git a/src/static/images/icon/retail/choose.png b/src/static/images/icon/retail/choose.png
new file mode 100644
index 0000000..be2b30b
Binary files /dev/null and b/src/static/images/icon/retail/choose.png differ
diff --git a/src/static/images/icon/retail/close.png b/src/static/images/icon/retail/close.png
new file mode 100644
index 0000000..d8cc22a
Binary files /dev/null and b/src/static/images/icon/retail/close.png differ
diff --git a/src/static/images/icon/retail/noChoose.png b/src/static/images/icon/retail/noChoose.png
new file mode 100644
index 0000000..bcf8871
Binary files /dev/null and b/src/static/images/icon/retail/noChoose.png differ
diff --git a/src/static/images/icon/retail/other.png b/src/static/images/icon/retail/other.png
new file mode 100644
index 0000000..1e5fcea
Binary files /dev/null and b/src/static/images/icon/retail/other.png differ
diff --git a/src/static/images/icon/retail/turn.png b/src/static/images/icon/retail/turn.png
new file mode 100644
index 0000000..0dd7bba
Binary files /dev/null and b/src/static/images/icon/retail/turn.png differ
diff --git a/src/static/images/icon/retail/wechat.png b/src/static/images/icon/retail/wechat.png
new file mode 100644
index 0000000..2d297ad
Binary files /dev/null and b/src/static/images/icon/retail/wechat.png differ
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 184c42d..d3e9e33 100644
--- a/src/subpackage/device/js/device_api.js
+++ b/src/subpackage/device/js/device_api.js
@@ -37,6 +37,10 @@ export const DEVICE_API = {
 
     // 20210521 恢复次卡核销状态
     recoveryToSuccess:`${ORIGIN}/admin/stadium/order/recoveryToSuccess`,            // 恢复次卡核销状态
+	
+	//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 29caa90..e3f2469 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" @recoverBtn="peopleRecoverBtn" @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
@@ -65,15 +71,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/subpackage/retail/components/retail_pay_way/retail_pay_way.vue b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
new file mode 100644
index 0000000..5f14a20
--- /dev/null
+++ b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
@@ -0,0 +1,498 @@
+<template>
+	<view class="content" v-if="show">
+		<view class="win-mask"></view>
+		
+		<view class="win-operate">
+			<image mode="aspectFit" src="/static/images/icon/retail/close.png" @click="onClose"></image>
+			<text class="win-title">{{ curChoose.name == "储蓄卡支付" ? "请选择储蓄卡" : "请选择支付方式" }}</text>
+			
+			<view class="win-way" v-if="curChoose.name!='储蓄卡支付'?true:false">
+				<view class="win-way-item" v-for="(item, index) in payWayList" :key="index"  @click="onPayWayClick(item, index)">
+					<image :class="[item.iconClassA, item.iconClassB]" mode="aspectFit" :src="item.icon"></image>
+					<text>{{ item.name }}</text>
+					<input v-if="item.inputShow" v-model="item.inputValue" :placeholder="item.placeholderLabel" placeholder-style="win-way-item-input-placeholder">
+					<image :class="[item.markClassA, item.markClassB]" mode="aspectFit" :src="item.mark"></image>
+					<view></view>
+				</view>
+			</view>
+			<view class="win-card" v-if="curChoose.name=='储蓄卡支付'?true:false">
+				<view class="win-card-search">
+					<image v-if="searchCardValue?false:true" mode="aspectFit" src="/static/images/icon/retail/search.png"></image>
+					<input v-model="searchCardValue" @confirm="searchCardList" placeholder="请输入微信昵称/手机号码/储蓄卡号搜索" placeholder-style="win-card-search-input-placeholder">
+				</view>
+				<view class="win-card-list">
+					<view class="win-card-list-item" v-for="(item, index) in cardList" :key="index" @click="onCardClick(item)">
+						<view>储蓄卡卡号：<text :style="{color:item.color.card_no}">{{ item.card_no }}</text></view>
+						<view>微信昵称：<text :style="{color:item.color.nickname}">{{ item.nickname }}</text></view>
+						<view>手机号码：<text :style="{color:item.color.mobile}">{{ item.mobile }}</text></view>
+						<view>卡名称：<text :style="{color:item.color.card_name}">{{ item.card_name }}</text></view>
+						<view>卡余额：<text :style="{color:item.color.balance}">￥{{ item.balance }}</text></view>
+						<image mode="aspectFit" :src="item.mark"></image>
+					</view>
+				</view>
+			</view>
+			
+			<view class="win-way-confirm"><button hover-class="hover-active" @click="onConfirm">确定</button></view>
+			<view class="win-iphonex-block"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import util from '../../../../utils/util.js';
+	import tools from '../../js/tools.js';
+	import retailServer from '../../js/retail_server';
+	import retailApi from '../../js/retail_api';
+	
+	export default {
+		props: [
+			"show", "price", "storeId"
+		],
+		data() { 
+			return {
+				cardList: [],		// 储蓄卡列表
+				payWayList: [],	// 支付方式列表
+				choosePath: "/static/images/icon/retail/choose.png",
+				noChoosePath: "/static/images/icon/retail/noChoose.png",
+				curChoose: {},
+				curCardChoose: null,
+				searchCardValue: "",
+			}
+		},
+		created() {
+			this.createPayWayList();	// 创建支付方式列表
+		},
+		methods: {
+			// 储蓄卡点击
+			onCardClick(item) {
+				this.curCardChoose = item;
+				
+				for (let i = 0; i < this.cardList.length; ++i) {
+					this.cardList[i].mark = this.noChoosePath;
+				}
+				
+				this.curCardChoose.mark = this.choosePath;
+			},
+			
+			// 获取储蓄卡列表
+			searchCardList() {
+				if (!this.searchCardValue) {
+					util.showNone("请输入微信昵称/手机号码/储蓄卡号搜索");
+					return;
+				}
+				
+				let _this = this;
+				this.cardList = [];
+				
+				util.showLoad();
+				retailServer.get({
+					url: retailApi.assistantGetValueCardList,
+					data: {
+						stadium_id: this.storeId,
+						key: this.searchCardValue,
+						total_amount: this.price
+					},
+					isDefaultGet: false,
+					failMsg: '搜索失败！'
+				}).then(res => {
+					util.hideLoad();
+					if (res.data.code == 0) {
+						let color = "rgba(51, 51, 51, 1)";
+						for (let i = 0; i < res.data.data.length; ++i) {
+							_this.cardList.push(res.data.data[i]);
+							_this.cardList[i].mark = this.noChoosePath;
+							_this.cardList[i].color = {
+								card_no: color, nickname: color, mobile: color, card_name: color, balance: color
+							};
+							
+							for (let j = 0; j < res.data.data[i].match_key_fields.length; ++j) {
+								_this.cardList[i].color[res.data.data[i].match_key_fields[j]] = "rgba(0, 152, 118, 1)";
+							}
+						}
+						
+						if (_this.cardList.length) {
+							_this.cardList[0].mark = _this.choosePath;
+							this.curCardChoose = _this.cardList[0];
+						}
+						else {
+							util.showNone("查询不到该储蓄卡信息，请检查重新输入");
+						}
+					}
+					else {
+						util.showNone(res.data.message || '操作失败！');
+					}
+				});
+			},
+			
+			// 重置数据
+			resetData() {
+				for (let i = 0; i < this.payWayList.length; ++i) {
+					this.payWayList[i].inputValue = "";
+					
+					if (this.payWayList[i].name != "储蓄卡支付") {
+						this.payWayList[i].mark = this.noChoosePath;
+					}
+				}
+				
+				this.payWayList[0].mark = this.choosePath;
+				this.curChoose = this.payWayList[0];
+				this.curCardChoose = null;
+				this.cardList = [];
+				this.searchCardValue = "";
+			},
+			
+			// 关闭窗口
+			onClose() {
+				this.resetData();	// 重置数据
+				this.$emit("update:onClose", false);
+			},
+			
+			// 支付确定
+			onConfirm() {
+				let info = {
+					type: 0,
+					inputValue: "default",
+					cardNo: "default"
+				};
+				
+				switch (this.curChoose.name) {
+					case "微信支付": {
+						info.type = 0;
+					} break;
+					case "支付宝支付": {
+						info.type = 1;
+					} break;
+					case "现金支付": {
+						info.type = 3;
+					} break;
+					case "其他": {
+						if (!this.curChoose.inputValue) {
+							util.showNone("请输入其他支付方式！");
+							return;
+						}
+						
+						info.type = 4;
+						info.inputValue = this.curChoose.inputValue;
+					} break;
+					case "储蓄卡支付": {
+						if (!this.curCardChoose) {
+							util.showNone("请搜索选择储蓄卡！");
+							return;
+						}
+						
+						info.type = 2;
+						info.cardNo = this.curCardChoose.card_no;
+					} break;
+				}
+				
+				this.onClose();
+				this.$emit("update:onConfirm", info);
+			},
+			
+			// 支付方式点击
+			onPayWayClick(item, index) {
+				this.curChoose = item;
+				
+				if (item.name != "储蓄卡支付") {
+					for (let i = 0; i < this.payWayList.length; ++i) {
+						if (this.payWayList[i].name != "储蓄卡支付") {
+							this.payWayList[i].mark = this.noChoosePath;
+						}
+					}
+					
+					this.payWayList[index].mark = this.choosePath;
+				}
+				else {
+					
+				}
+			},
+			
+			// 创建支付方式列表
+			createPayWayList() {
+				this.payWayList = [
+					{
+						type: 0, name: "微信支付", inputShow: false, inputValue: "",
+						icon: "/static/images/icon/retail/wechat.png",
+						iconClassA: "win-way-item-icon", iconClassB: "",
+						placeholderLabel: "请输入其他支付方式",
+						mark: this.choosePath,
+						markClassA: "win-way-item-mark", markClassB: "",
+					},
+					{
+						type: 1, name: "支付宝支付", inputShow: false, inputValue: "",
+						icon: "/static/images/icon/retail/alipay.png",
+						iconClassA: "win-way-item-icon", iconClassB: "",
+						placeholderLabel: "请输入其他支付方式",
+						mark: this.noChoosePath,
+						markClassA: "win-way-item-mark", markClassB: "",
+					},
+					{
+						type: 3, name: "现金支付", inputShow: false, inputValue: "",
+						icon: "/static/images/icon/retail/cash.png",
+						iconClassA: "win-way-item-icon", iconClassB: "win-way-item-icon-dif",
+						placeholderLabel: "请输入其他支付方式",
+						mark: this.noChoosePath,
+						markClassA: "win-way-item-mark", markClassB: "",
+					},
+					{
+						type: 2, name: "储蓄卡支付", inputShow: false, inputValue: "",
+						icon: "/static/images/icon/retail/card.png",
+						iconClassA: "win-way-item-icon", iconClassB: "win-way-item-icon-dif",
+						placeholderLabel: "请输入其他支付方式",
+						mark: "/static/images/icon/retail/turn.png",
+						markClassA: "win-way-item-mark", markClassB: "win-way-item-mark-dif",
+					},
+					{
+						type: 4, name: "其他", inputShow: true, inputValue: "",
+						icon: "/static/images/icon/retail/other.png",
+						iconClassA: "win-way-item-icon", iconClassB: "",
+						placeholderLabel: "请输入其他支付方式",
+						mark: this.noChoosePath,
+						markClassA: "win-way-item-mark", markClassB: "",
+					},
+				];
+				
+				this.curChoose = this.payWayList[0];
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0%;
+		left: 0;
+		overflow: hidden;
+	}
+	
+	.win-mask {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		background-color: rgba(0, 0, 0, 0.5);
+	}
+	
+	.win-operate {
+		width: 100%;
+		height: 964rpx;
+		position: fixed;
+		bottom: 0%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		background-color: white;
+		padding-top: 46rpx;
+		
+		> image {
+			width: 34rpx;
+			height: 34rpx;
+			position: absolute;
+			top: 32rpx;
+			right: 28rpx;
+		}
+		
+		> text {
+			width: 100%;
+			color: rgba(51, 51, 51, 1);
+			font-size: 32rpx;
+			text-align: center;
+			margin-bottom: 54rpx;
+		}
+		
+		.win-way {
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			position: relative;
+			
+			.win-way-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				padding-left: 40rpx;
+				padding-right: 36rpx;
+				padding-top: 28rpx;
+				padding-bottom: 28rpx;
+				position: relative;
+				
+				.win-way-item-icon {
+					width: 54rpx;
+					height: 54rpx;
+					flex-shrink: 0;
+				}
+				.win-way-item-mark {
+					width: 36rpx;
+					height: 36rpx;
+					flex-shrink: 0;
+				}
+				.win-way-item-icon-dif {
+					width: 52rpx;
+					height: 52rpx;
+					flex-shrink: 0;
+				}
+				.win-way-item-mark-dif {
+					width: 34rpx;
+					height: 34rpx;
+					flex-shrink: 0;
+				}
+				
+				> text {
+					color: rgba(24, 24, 24, 1);
+					font-size: 28rpx;
+					flex-grow: 1;
+					flex-shrink: 0;
+					margin-left: 16rpx;
+					margin-right: 16rpx;
+				}
+				
+				> view {
+					width: 90%;
+					height: 1rpx;
+					background-color: rgba(216, 216, 216, 1);
+					position: absolute;
+					bottom: 0%;
+					right: 0%;
+				}
+				
+				> input {
+					margin-left: 24rpx;
+					margin-right: 132rpx;
+					width: 340rpx;
+					border-radius: 10rpx;
+					border: 2rpx solid rgba(216, 216, 216, 1);
+					background-color: white;
+					padding-left: 16rpx;
+					padding-right: 16rpx;
+					padding-top: 10rpx;
+					padding-bottom: 10rpx;
+					font-size: 28rpx;
+				}
+				
+				.win-way-item-input-placeholder {
+					color: rgba(154, 154, 157, 1);
+					font-size: 28rpx;
+				}
+			}
+		}
+		
+		.win-way-confirm {
+			width: 100%;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			position: absolute;
+			bottom: 0%;
+			bottom: calc( 0% + constant(safe-area-inset-bottom));
+			bottom: calc( 0% + env(safe-area-inset-bottom));
+			
+			> button {
+				width: 100%;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 10rpx;
+				padding: 0 0;
+				color: rgb(255,255,255);
+				background-color: rgb(0,152,116);
+			}
+		}
+		
+		.win-iphonex-block {
+			background-color: white;
+			width: 100%;
+			height: constant(safe-area-inset-bottom);
+			height: env(safe-area-inset-bottom);
+			poisition: absolute;
+			bottom: 0%;
+		}
+		
+		.win-card {
+			width: 100%;
+			height: 100%;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding-left: 20rpx;
+			padding-right: 20rpx;
+			
+			.win-card-search {
+				width: 100%;
+				border-radius: 10rpx;
+				background-color: rgba(242, 242, 247, 1);
+				margin-bottom: 30rpx;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				
+				> image {
+					width: 40rpx;
+					height: 40rpx;
+					flex-shrink: 0;
+					margin-left: 20rpx;
+				}
+				
+				> input {
+					font-size: 32rpx;
+					padding-left: 20rpx;
+					padding-right: 20rpx;
+					padding-top: 24rpx;
+					padding-bottom: 24rpx;
+					flex-grow: 1;
+				} 
+				
+				.win-card-search-input-placeholder {
+					font-size: 32rpx;
+					color: rgba(156, 156, 159, 1);
+				}
+			}
+			
+			.win-card-list {
+				width: 100%;
+				height: 100rpx;
+				overflow: scroll;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				position: relative;
+				flex-grow: 1;
+				margin-bottom: 112rpx;
+				
+				.win-card-list-item {
+					display: flex;
+					flex-direction: column;
+					width: 100%;
+					border: 1rpx solid rgba(151, 151, 151, 1);
+					border-radius: 10rpx;
+					padding: 20rpx;
+					margin-bottom: 24rpx;
+					position: relative;
+					flex-shrink: 0;
+					
+					> view {
+						color: rgba(156, 156, 159, 1);
+						font-size: 28rpx;
+						margin-bottom: 5rpx;
+						
+						> text {
+							color: rgba(51, 51, 51, 1);
+							font-size: 28rpx;
+						}
+					}
+					
+					> image {
+						width: 36rpx;
+						height: 36rpx;
+						position: absolute;
+						top: 50%;
+						right: 20rpx;
+						transform: translate(0%, -50%);
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/src/subpackage/retail/js/retail_api.js b/src/subpackage/retail/js/retail_api.js
index 846c7fc..9d5375b 100644
--- a/src/subpackage/retail/js/retail_api.js
+++ b/src/subpackage/retail/js/retail_api.js
@@ -5,7 +5,8 @@ export const RETAIL_API = {
 	assistantListErpGoods:`${ORIGIN}/admin/assistant/listErpGoods`,  //  物品管理
 	assistantListErpGoodsCate:`${ORIGIN}/admin/assistant/listErpGoodsCate`,  //  物品分类管理
 	assistantGetAssistantStadiums:`${ORIGIN}/admin/assistant/getAssistantStadiums`,  //  店铺列表
-	assistantListErpGoodsCateAndGoods:`${ORIGIN}/admin/assistant/listErpGoodsCateAndGoods`,  //  物品分类物品列表
+	assistantListErpGoodsCateAndGoods:`${ORIGIN}/admin/assistant/listErpGoodsCateAndGoods`,  //  分类物品列表
+	assistantGetValueCardList:`${ORIGIN}/admin/assistant/getValueCardList`,  //  搜索储蓄卡
 }
 
 export default RETAIL_API;
\ No newline at end of file
diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
index 28f69a9..23fbfc2 100644
--- a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
+++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
@@ -39,6 +39,12 @@
 				</view>
 			</view>
 		</view>
+		
+		<retailPayWay 
+			:show="retailPayWayWin.show" :price="totalPrice" :storeId="curStore.id"
+			@update:onClose="showOrHidePayWay" @update:onConfirm="goodsRetail"
+		>
+		</retailPayWay>
 	</view>
 </template>
 
@@ -48,7 +54,12 @@
 	import retailServer from '../../js/retail_server';
 	import retailApi from '../../js/retail_api';
 	
+	import retailPayWay from '../../components/retail_pay_way/retail_pay_way.vue';
+	
 	export default {
+		components: {
+		  'retailPayWay': retailPayWay
+		},
 		data() {
 			return {
 				isEdited: false,		// 是否处于编辑模式
@@ -59,6 +70,10 @@
 				cartListScroll: false,				// 购物车列表是否能滚动
 				cartListFinalHeight: "0rpx",	// 最终显示的列表高度
 				cartListFinalPaddingBottom: "0rpx",	// 根据是否是异形屏来设置
+				
+				retailPayWayWin: {
+					show: false,
+				},
 			}
 		},
 		onLoad(option) {
@@ -80,20 +95,19 @@
 			setTimeout(util.hideLoad, 1000);
 		},
 		methods: {
+			// 显示隐藏支付方式弹窗
+			showOrHidePayWay(status) {
+				this.retailPayWayWin.show = status;
+			},
+			
 			// 重新编辑
 			cartReedit() {
 				this.isEdited = true;
 				this.cartConfirmText = "确认";
 			},
 			
-			// 确认 || 收款出库
-			cartConfirm() {
-				if (this.cartConfirmText == "确认") {
-					this.isEdited = false;
-					this.cartConfirmText = "收款出库";
-					return;
-				}
-				
+			// 商品出库
+			goodsRetail(info) {
 				let _this = this;
 				let data = [];
 				for (let i = 0; i < this.cartListFinal.length; ++i) {
@@ -113,13 +127,22 @@
 					return;
 				}
 				
+				let newData = {
+					store_id: _this.curStore.id,
+					goods_data: data,
+					pay_type: info.type,
+				};
+				if (info.inputValue) {
+					newData["other_pay_type"] = info.inputValue;
+				}
+				if (info.cardNo) {
+					newData["card_no"] = info.cardNo;
+				}
+				
 				util.showLoad();
 				retailServer.post({
 					url: retailApi.assistantRetail,
-					data: {
-						store_id: _this.curStore.id,
-						goods_data: data,
-					},
+					data: newData,
 					isDefaultGet: false,
 					failMsg: '出库失败！'
 				}).then(res => {
@@ -147,6 +170,31 @@
 				});
 			},
 			
+			// 确认 || 收款出库
+			cartConfirm() {
+				if (this.cartConfirmText == "确认") {
+					this.isEdited = false;
+					this.cartConfirmText = "收款出库";
+					return;
+				}
+				
+				let mark = false;
+				for (let i = 0; i < this.cartListFinal.length; ++i) {
+					if (this.cartListFinal[i].count) {
+						mark = true;
+						break;
+					}
+				}
+				
+				if (!mark) {
+					util.showNone("暂无商品数量！");
+					return;
+				}
+				
+				this.showOrHidePayWay(true);	// 弹出支付方式选择框
+				// this.goodsRetail();	// 商品出库
+			},
+			
 			// 购物车输入确认
 			cartInputConfirm(event, id) {
 				// 修改购物车列表对应的价格
diff --git a/src/subpackage/retail/static/images/add.png b/src/subpackage/retail/static/images/add.png
deleted file mode 100644
index c5b462d..0000000
Binary files a/src/subpackage/retail/static/images/add.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/back.png b/src/subpackage/retail/static/images/back.png
deleted file mode 100644
index ecdd14d..0000000
Binary files a/src/subpackage/retail/static/images/back.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/cart.png b/src/subpackage/retail/static/images/cart.png
deleted file mode 100644
index 8427cfe..0000000
Binary files a/src/subpackage/retail/static/images/cart.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/dropDown.png b/src/subpackage/retail/static/images/dropDown.png
deleted file mode 100644
index c736fc9..0000000
Binary files a/src/subpackage/retail/static/images/dropDown.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/historySearchDelete.png b/src/subpackage/retail/static/images/historySearchDelete.png
deleted file mode 100644
index b358e0b..0000000
Binary files a/src/subpackage/retail/static/images/historySearchDelete.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/home.png b/src/subpackage/retail/static/images/home.png
deleted file mode 100644
index d627dd1..0000000
Binary files a/src/subpackage/retail/static/images/home.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/search.png b/src/subpackage/retail/static/images/search.png
deleted file mode 100644
index 8d03fca..0000000
Binary files a/src/subpackage/retail/static/images/search.png and /dev/null differ
diff --git a/src/subpackage/retail/static/images/searchClear.png b/src/subpackage/retail/static/images/searchClear.png
deleted file mode 100644
index 4c9dbe0..0000000
Binary files a/src/subpackage/retail/static/images/searchClear.png and /dev/null differ
diff --git a/src/utils/util.js b/src/utils/util.js
index 9799928..7c7139e 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -360,6 +360,9 @@ function $_emit(name, data){
   })
 }
 
+function getFilterJson(obj){
+	return obj
+}
 export default {
   formatTime,
   formatNumber,