diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue
index 8a2e859..0d407f4 100644
--- a/packageA/afterSales/index.vue
+++ b/packageA/afterSales/index.vue
@@ -39,7 +39,7 @@
 				</span>
 				<span class="line"></span>
 				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
-					<view class="tt1">选择退款数量<span> (剩余{{detailAny.join_info.stock - detailAny.join_info.people_number}}张)</span></view>
+					<view class="tt1">选择退款数量<span> (剩余{{detailAny.verification.total_number - detailAny.verification.have_number}}张)</span></view>
 					<span class="flex align-items">
 						<image style="width: 42rpx;height: 42rpx;" src="/static/detail/jian.png" @click="removeMon"></image>
 						<span style="margin: 0 20rpx;">{{ nummoney }}</span>
@@ -224,9 +224,9 @@
 					})
 					return;
 				}
-				if (this.nummoney > this.detailAny.join_info.people_number) {
+				if (this.nummoney > this.detailAny.verification.total_number) {
 					uni.showToast({
-						title: '退款数量不能已购买数量',
+						title: '退款数量不能超过已购买数量',
 						icon: 'none',
 						duration: 2000
 					})
@@ -275,7 +275,7 @@
 				})
 			},
 			addMon(){
-				if (this.nummoney < this.detailAny.join_info.people_number) {
+				if (this.nummoney < this.detailAny.verification.total_number) {
 					this.nummoney++;
 					this.priceGem = Number(this.detail.price)*Number(this.nummoney)+".00";
 				}else{
diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue
index 4da44c1..b4f7551 100644
--- a/packageA/center/applyDetail.vue
+++ b/packageA/center/applyDetail.vue
@@ -113,7 +113,7 @@
 
 		
 		<view class="footer flex align-items" style="justify-content: space-between;">
-				<span style="margin-bottom: 170rpx; width: 750rpx;">
+				<span style="margin-bottom: 170rpx; width: 750rpx;margin-left: 20rpx;">
 					<cc-protocolBox :agree="agree" :protocolArr="protocolArr" @click="agree = true"
 						@protocolClick="protocolClick"></cc-protocolBox>
 				</span>	
@@ -285,6 +285,7 @@
 				titleStyle: {
 					color: '#FFFFFF'
 				},
+				oper_data:null
 			};
 		},
 
@@ -312,13 +313,39 @@
 			console.log(options.id)
 			this.getDetail()
 			// this.getShare()
-			this.getAgreement()
+			this.getAgreement();
+			this.getMoneyGetm();
 		},
 
 		methods: {
 			addMon(){
-				this.nummoney++
-				this.getMoneyGetm();
+				if (this.detail.feel == 1) {
+					if (this.nummoney < Number(this.oper_data.free_activity_max_people) && 
+					this.nummoney < (this.detail.join_info.stock - this.detail.join_info.people_number)) {
+						this.nummoney++
+						this.getMoneyGetm();
+					}else{
+						uni.showToast({
+							title: '不能超过免费限制数量和剩余可报名人数',
+							icon: 'none',
+							duration: 5000
+						})
+						return;
+					}
+				}else{
+					
+					if (this.nummoney < (this.detail.join_info.stock - this.detail.join_info.people_number)) {
+						this.nummoney++
+						this.getMoneyGetm();
+					}else{
+						uni.showToast({
+							title: '不能超过剩余数量',
+							icon: 'none',
+							duration: 5000
+						})
+						return;
+					}
+				}
 			},
 			removeMon(){
 				if (this.nummoney > 1) {
@@ -576,6 +603,7 @@
 					if (res.code == 1) {
 						this.priceGem = res.data.order_data.totalprice
 						this.order_no = res.data.order_no
+						this.oper_data = res.data.oper_data
 					} else {
 						uni.showToast({
 							title: res.msg,
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index 2771062..b012459 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -298,7 +298,7 @@
 					})
 				}else{
 					uni.navigateTo({
-						url: "/packageA/my/pendinPayStatus?id=" + id 
+						url: "/packageA/my/pendinPayStatus?id=" + id +  "&status=" + status
 					})
 				}
 
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index 3d6f97a..ef68c46 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -1,91 +1,95 @@
 <template>
 	<view class="detail_all">
+		<view class="nav">
+			<u-navbar :is-back="true" leftIconColor="#323232" :autoBack='true' :title="toptitle + '订单'" bgColor="#FFFFFF" 
+				:titleStyle='titleStyle'> </u-navbar>
+		</view>
 		<view class="box flex justify-start flex-column align-items">	
 
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
+			<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
 
-			<view class="first-box flex flex-start flex-column justify-start">
-				<view class="flex align-items justify-center">
-					<image class="head_img" v-if="detail.images.length > 0" :src="detail.images[0]" mode="" ></image>
-					<view style="margin-left: 20rpx;">
-						<view class="flex align-items">
-							<span class="first-name">{{detail.title}}</span>
-						</view>				
-						<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
-							<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
-							<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
-							<span style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
+				<view class="first-box flex flex-start flex-column justify-start">
+					<view class="flex align-items justify-center">
+						<image class="head_img" v-if="detail.images.length > 0" :src="detail.images[0]" mode="" ></image>
+						<view style="margin-left: 20rpx;">
+							<view class="flex align-items">
+								<span class="first-name">{{detail.title}}</span>
+							</view>				
+							<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
+								<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
+								<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
+								<span style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 
-						</view>
-						<view class="flex align-items" style="margin-top: 20rpx;">
-							￥{{detailAny.totalprice}}
+							</view>
+							<view class="flex align-items" style="margin-top: 20rpx;">
+								￥{{detailAny.totalprice}}
+							</view>
 						</view>
 					</view>
+
+					<span class="line"></span>
+					<span class="first-image flex align-items" style="margin-top: 20rpx;">
+						<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
+						<span>{{formattedTime.formattedTime}}</span>
+					</span>
+					<span class="line"></span>
+
+					<span class="first-image flex align-items space-between"
+						style="width: 100%;"
+						@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
+						<view>
+							<image src="/static/center/address.png" mode="" class="icon-size"></image>
+							<span class="white-space">{{detail.address_detail}}</span>
+						</view>
+						<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
+					</span>
+
 				</view>
 
-				<span class="line"></span>
-				<span class="first-image flex align-items" style="margin-top: 20rpx;">
-					<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
-					<span>{{formattedTime.formattedTime}}</span>
-				</span>
-				<span class="line"></span>
 
-				<span class="first-image flex align-items space-between"
-					style="width: 100%;"
-					@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
-					<view>
-						<image src="/static/center/address.png" mode="" class="icon-size"></image>
-						<span class="white-space">{{detail.address_detail}}</span>
+			</view>
+			<view class="third flex flex-column" style="justify-content: flex-start;">
+				<view class="third-center">
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>订单状态</span>
+						<span>{{ toptitle }}</span>
 					</view>
-					<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
-				</span>
-
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>订单编号</span>
+						<span>{{detailAny.order_no}}</span>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>创建时间</span>
+						<span>{{ formattime(detailAny.createtime)}}</span>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>付款金额</span>
+						<span style="color: #FF4810;">￥{{detailAny.totalprice}}</span>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>付款方式</span>
+						<span>{{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}}</span>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
+						<span>付款时间</span>
+						<span>{{ formattime(detailAny.paytime)}}</span>
+					</view>
+				</view>
 			</view>
 
 
-		</view>
-		<view class="third flex flex-column" style="justify-content: flex-start;">
-			<view class="third-center">
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>订单状态</span>
-					<span>{{detailAny.status == 9 ? '已完成' : '' }}</span>
-				</view>
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>订单编号</span>
-					<span>{{detailAny.order_no}}</span>
-				</view>
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>创建时间</span>
-					<span>{{ formattime(detailAny.createtime)}}</span>
-				</view>
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>付款金额</span>
-					<span style="color: #FF4810;">￥{{detailAny.totalprice}}</span>
-				</view>
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>付款方式</span>
-					<span>{{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}}</span>
-				</view>
-				<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
-					<span>付款时间</span>
-					<span>{{ formattime(detailAny.paytime)}}</span>
-				</view>
+			<view class="footer flex align-items flex-column" style="justify-content: space-between;">
+
+					<!-- <view class="footer-right flex justify-center align-items">
+						<span @click="pament()"> 申请售后 </span>
+					</view>		 -->
 			</view>
+
+
+
+
+
 		</view>
-
-
-		<view class="footer flex align-items flex-column" style="justify-content: space-between;">
-
-				<!-- <view class="footer-right flex justify-center align-items">
-					<span @click="pament()"> 申请售后 </span>
-				</view>		 -->
-		</view>
-
-
-
-
-
-	</view>
 	</view>
 </template>
 
@@ -166,8 +170,11 @@
 				is_show_model: false, //是否显示分享模态窗
 				background: '#ffffff00',
 				titleStyle: {
-					color: '#FFFFFF'
+					color: '#000000',
+					fontSize: '28rpx'
 				},
+				status:null,
+				toptitle: '',
 			};
 		},
 
@@ -176,8 +183,19 @@
 		onLoad(options) {
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.id = options.id
-			
 			this.order_no = options.order_no
+			this.status = options.status;
+			if (options.status == 9) {
+				this.toptitle = '已完成'
+			}else if(options.status == -3){
+				this.toptitle = '已关闭'
+			}else if(options.status == 4 || options.status == 7){
+				this.toptitle = '售后中'
+			}else if(options.status == 5){
+				this.toptitle = '退款中'
+			}else if(options.status == 6){
+				this.toptitle = '已退款'
+			}
 			this.getDetail()
 		},
 
@@ -348,6 +366,7 @@
 	.box {
 		position: relative;
 		margin: 0 30rpx;
+		margin-top: 180rpx;
 	}
 
 
diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue
index 0da8c4f..4bbd490 100644
--- a/packageA/my/person-detail.vue
+++ b/packageA/my/person-detail.vue
@@ -21,14 +21,14 @@
 							<u--input v-model="niName" placeholder="请输入昵称" border="none" inputAlign="right"></u--input>
 						</view>
 					</view>
-					<view class="list-item">
+					<!-- <view class="list-item">
 						<view class="left">
 							银行卡
 						</view>
 						<view class="right">
 							<u-icon name="arrow-right" color="#babdc7"></u-icon>
 						</view>
-					</view>
+					</view> -->
 
 
 				</view>
diff --git a/pages.json b/pages.json
index 8a38c42..cc37688 100644
--- a/pages.json
+++ b/pages.json
@@ -141,7 +141,8 @@
 		{
 			"path": "my/pendinPayStatus",
 			"style": {
-				"navigationBarTitleText": "已完成订单"
+				"navigationBarTitleText": "已完成订单",
+				"navigationStyle": "custom"
 			}
 		},
 
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 4976b42..97ad079 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -34,7 +34,7 @@
 							<span class="white-space title">{{item.title}}</span>
 							<span class="time">{{item.createtime_text}}</span>
 						</view>
-						<span class="white-space text">{{item.desc}}</span>
+						<span class="text">{{item.desc}}</span>
 					</view>
 
 					<!-- <span class="jiao">
diff --git a/pages/activity/stationStemys.vue b/pages/activity/stationStemys.vue
index 39986f2..ced1a5f 100644
--- a/pages/activity/stationStemys.vue
+++ b/pages/activity/stationStemys.vue
@@ -49,6 +49,7 @@
 				limit: 10,
 				list:[],
 				loadStatus: 'loading',
+				count:0
 			};
 		},
 		onLoad(option) {
@@ -57,8 +58,10 @@
 			this.resetLists()
 		},
 		onReachBottom() {
-			this.page++;
-			this.getDetail();
+			if (this.list.length < this.count) {
+				this.page++;
+				this.getDetail();
+			}
 		},
 		methods: {
 			// 单独已读
@@ -97,6 +100,7 @@
 					}
 				}).then(res => {
 					if (res.code == 1) {
+						this.count = res.data.count;
 						this.list = [...res.data.list , ...this.list ]
 						this.loadStatus = this.list.length >= res.data.count ? 'nomore' : 'loading';
 					} else {
diff --git a/pages/center/index.vue b/pages/center/index.vue
index a652c77..f49d731 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -635,8 +635,8 @@ export default {
 			console.log('confirm', e.value)
 			this.form.cut = e.value[0]
 			this.fileList1 = [],
-				this.list1 = '',
-				this.name = ''
+			this.list1 = '',
+			this.name = ''
 		},
 
 
@@ -929,31 +929,32 @@ export default {
 									url: "/pages/my/index"
 								})
 							}, 2000);
-							//置空
-							this.form = {
-								cate_ids: '',
-								// 活动分类名字
-								cate_idsName: "",
-								content: '',
-								refund_id: '',
-								refund_idn: '',
-								price: 1,
-								stock: '',
-								sign_time: '',
-								time: '',
-								images: '',
-								title: '',
-								address: '',
-								latitude: '',
-								longitude: '',
-								address_detail: '', //详细位置
-								date: '', //活动开始时间
-								date1: '', //活动结束时间
-								birth: '', //报名开始日期
-								birth1: '', //报名结束日期
-							}
 						}
 					});
+					//置空
+					this.list1 = [];
+					this.form = {
+						cate_ids: '',
+						// 活动分类名字
+						cate_idsName: "",
+						content: '',
+						refund_id: '',
+						refund_idn: '',
+						price: 1,
+						stock: '',
+						sign_time: '',
+						time: '',
+						images: '',
+						title: '',
+						address: '',
+						latitude: '',
+						longitude: '',
+						address_detail: '', //详细位置
+						date: '', //活动开始时间
+						date1: '', //活动结束时间
+						birth: '', //报名开始日期
+						birth1: '', //报名结束日期
+					}
 
 				} else {
 					uni.showToast({
@@ -1318,7 +1319,7 @@ export default {
 		width: 750rpx;
 		height: 1040rpx;
 		top: -164rpx;
-		z-index: 0;
+		z-index: 1;
 	}
 
 	.bqlist {