diff --git a/pages/member/index.vue b/pages/member/index.vue
index bbed540..0fbf4e5 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -118,7 +118,7 @@
 					{name: "明细", url: "member/billDetails",icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/detail.png"},
 					{name: "管理", url: "member/storedManage",icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/manage.png"}
 				],
-				
+				type: "",
 			}
 		},
 		async onLoad(e) {
@@ -141,6 +141,7 @@
 				this.paygetActive()
 			} else{
 				this.shopId = e.shopId;
+				this.type = e.type;
 				uni.cache.set('shopId',this.shopId)
 				this.shopInfo();
 				this.paygetActive()
@@ -193,7 +194,7 @@
 				let res = await this.api.paygetActive({
 					shopId: this.shopId,
 					page: 1,
-					pageSize: 10
+					pageSize: 99
 				})
 				
 				try {
@@ -356,15 +357,20 @@
 							uni.requestSubscribeMessage({
 								tmplIds:["AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ"],
 								complete() {
-									if ( pages.length > 1) {
-										_this.shopInfo()
+									if ( _this.type && _this.type == "topUpActivity") {
+										uni.pro.navigateBack()
 									} else {
-										setTimeout(res => {
-											uni.switchTab({
-												url: '/pages/index/index'
-											})
-										}, 500)
+										if ( pages.length > 1) {
+											_this.shopInfo()
+										} else {
+											setTimeout(res => {
+												uni.switchTab({
+													url: '/pages/index/index'
+												})
+											}, 500)
+										}
 									}
+									
 								},
 							})
 							
diff --git a/pages/pay_code/pay_code.vue b/pages/pay_code/pay_code.vue
index 4f3025e..de8cde8 100644
--- a/pages/pay_code/pay_code.vue
+++ b/pages/pay_code/pay_code.vue
@@ -58,7 +58,6 @@
 				console.log(res)
 				if (res.code == 0) {
 					this.createcardNo = res.data;
-					console.log(this.$refs.tkiBarcode)
 					this.$refs.tkiBarcode.setval(this.createcardNo) //操作属性
 					this.$refs.tkiQrcode.setval(this.createcardNo) //操作属性
 				}
diff --git a/pagesOrder/components/orderInfoPoints.vue b/pagesOrder/components/orderInfoPoints.vue
new file mode 100644
index 0000000..d99a700
--- /dev/null
+++ b/pagesOrder/components/orderInfoPoints.vue
@@ -0,0 +1,300 @@
+<template>
+	<view>
+		<view class="card_box">
+			<view class="card_head_box">
+				<view class="card_head_item" v-for="(item,index) in 8" :key="index"></view>
+			</view>
+			<view class="card">
+				<!-- 订单头部 -->
+				<view class="top">
+					<view class="title">
+						<view>自提凭证</view>
+					</view>
+				</view>
+				<view class="card_item">
+					<view>
+						<view class="code">提货码：241578956432</view>
+						<tki-qrcode ref="tkiQrcode" show :size="qrcodeSize"></tki-qrcode>
+					</view>
+					
+					<view class="semicircle_icon" >
+						<view class="semicircle_left_icon"></view>
+						<view class="semicircle_right_icon"></view>
+					</view>
+				</view>
+			
+				<view class="total-wrap">
+					<view class="info">
+						<u-icon name="map" color="#666" size="28"></u-icon>
+						<view class="shopName">自取店：{{ listinfo.name }}</view>
+						<u-icon name="phone" color="#666" size="28"></u-icon>
+						<view class="phone">15303589754</view>
+					</view>
+					<view class="address">
+						<view class="lable">门店地址：</view>
+						<view>门店地址门店地址门店地址门店地址门店地址门店地址门店地址门店地址</view>
+					</view>
+				</view>
+			
+			</view>
+		</view>
+		<view class="product">
+			<view></view>
+			<view class="product_info">
+				<view class="name">DIMO联名马克杯</view>
+				<view class="numBox"><view class="points">100积分</view><view class="num">X1</view></view>
+			</view>
+			<!-- <view class="productInfo"></view> -->
+		</view>
+		<view class="orderInfo">
+			<view class="row">
+				<text class="t">支付方式：</text>
+				<text class="info">{{listinfo.name}}</text>
+			</view>
+			<view class="row">
+				<text class="t">兑换时间：</text>
+				<text class="info">{{$u.timeFormat(listinfo.time, 'yyyy-mm-dd hh:MM:ss')}}</text>
+			</view>
+			<view class="row" @click="copyHandle(listinfo.orderNo)">
+				<text class="t">订单编号：</text>
+				<text class="info">{{listinfo.orderNo}}（点击复制）</text>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import tkiQrcode from '@/components/tki-qrcode/tki-qrcode.vue';
+	export default {
+	
+		data() {
+			return {
+				qrcodeSize: 200,
+				
+			}
+		},
+		props:{
+			listinfo:{
+				type: Object
+			}
+		},
+		mounted() {
+			this.setQrcode();
+		},
+		methods: {
+			
+			setQrcode () {
+				this.$refs.tkiQrcode.setval('241578956432') //操作属性
+			},
+			
+			/**
+			 * 复制订单号
+			 * @param {Object} e
+			 */
+			copyHandle(e) {
+				uni.setClipboardData({
+					data: e,
+					success() {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.card_box{
+		background-color: #fff;
+		// box-shadow: 0rpx 8rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		position: relative;
+		width: 100%;
+		height: 100%;
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		border-radius: 18rpx;
+		padding-bottom: 32rpx;
+		.card_head_box{
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			position: absolute;
+			top: -22.5rpx;
+			padding: 0 44rpx;
+			.card_head_item{
+				width: 45rpx;
+				height: 45rpx;
+				background-color: #f9f9f9;
+				border-radius: 50%;
+				// box-shadow: inset 0rpx -13rpx 18rpx -16rpx rgba(87, 86, 86, 0.35);
+			}
+		
+		}
+		
+		.card {
+			// background-color: #fff;
+			border-radius: 20upx;
+			margin-bottom: 28upx;
+			position: relative;
+			.top{
+				padding: 0 34rpx;
+			}
+			.title{
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #333333;
+				border-bottom: 2rpx dashed #E3E3E3;
+				padding-bottom: 36rpx;
+				padding-top: 50rpx;
+			}
+			.card_item{
+				display: flex;
+				flex-direction: column;
+				position: relative;
+				padding: 32rpx 34rpx 48rpx 34rpx;
+				border-bottom: 2rpx dashed #E3E3E3;
+				align-items: center;
+				.code{
+					font-weight: bold;
+					font-size: 28rpx;
+					color: #333333;
+					margin-bottom: 48rpx;
+				}
+				::v-deep.vue-ref{
+					display: flex;
+					justify-content: center;
+				}
+				
+				.semicircle_icon{
+					width: 100%;
+					position: absolute;
+					bottom: -22.5rpx;
+					left: 0;
+					display: flex;
+					justify-content: space-between;
+					.semicircle_left_icon{
+						width: 45rpx;
+						height: 45rpx;
+						margin-left: -22.5rpx;
+						background-color: #f9f9f9;
+						border-radius: 50%;
+						// box-shadow: inset -20rpx 0rpx 22rpx -20rpx rgba(87, 86, 86, 0.35);
+						
+					}
+					.semicircle_right_icon{
+						width: 45rpx;
+						height: 45rpx;
+						margin-right: -22.5rpx;
+						background-color: #f9f9f9;
+						border-radius: 50%;
+						// box-shadow: inset 13rpx 0rpx 16rpx -9rpx rgba(87, 86, 86, 0.35);
+					
+					}
+				}
+			}
+			
+				
+			.total-wrap {
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				padding: 0 34rpx;
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+				margin-top: 38rpx;
+				.info{
+					display: flex;
+					align-items: center;
+					font-weight: bold;
+					font-size: 24rpx;
+					color: #333333;
+					.shopName{
+						margin-right: 48rpx;
+						margin-left: 16rpx;
+					}
+					.phone{
+						margin-left: 16rpx;
+					}
+				}
+				.address{
+					margin-left: 36rpx;
+					align-self: center;
+					display: flex;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #666666;
+					margin-top: 24rpx;
+					align-self: center;
+					.lable{
+						flex-shrink: 0;
+					}
+				}
+			}
+			
+		}
+	}
+	.product{
+		padding: 32rpx 34rpx;
+		background-color: #FFFFFF;
+		margin-top: 32rpx;
+		.product_info{
+			display: flex;
+			flex-direction: column;
+			margin-left: 16rpx;
+			.name{
+				font-weight: bold;
+				font-size: 24rpx;
+				color: #333333;
+				margin-bottom: 24rpx;
+			}
+			.numBox{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				font-weight: 500;
+				font-size: 24rpx;
+				.points{
+					color: #F7853D;
+				}
+				.num{
+					color: #999999
+				}
+			}
+		}
+	}
+	.orderInfo{
+		background: #FFFFFF;
+		border-radius: 18rpx 18rpx 18rpx 18rpx;
+		margin-top: 32rpx;
+		padding: 32rpx 34rpx;
+		// box-shadow: 0rpx 4rpx 12rpx 2rpx rgba(87,86,86,0.35);
+		.row {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 32rpx;
+					
+			.t {
+				font-weight: bold;
+				font-size: 28rpx;
+				color: #333333;
+			}
+					
+			.info {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #666666;
+			}
+		}
+		.row:last-child{
+			margin-bottom: none;
+		}
+		
+	}
+	
+</style>
diff --git a/pagesOrder/components/paymentMethod.vue b/pagesOrder/components/paymentMethod.vue
index ca35a7a..5f36dce 100644
--- a/pagesOrder/components/paymentMethod.vue
+++ b/pagesOrder/components/paymentMethod.vue
@@ -92,7 +92,9 @@
 	.paymentMethod{
 		box-sizing: border-box;
 		margin-top: 30rpx;
+		padding: 0 20rpx;
 		border-radius: 18rpx;
+		margin-bottom: 220rpx;
 		.paymentMethod_content{
 			background-color: #fff;
 			border-radius: 22rpx;
diff --git a/pagesOrder/components/rechargeFree.vue b/pagesOrder/components/rechargeFree.vue
new file mode 100644
index 0000000..2671dfc
--- /dev/null
+++ b/pagesOrder/components/rechargeFree.vue
@@ -0,0 +1,80 @@
+<template>
+	<!-- 充值免单 -->
+	<view class="rechargeFree">
+		<view class="rechargeFree_bg" @click="changeFree">
+			<view class="left">
+				<view class="icon">优惠</view>
+				<view class="text">充值消费2倍（￥50），本单立享免单！</view>
+			</view>
+			<u-checkbox-group iconPlacement="right" >
+			    <u-checkbox v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" @change="changeFree" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
+				</u-checkbox>
+			</u-checkbox-group>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				rechargeFreeChecked: false,
+			}
+		},
+		props:{
+			shopUserInfo:{
+				type: Object
+			},
+		},
+		mounted() {
+		},
+		methods: {
+			
+			/**
+			 * 监听是否免单
+			 */
+			changeFree ( e ) {
+				this.rechargeFreeChecked = !this.rechargeFreeChecked;
+				this.$emit("changeFree",this.rechargeFreeChecked)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 充值免单
+	.rechargeFree{
+		padding: 0 20rpx;
+		margin-top: 32rpx;
+		.rechargeFree_bg{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 32rpx 24rpx;
+			border-radius: 24rpx;
+			background-color: #fff;
+			.left{
+				display: flex;
+				align-items: center;
+				.icon{
+					width: 68rpx;
+					height: 36rpx;
+					text-align: center;
+					line-height: 36rpx;
+					background: linear-gradient( 180deg, #FEDE81 0%, #FEB263 100%);
+					border-radius: 12rpx 0rpx 12rpx 0rpx;
+					font-weight: 500;
+					font-size: 20rpx;
+					color: #FFFFFF;
+					margin-right: 12rpx;
+				}
+				.text{
+					font-weight: 500;
+					font-size: 28rpx;
+					color: #333333;
+				}
+			}
+		}
+	}
+	
+</style>
diff --git a/pagesOrder/components/topUpActivity.vue b/pagesOrder/components/topUpActivity.vue
new file mode 100644
index 0000000..073dbb3
--- /dev/null
+++ b/pagesOrder/components/topUpActivity.vue
@@ -0,0 +1,141 @@
+<template>
+	<!-- 充值活动 -->
+	<view class="topUp">
+		<view class="topUpActivity">
+			<view class="topUpActivity_title">充值更划算</view>
+			<view class="content">
+				<view class="content_item" @click="goTopUp" v-for="(item,index) in list" :key="index">
+					<view class="fit">首充优惠</view>
+					<view class="amount">{{ item.minNum }}元</view>
+					<view class="zs"><text class="zamount">赠{{ item.handselNum }}元</text><text class="points">50积分</text></view>
+					<view class="coupon">赠送2张优惠券</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+			}
+		},
+		props:{
+			shopUserInfo:{
+				type: Object
+			},
+		},
+		mounted() {
+			console.log(this.shopUserInfo)
+			this.getData();
+		},
+		methods: {
+			/**
+			 * 去充值
+			 */
+			goTopUp() {
+				uni.pro.navigateTo('/pages/member/index', {
+					shopId: uni.cache.get('shopId'),
+					type: "topUpActivity"
+				})
+			},
+			
+			/**
+			 * 获取充值数据
+			 */
+			async getData () {
+				let res = await this.api.paygetActive({
+					shopId: uni.cache.get('shopId'),
+					page: 1,
+					pageSize: 99
+				})
+				this.list = res.data.list;
+				
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.topUp{
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		border-radius: 18rpx;
+		padding: 0 20rpx;
+		.topUpActivity{
+			background-color: #fff;
+			border-radius: 22rpx;
+			padding: 32rpx 24rpx;
+			box-sizing: border-box;
+			.topUpActivity_title{
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+				box-sizing: border-box;
+			}
+			.content{
+				display: flex;
+				overflow-x: auto;
+				padding-top: 32rpx;
+				.content_item{
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					position: relative;
+					background: linear-gradient( 180deg, #FFF7E6 0%, #FFFFFF 100%);
+					border-radius: 12rpx 12rpx 12rpx 12rpx;
+					border: 2rpx solid #FEE082;
+					margin-right: 24rpx;
+					padding: 22rpx 42rpx;
+					flex-shrink: 0;
+					.fit{
+						width: 102rpx;
+						height: 36rpx;
+						line-height: 36rpx;
+						text-align: center;
+						background: linear-gradient( 180deg, #FEE082 0%, #FFA158 100%);
+						border-radius: 12rpx 0rpx 12rpx 0rpx;
+						font-weight: 500;
+						font-size: 20rpx;
+						color: #FFFFFF;
+						position: absolute;
+						left: 0;
+						top: -14rpx;
+					}
+					.amount{
+						font-weight: bold;
+						font-size: 36rpx;
+						color: #333333;
+					}
+					.zs{
+						display: flex;
+						align-items: center;
+						margin-bottom: 12rpx;
+						margin-top: 12rpx;
+						text{
+							font-weight: 500;
+							font-size: 20rpx;
+							color: #666666;
+						}
+						text:nth-child(1){
+							padding-right: 12rpx;
+							margin-right: 12rpx;
+						}
+					}
+					.coupon{
+						padding: 6rpx 12rpx;
+						background: rgba(250,236,205,0.88);
+						border-radius: 4rpx 4rpx 4rpx 4rpx;
+						font-weight: 500;
+						font-size: 20rpx;
+						color: #F7955C;
+					}
+				}
+			}
+			
+		}
+	}
+	
+</style>
diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue
index e4ae74d..d319ee8 100644
--- a/pagesOrder/confirm_order/index.vue
+++ b/pagesOrder/confirm_order/index.vue
@@ -1,11 +1,5 @@
 <template>
 	<view class="container">
-		<!-- 占位符导航栏 -->
-		<!-- <navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> -->
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> -->
-		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> -->
-		<!-- #endif -->
 		<!-- 头部内容 -->
 		<view class="head">
 			<view class="head_bg"></view>
@@ -113,22 +107,12 @@
 		</view>
 		
 		<!-- 充值免单 -->
-		<view class="rechargeFree">
-			<view class="rechargeFree_bg" @click="rechargeFreeChecked = !rechargeFreeChecked">
-				<view class="left">
-					<view class="icon">优惠</view>
-					<view class="text">充值消费2倍（￥50），本单立享免单！</view>
-				</view>
-				<u-checkbox-group iconPlacement="right">
-				    <u-checkbox v-model="rechargeFreeChecked" :checked="rechargeFreeChecked" activeColor="#E8AD7B" shape="circle" icon-size="36" size="36">
-					</u-checkbox>
-				</u-checkbox-group>
-			</view>
-		</view>
-			
+		<!-- <rechargeFree ref="rechargeFree" :shopUserInfo="amountVIP" @changeFree="changeFree"></rechargeFree> -->
+		<!-- 充值活动 -->
+		<!-- <topUpActivity ref="topUpActivity" :shopUserInfo="amountVIP" ></topUpActivity> -->
+		<!-- 支付方式 -->
 		<paymentMethod ref="paymentMethod" :amountVIP="amountVIP" v-if="storeInfo.registerType == 'munchies'" @groupChange="groupChange"></paymentMethod>
 		
-		
 		<view class="bottom">
 			<view class="bottom_left">
 				<text style="margin-bottom: 5rpx;">实付金额</text>
@@ -165,10 +149,11 @@
 </template>
 
 <script>
-	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js'
 	import payPasswordtwo from '@/components/payPasswordtwo.vue'
 	import paymentMethod from '../components/paymentMethod.vue'
+	import rechargeFree from '../components/rechargeFree.vue'
+	import topUpActivity from '../components/topUpActivity.vue'
 	// import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
 	
 	
@@ -176,7 +161,8 @@
 		components: {
 			payPasswordtwo,
 			paymentMethod,
-			navseat
+			rechargeFree,
+			topUpActivity,
 		},
 		data() {
 			return {
@@ -279,6 +265,14 @@
 			})
 		},
 		methods: {
+			changeFree ( val ) {
+				console.log(val)
+				if ( val ) {
+					this.listinfo.payAmount = this.listinfo.payAmount*2
+				} else {
+					this.listinfo.payAmount = this.listinfo.payAmount/2
+				}
+			},
 			
 			/**
 			 * 获取桌台码
@@ -752,7 +746,7 @@
 
 <style lang="scss">
 	.container{
-		padding-bottom: 246rpx;	
+		// padding-bottom: 246rpx;	
 	}
 	.head{
 		width: 100%;
@@ -1204,40 +1198,6 @@
 		}
 	}
 	
-	// 充值免单
-	.rechargeFree{
-		padding: 0 20rpx;
-		margin-top: 32rpx;
-		.rechargeFree_bg{
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 32rpx 24rpx;
-			border-radius: 24rpx;
-			background-color: #fff;
-			.left{
-				display: flex;
-				align-items: center;
-				.icon{
-					width: 68rpx;
-					height: 36rpx;
-					text-align: center;
-					line-height: 36rpx;
-					background: linear-gradient( 180deg, #FEDE81 0%, #FEB263 100%);
-					border-radius: 12rpx 0rpx 12rpx 0rpx;
-					font-weight: 500;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-right: 12rpx;
-				}
-				.text{
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #333333;
-				}
-			}
-		}
-	}
 	
 	
 	
diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue
index 86d56d1..406383c 100644
--- a/pagesOrder/order_detail/index.vue
+++ b/pagesOrder/order_detail/index.vue
@@ -26,9 +26,12 @@
 			<!-- #endif -->
 		</view>
 		
+		<!-- 先下单后支付 -->
 		<orderInfoAfter ref="orderInfoAfter" :listinfo="listinfo" v-if="listinfo.useType == 'dine-in-after'"></orderInfoAfter>
+		<!-- 先支付后下单 -->
 		<orderInfoBefore ref="orderInfoBefore" :listinfo="listinfo" v-else></orderInfoBefore>
-		
+		<!-- 积分兑换订单详情 -->
+		<!-- <orderInfoPoints ref="orderInfoPoints" :listinfo="listinfo" ></orderInfoPoints> -->
 		
 		<paymentMethod ref="paymentMethod" v-if="amountVIP&&listinfo.status == 'unpaid' ||  listinfo.status == 'paying'" :amountVIP="amountVIP" @groupChange="groupChange"></paymentMethod>
 		
@@ -68,12 +71,14 @@
 	import payPasswordtwo from '@/components/payPasswordtwo.vue'
 	import orderInfoAfter from '../components/orderInfoAfter.vue'
 	import orderInfoBefore from '../components/orderInfoBefore.vue'
+	import orderInfoPoints from '../components/orderInfoPoints.vue'
 	import paymentMethod from '../components/paymentMethod.vue'
 	export default {
 		components: {
 			payPasswordtwo,
 			orderInfoAfter,
 			orderInfoBefore,
+			orderInfoPoints,
 			paymentMethod,
 		},
 		data() {
@@ -377,7 +382,7 @@
 	}
 	
 	.container {
-		padding: 32rpx 28rpx 224rpx 28rpx;
+		padding: 32rpx 28rpx 32rpx 28rpx;
 	}
 	.headStatus{
 		display: flex;