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 1/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E7=BA=A6=E7=8E=A9=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E9=9C=80=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,

From 5eef9acd508b7fb321a19b792c5d4c69758ae7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com>
Date: Tue, 18 May 2021 10:26:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=9B=B6=E5=94=AE=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E4=BB=98=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                                  |  79 ++--
 src/static/images/icon/retail/alipay.png           | Bin 0 -> 627 bytes
 src/static/images/icon/retail/card.png             | Bin 0 -> 764 bytes
 src/static/images/icon/retail/cash.png             | Bin 0 -> 1318 bytes
 src/static/images/icon/retail/choose.png           | Bin 0 -> 392 bytes
 src/static/images/icon/retail/close.png            | Bin 0 -> 233 bytes
 src/static/images/icon/retail/noChoose.png         | Bin 0 -> 511 bytes
 src/static/images/icon/retail/other.png            | Bin 0 -> 1312 bytes
 src/static/images/icon/retail/turn.png             | Bin 0 -> 244 bytes
 src/static/images/icon/retail/wechat.png           | Bin 0 -> 659 bytes
 .../components/retail_pay_way/retail_pay_way.vue   | 495 +++++++++++++++++++++
 src/subpackage/retail/js/retail_api.js             |   3 +-
 .../retail/pages/confirm_goods/confirm_goods.vue   |  72 ++-
 src/subpackage/retail/static/images/add.png        | Bin 314 -> 0 bytes
 src/subpackage/retail/static/images/back.png       | Bin 241 -> 0 bytes
 src/subpackage/retail/static/images/cart.png       | Bin 2080 -> 0 bytes
 src/subpackage/retail/static/images/dropDown.png   | Bin 185 -> 0 bytes
 .../retail/static/images/historySearchDelete.png   | Bin 365 -> 0 bytes
 src/subpackage/retail/static/images/home.png       | Bin 364 -> 0 bytes
 src/subpackage/retail/static/images/search.png     | Bin 372 -> 0 bytes
 .../retail/static/images/searchClear.png           | Bin 356 -> 0 bytes
 21 files changed, 592 insertions(+), 57 deletions(-)
 create mode 100644 src/static/images/icon/retail/alipay.png
 create mode 100644 src/static/images/icon/retail/card.png
 create mode 100644 src/static/images/icon/retail/cash.png
 create mode 100644 src/static/images/icon/retail/choose.png
 create mode 100644 src/static/images/icon/retail/close.png
 create mode 100644 src/static/images/icon/retail/noChoose.png
 create mode 100644 src/static/images/icon/retail/other.png
 create mode 100644 src/static/images/icon/retail/turn.png
 create mode 100644 src/static/images/icon/retail/wechat.png
 create mode 100644 src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
 delete mode 100644 src/subpackage/retail/static/images/add.png
 delete mode 100644 src/subpackage/retail/static/images/back.png
 delete mode 100644 src/subpackage/retail/static/images/cart.png
 delete mode 100644 src/subpackage/retail/static/images/dropDown.png
 delete mode 100644 src/subpackage/retail/static/images/historySearchDelete.png
 delete mode 100644 src/subpackage/retail/static/images/home.png
 delete mode 100644 src/subpackage/retail/static/images/search.png
 delete mode 100644 src/subpackage/retail/static/images/searchClear.png

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/static/images/icon/retail/alipay.png b/src/static/images/icon/retail/alipay.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4640ef9349bc3beaad7bbd62ddf6b0ed779351
GIT binary patch
literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`6$SW&xB_X0mHz~medb^KSpbSY
zih#Mi%f0|b_?H32zk(TG_?CU;UH%2E@)Q5EFFeb?@-O`al3My%5KMyEKq(*sYW&K-
z9AqX)J;;#Hf*=DwDSj)u4YX9XB*-tAf%W3g{*Ut9*HoS?)T=Kx5q^2bQR2@26*>Oa
zN4KQAYtCqk-x;%h+PriI2F7kr7sn8f<8P<D?rSm-Xywjbs1PnFAo6k3^S|+h8}F_Y
z(Po?MTei8*o+I<q(#ta^E9Ten&G)(y#5?K#y193xoicY?t8LEGwmG<N<0cX2b-U#n
zT7v3S&wnmZ_|2+Y8Ch)OyMBvR@1hm&n-xB!$%#EMTz!4Z+nA|hLQ7p!IIUO}BR%xC
zK6YB&x<sM>rpWW$>oe9{*sU~7QWg0#iRFIr^G_Oe3YFCoI|}vBTZ_Kzy=zqv+O6^P
zgv_bf^JjN0ZSYWXzjxbU;n|qK7Z2Dy75bBNM3wKOO@!==*yh=%DptPT$DMULGpi(X
z?wy&6QrT~<517~*wJqKnIc@G1>DeOe-J#AxerMOpE!wa|;r2^Cxw07nnw#C;`9GJh
zi@Y8wb~R*4==6zfH>};3^&6B2R38+XZjtmu%>3mM#f8zoExt_i&}2Ah*JYABsmm#F
z*5BS&8;{n?rV5{`F<KZOnBk|@Iyt=fS!DTav7Ps3yPn<Z{5^fX%>ipKLrGqXw@Jqy
p6~CHbY1ZRpkz#psrE2~^t@$kpQT0}~sZ&6y$J5o%Wt~$(69A4-9+Ln7

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/card.png b/src/static/images/icon/retail/card.png
new file mode 100644
index 0000000000000000000000000000000000000000..d077fec53552bbe5ee9de13c0e81c82a9be2c6cd
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq001-q001-y0{{R3@}}$A0002tP)t-s0000g
zznwG2r9|4e0GV_lx0DH>d=;*W8M280wSWkqd>OEf2%vl$vX2j^gA}ZY8nKTStcnt<
zhYzNKL)Nw!vyC3Lk`k$g8nKQRt&0_{i5szw5~+q9vyc?6i5aqv4yA$?t&0Ysd=9FE
z1Dkh2)UpYneLT>w52u6ynRXDTghSP|6RU^>oq8X(lNGFqKhv@cqkjaPcs<dr7OaUM
zwUY~?e;u@u45NTQ)UqbLnK;a<JI}5LpL+wGcp|x$3!{G!sDv7@jvlm;6sw3e$*42P
zrU99C4yA%1wv-pHi$*oAdjJ3cIdoD^QvlFaOH23UB?$!YHTdbVb#GBVFe?)B@z%n<
znV5ZLSWhh}81(7n;NRHL&&aH&qmqm{8TjDYi-5X>P8|RM0g*{WK~zY`?as+|(?Ae~
z;h({l=OK>mkT{Nq%poBIlOZ-%w*aB{e;}&maHxaWbZ?SHzC~9_s@o-=J%;U99=11;
zi-ng9iQOG7JRRL}z3_I;$-TD|?gQ{OKv?K|0Dc7EWdNSI7XkPZAT0FFah<D$Qxv~T
zC;-2dQmK>|u{osA>p!r6T>)3t4l2+e)PWCnAEz31npV-F9pIC-ds6moA1c-!@E{uK
zkWpks$C$c|H=DrJn4YYeMpa->&FPRE?;5vnY~ILukYCd?W*50lhcaah^{fNzWcfd4
zO&85F7iz0H5@iJQ_kCHHByHeb;`T+|t%{VEn$sbfkxAffl63Pj;*YIFAy$S!T?V9$
zq#ed>Hu~+Mp3|Xxv<fZhq|D=Z0_>ijpT<HV)h39UG^fbIG>xE=7O~boBSzA+q>k6A
z?3=EOROn%L-jL=-nw#}UIVb-MEwx6uT&}sMCQW16I6jugBIKp78keipa=B96lUDqG
u$?S0D>2L<OXFt81-Qx6Kd+71(5&Q-W`cOSjKCl1)0000<MNUMnLSTYwX=BC!

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/cash.png b/src/static/images/icon/retail/cash.png
new file mode 100644
index 0000000000000000000000000000000000000000..c95d079604012de984ed54c621180ef4494d1317
GIT binary patch
literal 1318
zcmV+>1=;$EP)<h;3K|Lk000e1NJLTq001-q001-y0{{R3@}}$A0003IP)t-s00030
zws85XZu_rq{;O^It#A0JZ~3Wj_^EFEvvBpUZTP8g`mAsKv2gaLZu+us`K@pIv2gpZ
zaQm}w`L1vFq;B}DZ~3in`LJ*Jt#A6YZ~C!s`mu2Mt8e?XaQm}w`mk^MuyFUNZu_@y
z_NQ+5r*8SIZ~3fm`L1vJvT*pQZ~C-w_o#3BwsHEaZvV1s_oi?8v2XXMZuzZn`LJ;N
zwQu*TZuh2d`m=BPv~c&PZ~C-v_p5LEvv2yfZ}+Hf_o;99t8ezCZu_-x`m=ENrEd7A
zZ~U`w_o;9Cws88hZ}z2b`?GNSxN!QmaQ3Ee{JL@Wq;B`CZuX^a`LJ*LwQu>dZ}+Hf
z`Lu8Nu5bIdaFM+B0ssI2Qgl*IQvd=M4hJDsH1j<Qs7oj6!H!%x_3q^w`tjkXori^M
zWJE6c^zYx>*3QS9fM_ut5!|}BvXzd0e0%!(?d#^>)XT@LpK@<pPvY3r!FTt{v#gca
zl~~aL00VMKL_t(Y$F-5yLgGLahEE!y3IZZUsto}_uwXCiTGwq!OjzFkLH3^v14%?#
zFZR2bkTd7wKQp04{7Swg=#x~&;PSAhe!|)PKIW|ds>=W9C{JS#KaO{4F;f3Ez(wgH
zx<I;peZzSCy<h#vX`^ZV^)0s_UL2eVmLMN|g0CzmO=qHYG~u-<z3UvKZ9PKtB!uZR
z^6nk3VVgOW9C?9SY|HZ%^%nb?8iC@-&&lqYGS`uJY_LX*!_mmTux)Ojdiye(EA3v|
zj3U1e+ioj6wjfhKv*+F3a)$3e^EZ~Lod_w_w(SQBq7=pciAtb$h}sWPJJa&Ejf$TL
zMib}+V7k*ixur_VvhB;jt+h|A8C3$z!S6~miS=2_U@iJ%o-Hp2#9-Zah3Em5ND)g$
zqZz%D#o5X8XHq!USDXzQrL+asyq9({ok~h9A13owo<JOx7YqR>D>w0Sp^zYr!8sM;
zz>KnwmbZ?v&BB+f7F&gq*cS>W36K`fzMK^^1NmU}j{qHS(X-ge=1N#s>%_>VGJmF&
z=Q+|AcC3fEg$KU{H^l(VX~xqDS*0NLtYI7|1vC_*#4!A@KL{7L+xY*wETnG1XsRW)
zTjPaUvxj7qq>@q4$R)RBoNFNil*H#jbdVbbW8=9doYhE|wG|X`%5FdCG_jY$GbWKl
zBySr=RlP9`s5GIUlPY1Kv(+Oib4P2|nR7%f!wnV~=W$A0`>e8bgmqtH7jO<IMOAlb
zX(pklN=K`{Eas@}FaS=R?PfKh@IkIM(zgvCeHDk{xum<}$H_zF5nm=m(Ujo;gRfUn
zlCRiXW0~{~C^(moUJPxmDAgVzOfWjVCVP8K!(j!S(8Cc%y$?IiRe}`QQ#RQW>rp)H
zfa@rEX*610(rz3l+#w2`J6;dR=rr74GWjqar;(DSVZ$_I3grf9F<mx0DzZ%zg{1`f
ziJ2f=?&*7`xu@f=!)_rK$06dIuD(&HAfY99V<@*w^Yl(4tyS*mFi8Jta!04P$Or>V
zclXc-lj+saz~n6PoVj6ObNJ0PuMiO$4lpEVPosB`zf3x=Pgh7fHD`R|$sdFPNL`Qf
zTP4P#uoX&Am5mTB0AXCZ7tYTdEe2ss8cxn9Vit!%YPo@TDhU>ct<V5>b}!LqsL}5`
cjs63F0b15v+hIV~T>t<807*qoM6N<$g1RE8c>n+a

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/choose.png b/src/static/images/icon/retail/choose.png
new file mode 100644
index 0000000000000000000000000000000000000000..be2b30b6145364e1b243c78698fd81ac775808d5
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z`~rMJT!A#h%o2tfa8wHB7BkE$
z0il`243lz!vj6}8-}&gK(EPd!ub*13pImuj+ozx3?|*vRer|8vzU5xq=Dhj-WzF47
zZza!001f0R3GxeOIC=fY>m@TXB3u+jC9Y=$0LAZmx;TbdoSu5+F5e*q9@Yob8Vzh#
z%>MuW|Ds(BZZ<Ggt>gG9<aKG<wvX2~$g!P0RyFCd#Ow{iCss^w?cI6P@r0gYb(_S!
z{2nLOtk9mU9V?axUhhbIBp)ih@~B10qo`2%`O{x7FN-%_E^uhe9GjcdIKMy5IJxBv
zqc>0C^#)JnG^=YoCcGcN3CRT?P580k_U}(NscEiOc4A>urC;PfEDo8(IN5QP7qhci
z=dS5&(`<x9y_o%vte(WXe65i;n_l*=NP|@w_isPc+Lm80@JspY?}Bf~_v|<Lwfgye
c)obzX`kNjYWF}f4+z1L%Pgg&ebxsLQ0ELRMzW@LL

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/close.png b/src/static/images/icon/retail/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8cc22ac24bacbd5c363934c456e089a4ddd74d1
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U_3?xrvihTr9q5(c3u0VR$thuvi&jX@av*yj2
zvta)G`J67RB!Cj^B|(0{4FAGcH9K=WdFr_gC{*L=;uxZFe(t1`ybT6CEV}FdFJpSq
zz|N|0(ZOrMe=UcuN3OHv|J~TA-hRDv{<fH_-9L9ItBIzY%@tg{<=YX3xB42Q%B#+<
z?VQqIzLqu8=uMZivaa8e0C%2J5TTlMg2U*>(aDw8@h9|dXkJ~A6f*TxvDF-f<!9zI
aR5Ntv2!&33?otJG2ZN`ppUXO@geCyEcUXS_

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/noChoose.png b/src/static/images/icon/retail/noChoose.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf8871cbe1883937a863c0a9ce95b545ce65166
GIT binary patch
literal 511
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Zk^_7~T!Hlb`KxBm+&q8&+WGTW
z1KA4}0MW{M^VZCpx9UF<fJnhfu;Mj9a^b?2NUE?fMOoyzfz~LL1o;Is{NqZ!c4nEm
zoajytp$ng0Kf8ToMrnkLW#y;)?Qvdj*0cw#1-g|{+tbA{#NzbSE1CJt20UyD`~932
zyxp<>>y1zU>!03Y$WG~46!pma%Y@5jtrJ(D32{g@ntD0$!v&>|vIl!5O#{+SiJfT;
zjpTe0=y#d1_fdj_sl)MwnmiXa|5(rNBPh{(>ylm$@89(|9OUPzT{pP>NA}fOkI==@
z=UF4VT3Fro&v5g<_+nu^H(!QD-;RS0F1jMJ$DV$#QVz=KESgf2vu{qZaAD^k&CNRs
z`4{n=st+ty`m|Z%#tzHh(FP$0@BgXXB_pjBAb4Q?#nr!O^6?sOSoFL2L-nLI=hsD(
zqo<ghF1mf}xvS^qoICN33tA%A9jI@t@_3y7@%*PSKZ*Z351G$bZ?-F#p|#n>dsWAh
z*?T8?s$c$Iw`=bAm$UU+{Jped=e#uXH}5HV{c}s_(%TQ^4>U<^n49osEii}~JYD@<
J);T3K0RX6&2rmEt

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/other.png b/src/static/images/icon/retail/other.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5fcea8c1ce47d782d246fdd1024b2781ebbf76
GIT binary patch
literal 1312
zcmV+*1>gFKP)<h;3K|Lk000e1NJLTq001@s001@!0{{R3yPKNt0004%P)t-s0001h
zr`vg=*O<NKex}-!uIh-d-i5B+f2i1huGw~=)^wcGgR0w@zUGd(<ZhYLmAmDdzvgb4
z(v!U9mAU4ZyXA+j-i58)e5Kfov)`J*=W&|Sj<@2ExZ#Pg-gckWpTy~sxZ|9{=zFBt
zin8C7x#W+w;hn?im%QbDrPz<Q;(w>vYL?KKyyT6v;GV+gj<(^Jz2$|h-kibbin8FC
zz2=6k+>*HCnZW0mzU7j*;*YlBl)B?+l+TT{;CrRmY?siT!sm3J)Mk>;jI-ZrmC&BU
z=$pXijkMvHz2uX*<DSFmmAT`d!|05&;E}iCpTp>et=w>$(xAlYo4@C1lFogl*=?86
zfvMYXo6>%&+iI22fT-Gyv*2@_(~z~`fT!Acq1J1c(1NPlb)M8{l+JaZ)Pt(qYn9M?
zqt<ep)QPX%n!x3IrP!6a<D0<djI-Z_tlW{e;+MSTiLl;&r`UC$)rYR#ccImewcu`;
z(UZ91f~neosM>R#({h{AaGKI;md|;k)@+y1d!*N$!suv}&ZrlLxBvhEZgf&kQvfb_
z;UNQhBqs=BClu}t{Oguk9T@r7n3#=AJS`FY_vF^n$j807u&Sq;j*g9dbZ=*8UR6d#
zJ~I3J_4M=c@9*y9;^5iW&CSQd!MC=kp`f0SiHCS_Xktt>82R(^=-1TE#KOF?tEq~D
zaBWpN@`FGC00PWOL_t(Y$Cc8DU)n$v2k?gyH3}-Cw2FIg>#Wwgcip>c_ntOrY0Hoy
z)W5sAdw1cIkP^P1PcFINyO)F<kkQ<{w!L>aG&(+6EeWygova%jI^5fCZSDfI^1p(G
z)y;0tk*8~ObwNm5!L05_ZZ0tCve7n_@57MW3wjUT*LJk(`l<(}uI+JulK~BTHl{97
zWg+Fh6uI?b&6a1Jw5?@U3;<PJBXrdi(@fgPL>>|p3QOv-@95HWt6?GPCc$GNc*3^6
zQcEfuXyRf?B%%&mv@IeSW%t&C2N>*%i#ka1C=$6+siS(Zn@cTMn6*f_KM_`^Beq?M
zdVv~e(>i_^5&bFCViF2XVqYhncHm@CsH;OK$zFzZ*73FK=>)&5cUr%Me#vD;A=iq+
z&g>)fs`Fm<WL{_IT@tn{db8E|hnrQN<JFjAP)pJsW4gnBkTQsyxNNB7`_%q4P$qzo
z*JZ%E(HMzGOtDYG$KbbVG}Rq+D}S35fktXKRU7GBG&BlPdlB&!G+r9iifulu_yQUC
zAS-7;u#ee(o^2zTjpf<q#LN|lMg#P)Zo@hqeLQ>{)qHd?xMvM)HWAI}1LovL6^)Vu
zM|D~P#8aH>>gT|?o&|{;hFtMBmI(D%py>&6J;e<Bqm-bDpk@R#=URB*;*$iqIa!F?
zNRm!lxAA(gPmI5(8LPH5=hWqG>08RW4eNdS+<%MO3K$oS9c=cQmFF<d==q~pM$=M5
zdSZHwCL3+9B`_-erBjwAY;u6vhn#H%kcDe8hRBMT)}|$~cM@ddZ;EMnn~*GCKz3De
zOR?As2Uz)%;No#MausJ_?I4i|hsi<U6^<2E@IMFPY<QQoe!eoL!ZUW|a9WWvn)gF)
zXY<KaDk)eg13R2=lA=%LV2|8?hmy&=nNzUOzrq^dJ0Ty^@r>HER0a9E=wCXP!NNbg
WOP|-Luo;;E0000<MNUMnLSTY?deChE

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/turn.png b/src/static/images/icon/retail/turn.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd7bba4e680f0e13125d1120adc400d9a37a96b
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^3=*07`vZ`&4DbnY1=6!;&zm)CE)ankAoiR&
z^XJZ;2jtG44HTR+cP>a4jONXlF@NSv5WBu|$6BCfp^_lKV21EduO8KxINO-C`|Dm`
z+^=-{ztX;FplpPvi(`nz>9^-M@--;%xL#xmJ))KL|9`UYj5)tNeCF=>9I3bW^cknJ
zHLDl}Gh8-uUjCE8GW)VhwtB#kH#*bw%+fdVcYX4VNmdg5GKtTqE8qez>((e~%dZSV
XNn8iG{w)Do!NB0@>gTe~DWM4fZ!2V0

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/retail/wechat.png b/src/static/images/icon/retail/wechat.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d297adfc970a22f0b6aacaa06edf39c27b7dfa4
GIT binary patch
literal 659
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`Wd`_!xB_X8-RvBD*f{sFbL?eh
z+s($XgMkyw<=o8<WN?7RL9#$)AOungLVMXb_p&qWW&kMw%Yp<!T7YUeIQDRGf%LL*
z?gp6v6gMzEr3<u7sU*lRnBmWd2cpVsM_(*2jn?gMas4_eHPC{0*Yq1_H|8eDEU2-&
zRC&Q8j)8%3yQhm|h{y4_S58iARuEvlz;s2!udqWcYuWez@;BX!7dg0i&X4<cS4Fy|
zD%7F=xcn_Q8Ab!WS&Mv5IL2{E9E$dv?H80V^@PnPPL+1i^M2DFbLMcZ-nusGO_!b7
zp121O-bl~nws^R8n^ueRx{{05hi^8f_5M~;_2o3zS#?#Qzo1a(Pq^#$>-j9~3%@+`
z>{=!wS!Ubbp!QQjPWrOWhUF*k*S<2)?C5y^q`>>$b>-yu!t7rTC{0bXs@Z9<(MZTL
zHR8&X?8TbDD$6D_i<G~*!l}*`wCz&V`m4pSU#z)SD0`S|`To1jX?r98NBXPGwUafx
zr)B=+<DWN5nY%xS>o!_BUyR!0_V3c3&)=_}e5|rSh;gOXZD%+3jHD=)-oKZ&UWl1?
zf&2G{Z6QwI=j}IYiS-PBJe#-o)#+z*s#3(-Q{LS9S8X&y^Q&b0OXKYh2Rd&q71BGS
zCV6$|{wXH~;~)I1Dco=UNT+qPwI-K^m*?bN?@}dXiXMvAuJ|_jdnW7QWgC{5p8Td%
zxhT|j%?(Aq6N?VNki4F%vOwVCgNd^8i(kdZf0f&K=90<e!o4~hryk3bt6hC)>9Y6_
cFYiBLpU(ZzS3i=q2^irFp00i_>zopr09|Am_5c6?

literal 0
HcmV?d00001

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..b5e8099
--- /dev/null
+++ b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
@@ -0,0 +1,495 @@
+<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 => {
+					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];
+						}
+						util.hideLoad();
+					}
+					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.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: absolute;
+		top: 0%;
+		left: 0;
+		z-index: 1024;
+		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 c5b462db61714512ec41782a80db75f8dc92a10c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|l3?zm1T2})p-2k5uS0K$WvxH#=1eJo>#SF7b
zKxk$$!=zlG)c^ngAANrBxpnrV=2N*q_1q;ve!&bUufJY0BO}5^QS`)AtE)iajh-%!
zAsXkC8yYhEuFZBelAPf1Fwa21y~E^f8x!vgj@Nk>91R@>p2{s|dJNpUw|ZH&9B@)_
z<wz}<9N_!9&EWpM<_p#hPPYV}&D|_eCCtoh9ddZ4aex~mv+}M942N?{7S83l`NHY8
z#GZ?-+YCGow?63G%C_?*k4VFvZ8I6)sLc?#k$a=Xz%<EN?y}&GIbAOmbM77EkvXGq
xMDD_ji;a?*GXlG3G8jzeOiMa6^@)M78pCRZ;t!ct0_C7U@O1TaS?83{1OU&FcJlxL

diff --git a/src/subpackage/retail/static/images/back.png b/src/subpackage/retail/static/images/back.png
deleted file mode 100644
index ecdd14d9287bb6708962f4c682322eb6dfdce10c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvg8-ipS0FuW*1T!cX3v>3XV$E_
zvuDqnIde9U0TcuxAQ#4lh|IO;Eoueo;V%jD3uc(hrt<iL^zD7ZD>rxh*}uqh*awtK
z^mK6y(Kw&%z@Wy_`rx$qVy=w8|65lj{Qcjb!S!$YLX8{$|5r0@YA`#=_3MAVYv6*9
z|LawDHF1h)ChX{6*6{G}e|<I$rk?-*trxSk{!s{j)VA)4GV`oS@fjOy?Pf4aGce5S
W^vL?*CLjs4jKR~@&t;ucLK6VN$74VM

diff --git a/src/subpackage/retail/static/images/cart.png b/src/subpackage/retail/static/images/cart.png
deleted file mode 100644
index 8427cfe57351b5bad29740780f63ce72e353759a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2080
zcmV+*2;cXKP)<h;3K|Lk000e1NJLTq002|~002}70{{R3E4ASB0006dP)t-s0002&
z?Cc|iZ%If;;^N|q&At$?kBf9wD7&7I*~|c#bpV`s0Gf9Ip?;a$&Xe2D0F`nqCMV3y
z%>bEoqKj()m~>K4O#qg1Q&CX>n|Bq&qbVUH&ar`~hF4NXI|rwU1geNUG%+T?o)oT*
zEyt!OAtL~qbvidVt(9|XTS=OknL5z6abr^ezMxP}O)JNx=H})Avy%YGs{po_-{0T%
z_V(A?+5nk#0G)d9@bF<_VZOe<n1NwKww(Z=eKEhF!otG<zoB7UQvkl8uCA~EnszlW
zEJHy*0JN0a+S&o6f@{64T3A>-*0q<El>nJ_AQ~JO#imC_M;*bTjfs+t(!~JBs>s#S
z0K%mJgJ$sX@H^JDv$MCVs;vN?djP430I!Y!m~;T8g8;mp0JD<-p??6mnKRI^Daoi6
zy_^8HmH?V|0=uXJzn}uMpD)d<0EcQHyqW~Qs~f<d0=J|h#-$0upa6?*0>-Ky!=eI_
zbpXPo4Yrjy)3Ok`nKQYb<>loezMc8``RwfM46~C1sF4Amhex}j)6~>v&bkS~t|P&p
z3Y~rfmU}%qIAg`IE5)TI!=e+Tf&-m_1FV-Wu#+6Ai3z5J+uPeq#jXLenIf-|5Uq{F
zrg#8?Wun~C3aN=hKtNPRIP>%Ku;JHv*T!wpzj)5PQ_Z&}w3r#PlWc2iUtV3(<l#@i
zr$E4`l6O^SQ##@C@5JNXwX(6Vtg1ILDtVVaoB#j-UUX7UQvi_-{{8G0{`~Xvzmi}6
z`Kx9oBmUOJc3(0s8vg$A>(I`iaZXM^K>q&w`T6$i%e=Onhl6ZeR!TTA{{8y)?&{^%
z&&{*4t)ZZumX?u_iFR*oKpgPx<>lqu%bQ?aE5~*K00m4*L_t(o!|m2*SJO}!!0}Kj
zRE7gY6bGod_uhN&y|vA48;W!=tR%LKP643^2owPo754(y=kvL_A!$j{P&~(1{U2U&
z&-tAvy*GnOl`2)LRFmvV-aiu=MVE7zY(BB^@WF$JH)l|~yGM36Z<(AlcLy((6w_9#
zwW6Y|%wn-Poz5Gl4>b4n>GczzH6NtHoKx8)#b&eFgrgyhV$!m9t<&k{z6OKMtAbk-
zLOLSN$S%l2klhF|44_yfniFRsao!Jsz?b$_J5{)4=ZPeRO~9~4B!Y>Rm6g?cx#8fd
zSLwTyCp;=qM#hZC0?F%@V^||qKwj^IZCBQ{&sIcdAhb`I$qR{?q6JxnDmd;UH7EVm
z9HnbVs6@k(FcM8#%U#Q$X1A}?DGj<$t|h{xIBpZQE4}@U{O}+|Yhd*FOhWJj6j5gs
z_9_P%MXW+&GE-b|*t{^RPQF*VEM$^Rrh!S(Fe>cT=OYKU#iE4>O#)*`Mk9=xcV{=;
zu6?n0YXLH=UnMEdBA6JA+N}5W{R#%R#GNNo(iq7OAv4GQcoXpb4g|Kwo+qQ$RYEdL
zjK=7jH^Ez5<F<)W(Bu};gogsYm&wiS<v8xEUcVu3o3<ll*2aLr5RvfnlsvDznB*+i
zx8#jKq;_QtC<y}%d%^=1!fx%u^3|&=I}C%=_>LlboF)ETu@BUt!GVvBkm2K}P>7!u
zs%w1K^7h?_?}ic?nvD?ov1A#$dVBVMd(!gmUCW1O9sYX_6>(WV3FyZh8M;wK#M#=q
zdilW&hUx~ZY9=0SdDhsKD??8Wb+v)g8#S9q^u#hn2YB>*7n&<Wb9)=VwY-1QG+;_D
zCOXj5)YR0AP?o~$x45V237|bu^Mn$PA47H(LD`hNB?8*TsD!1l`rVFxVBx>gNy(v<
z)V&0?8^suNbZBUBFcb>a;X=aWtKZ>pxZQ4GnV3m)l|MlCe`{(S=#373s;+MB>?p@Q
zczFN*J*c69poGLI6gI}9`IKUdt8xAgTYbIFW~;1JK&|eY8UYP^s*r@jJ}Fl!pp`Z?
zl#mc6tK!gX6;x;7(at#ZAwjVUBqWj|$`}DX4?u$J?;JPjeS$h3KgOm+5|jzMT-}Tv
zZC67}{XAMeep0CBF_=6W_OPsk0to?|PpP$E2?e#TTSQ$ERzxE-A^TmfVoJ5ec+^(;
zqz!G6a1Ee1M|Xsv>?4=k1%J>Zc7{4yB%qLh3fo^BYV(90!bSlrkPuJ4U<)br)~lhl
zwbrMeM=pW_8+N%NLRPT|ElYr2^sAtdg=ZaOCl$w&9t7zUpcw{#b!&&sRxd|E#q3j;
zgz_Z+x+qW;$yWIRg%r^kmXPp@;L)6fXi=wMe)%{abqZ{^+W{nt#IJzuRKnJ`cFIt4
z^V4G=u2!?h6Jb4e>Ah>uNQ{<tV6<L_!kLQDWjqS3krm(Nh<#C2KxwqT9PWJ?TG!_B
zc-ROHD9$v70tpprp_gG!8H&wFTa>nvQ6<!lJZ#lX9i`P-Fv)!?p@T#45k`_G6<B-L
zTuQsrv$t2*gITF?q{K-X5zWr0Ce}{h*PlO!hlgL{rtwYZn@YMmWvtT~)I`fmOH0%H
ze7+57%1O&RsiZpT3kJ_=EhpL1HGx22#j%9TvtT)ybPE^!_UUKsnW?-yZ{dPpWI37U
zWR8AmZvHcWw#xFz=x4H=OqUjnrhoa|{``>I@@v_$cFQwI+S6aXo_}0zIa9u@-J<6s
zuU9@_vs`sK6P8!Pax%?Zl(}No!kJpj$+q;u%z0YNsZyo-5B&w|EVr5ILybEC0000<
KMNUMnLSTaYs05t=

diff --git a/src/subpackage/retail/static/images/dropDown.png b/src/subpackage/retail/static/images/dropDown.png
deleted file mode 100644
index c736fc9958073f250e061360507596b49b2a63e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh-3?!F4n4AKnL<4+6T!FN)v9XDXi4hn;7z+$H
z7yu>MOM?7@8U6)FKk#~*6@D%dDCFbm;uyklJy}6^!!k_<&t+Q}*u)$Y6;20SU_2pY
zl8_+AvMGX<wYAZyiIIn=tEuT&Q<Iaz(Iy3kD{Mk6+>I=XP6CdKGal+OvdA(p=(@1k
Uhp;gh0nKIbboFyt=akR{0Hs|ni2wiq

diff --git a/src/subpackage/retail/static/images/historySearchDelete.png b/src/subpackage/retail/static/images/historySearchDelete.png
deleted file mode 100644
index b358e0b3085bf5667ea9d73b211f5028c29cb599..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZTmyVUT!HktbLY;UJqsiu3?Lg0
z;DX3fK=zq4XMp7S^XE^WJ`GfSaGi$+&>*prAirRSrIAw~ddYo!z4b8v_qLjHTT%A2
zsp|WuKGXxMIOyr(7-Dhy?WEH}M+5|1-z!`?@%!O_`_fsbeB6XKoyt4sH2t>w!UM@K
zuFVLWE_<<JnV@R=2We-=P4Xv~{k*ZS%xS(xkA0%`yY9~sCf|dYi}fXU#GRVi(PNWn
zF>mP`S*C{vnABZ%Fw8ivBKy63mx|=NjhUN*YOGjSe5i<A`6!Cnbowj(sj5sXG%O#P
z_?=8ueUUe_A@k*z$^Sh+`6N9z5}WrjeC~#Cb~h7(?3!nNSbEAcwCLC`ua*4UC9PNU
e-N?H$EB{cH`o@5*UQ>adVeoYIb6Mw<&;$S<NVGEm

diff --git a/src/subpackage/retail/static/images/home.png b/src/subpackage/retail/static/images/home.png
deleted file mode 100644
index d627dd1852c985bde753f0d6f5a36564640b838c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZTmyVUT!FNSiHQ*y7#kY{X&`B6
zXb52g89-UMIFJDWXzGK*7q0*sBvumS7tFBPNAfApTcxYbW~YnO9ak=x5OyG5@AZi(
zwLldIJY5_^EKWb25Y5-3z{60<!Sv|%+rRz0RBt?pO11x6ASArdd4|HgrE?#}r*B}m
zbY-rb(7Lsj#!_arhu0>loU`7`aOu9PwM^d)VW~ee^CutdZh5!h$>t}mdUBfcRm~T!
zv3<Jv$z!pnpPw)R8BFKzGi;n}=iRNdK3~E3;@ygA?|1K+P`M>&U7OFD-(H&jK`ck!
zOgeh<VWfzso#$IUQ>BAT`K?y3@H+YFVu<RawL#14ZtAJ<O+K{ri63iV(J_U254n9e
WigA7E_e%i!g~8L+&t;ucLK6VbOp3_>

diff --git a/src/subpackage/retail/static/images/search.png b/src/subpackage/retail/static/images/search.png
deleted file mode 100644
index 8d03fcac549216748802a14f1706df29ff3b580a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*FxKvjCqES0Fuo`t%uK(BIz=WKWwm
z4I%<zK-g2KPMtY(CWH+n?^*rn2I>?n3GxeOc=~M)&k4y%ZmAnP!c}xD%pxy6zYdhV
z<LTlUVsZLvh_~2b1rC=Fw`XkG`9C$<C%$*$lpQY?Z5Dpc%g6K~`-aas1u6HNbqmk7
zyk__KESZ03E2E#%+1*>4KilRTK0Vd)W7ikMJ^kLx)4go2dfZZSKRfCBHH)p=C;ffU
zoXp6_A(Ja}_C(c%M$^K0)koJO7XJI=cWZ8>L1V*_Nui3H6*>}5#u$gIPm<5d5>8Ee
z!e#m^PVLvT&^N4p2lCuHt6l{fS5>-kud9EU5d0$7?AnfB8azDH?bh`y(P`-V-8$82
whv8RM(TzW@UB7osWk&;h*t|n3KcsCK&!vfeh&K4J7U)j~Pgg&ebxsLQ0A??zi~s-t

diff --git a/src/subpackage/retail/static/images/searchClear.png b/src/subpackage/retail/static/images/searchClear.png
deleted file mode 100644
index 4c9dbe0ebebad3709063a291beaf9e345423e6e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy#sNMdu0VSJ{8jVkubww=)q(|3
zv~b~ipy0xVAi+6vfU+PoZ{Es9i$IL{z(cJ-Z2~1he!&bUmrLB6)yerfIb20|hl~Ad
z^NDsqxeJ~yjv*GOTZ5zdSQI&&%L7W{?)={}J5n@tW=q}7EnzDdgm)$>q;W+UN4z<~
zUBKQu=Lf&%&Kf4^mh(^gd*e6A7VZD+cG0%z`*x1Cd@Ii@{rx5VNyTqUlD+NSr00wZ
zecO+UF@Aa_wshNUX`>LacK3^wnroU=WM(h==xWq{Aj+`9Q0*GmSz|{1jzj(jytf5%
zp7`M9C?JwA!Wi&bHH+0N;L4A{mzs_%S9E_V^1RZp`Djw#j+*jasRrj(e|c7xpKxd5
o=eBFI)%Ascu6~|=J@&u;lwBIK|F}#R1O3L}>FVdQ&MBb@00{t^V*mgE


From 84355100192d74bab62f4c730b5896ebe82da3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com>
Date: Mon, 24 May 2021 09:47:31 +0800
Subject: [PATCH 3/5] little change

---
 src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue | 1 +
 1 file changed, 1 insertion(+)

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
index b5e8099..4249e8e 100644
--- a/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
+++ b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
@@ -134,6 +134,7 @@
 				this.payWayList[0].mark = this.choosePath;
 				this.curChoose = this.payWayList[0];
 				this.curCardChoose = null;
+				this.cardList = [];
 				this.searchCardValue = "";
 			},
 			

From 920691b8d200dd06c9a69f34a440277e35570300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com>
Date: Wed, 26 May 2021 10:58:47 +0800
Subject: [PATCH 4/5] style change

---
 src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue | 5 ++++-
 src/subpackage/retail/pages/confirm_goods/confirm_goods.vue        | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

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
index 4249e8e..779d2e3 100644
--- a/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
+++ b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
@@ -113,6 +113,9 @@
 							_this.cardList[0].mark = _this.choosePath;
 							this.curCardChoose = _this.cardList[0];
 						}
+						else {
+							util.showNone("无数据");
+						}
 						util.hideLoad();
 					}
 					else {
@@ -262,7 +265,7 @@
 		position: absolute;
 		top: 0%;
 		left: 0;
-		z-index: 1024;
+		z-index: 2048;
 		overflow: hidden;
 	}
 	
diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
index 23fbfc2..178159c 100644
--- a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
+++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
@@ -304,6 +304,7 @@
 		padding-bottom: calc( 0rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
 		padding-bottom: calc( 0rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
 		// border: 1px solid red;
+		z-index: 1;
 		
 		.final-cart-list {
 			display: flex;

From 6280fcdd673643a1ba1f087eb01962080c590156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=AE=B6=E5=8D=8E?= <3599164049@qq.com>
Date: Wed, 26 May 2021 11:18:42 +0800
Subject: [PATCH 5/5] fixed style

---
 src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue | 7 +++----
 src/subpackage/retail/pages/confirm_goods/confirm_goods.vue        | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

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
index 779d2e3..5f14a20 100644
--- a/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
+++ b/src/subpackage/retail/components/retail_pay_way/retail_pay_way.vue
@@ -95,6 +95,7 @@
 					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) {
@@ -114,9 +115,8 @@
 							this.curCardChoose = _this.cardList[0];
 						}
 						else {
-							util.showNone("无数据");
+							util.showNone("查询不到该储蓄卡信息，请检查重新输入");
 						}
-						util.hideLoad();
 					}
 					else {
 						util.showNone(res.data.message || '操作失败！');
@@ -262,10 +262,9 @@
 	.content {
 		width: 100vw;
 		height: 100vh;
-		position: absolute;
+		position: fixed;
 		top: 0%;
 		left: 0;
-		z-index: 2048;
 		overflow: hidden;
 	}
 	
diff --git a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
index 178159c..23fbfc2 100644
--- a/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
+++ b/src/subpackage/retail/pages/confirm_goods/confirm_goods.vue
@@ -304,7 +304,6 @@
 		padding-bottom: calc( 0rpx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
 		padding-bottom: calc( 0rpx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
 		// border: 1px solid red;
-		z-index: 1;
 		
 		.final-cart-list {
 			display: flex;