From e3c10cd38b2f0dfa06879d67439931f272addeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Wed, 18 Jun 2025 18:32:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2UI?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E6=96=B0=E5=A2=9E=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=B8=AD=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=E7=A7=BB=E5=88=B0?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=9A=84=E5=88=86=E7=B1=BB=E4=B8=8A=203.?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=204.?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=8A=A0=E7=B2=97=205.=E4=BF=A1=E9=98=B3=E4=BA=94?=
 =?UTF-8?q?=E9=99=A2=E5=AE=98=E7=BD=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/afterSales/index.vue    |   4 +-
 packageA/afterSales/info.vue     |   9 +-
 packageA/center/applyDetail.vue  |   4 +-
 packageA/center/detailSys.vue    |   4 +-
 packageA/my/cancelActivity.vue   |  12 +-
 packageA/my/exercise.vue         |  42 +++--
 packageA/my/orderList.vue        | 295 ++++++++++++++++---------------
 packageA/my/pendinPay.vue        |  32 ++--
 packageA/my/pendinPayDetail.vue  |  18 +-
 packageA/my/pendinPayStatus.vue  |   9 +-
 packageA/my/person-detail.vue    |  12 +-
 packageA/my/stationDetail.vue    |   4 +-
 pages.json                       |   3 +-
 pages/activity/stationStemys.vue |   1 +
 pages/center/index.vue           |  29 ++-
 pages/fenl/index.vue             | 151 ++++++++++------
 pages/index/index.vue            |  23 +--
 pages/my/applyOwner.vue          |   2 +-
 18 files changed, 363 insertions(+), 291 deletions(-)

diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue
index 82a0c88..180a04d 100644
--- a/packageA/afterSales/index.vue
+++ b/packageA/afterSales/index.vue
@@ -19,7 +19,7 @@
 					<view class="flex">
 						<image v-if="detail.images" :src="detail.images[0]" mode="" style="width: 159rpx;height: 159rpx;border-radius: 18rpx;"></image>
 						<view class="flex align-items flex-column" style="margin-left: 20rpx;">
-							<span class="first-name white-space">{{detail.title}}</span>
+							<span class="first-name white-space" style="font-weight: 600;">{{detail.title}}</span>
 							<view class="rbot flex align-items">
 								<image src="/static/center/address.png" mode="" style="width: 32rpx;height: 32rpx;margin-right: 20rpx;"></image>
 								<span class="white-space">{{detail.address}}{{detail.address_detail}}</span>
@@ -700,7 +700,7 @@
 		}
 		.popup-content{
 			height: 700rpx;
-			margin-bottom: 75rpx;
+			padding-bottom: 130rpx;
 			// overflow-y: auto;
 		}
 		.popup-content-item{
diff --git a/packageA/afterSales/info.vue b/packageA/afterSales/info.vue
index 1692cff..a194fcd 100644
--- a/packageA/afterSales/info.vue
+++ b/packageA/afterSales/info.vue
@@ -9,7 +9,7 @@
 						<image class="head_img" :src="info.detail.images[0]" mode=""></image>
 						<view style="margin-left: 20rpx;">
 							<view class="flex align-items">
-								<text class="first-name">{{ info.detail.title }}</text>
+								<text class="first-name" style="font-weight: 600;">{{ info.detail.title }}</text>
 							</view>
 							<view class="first-image flex align-items" style="margin-top: 25rpx;">
 								<image :src="info.user.avatar" mode=""
@@ -155,7 +155,6 @@
 						<text v-if="info.server_status == 6" style="color: #FF4810;font-weight: 600;">￥{{
 							info.total_refundprice}}</text>
 					</view>
-					
 				</view>
 			</view>
 
@@ -186,7 +185,7 @@
 						<view class="first-image flex align-items space-between" style="width: 100%;margin-top: 30rpx;">
 							<view class="flex" style="align-items: center;">
 								<image src="/static/center/address.png" mode="" class="icon-size"></image>
-								<text>{{ info.detail.address }}{{ info.detail.address_detail }}</text>
+								<text style="font-size: 26rpx;font-weight: 400;">{{ info.detail.address }}{{ info.detail.address_detail }}</text>
 							</view>
 						</view>
 					</view>
@@ -194,7 +193,7 @@
 				<view style="padding: 0rpx 40rpx;">
 					<view style="display: flex;justify-content: space-between;align-items: center;">
 						<view style="font-size: 28rpx;font-weight: 600;">退款数量</view>
-						<view>{{ info.num }}</view>
+						<view>{{ info.auth_num }}</view>
 					</view>
 					<view style="height: 1px;background-color:#F0F0F0;width: 100%;margin: 30rpx 0rpx;"></view>
 					<view style="display: flex;justify-content: space-between;align-items: center;">
@@ -1015,7 +1014,7 @@ export default {
 	border-radius: 198rpx 198rpx 198rpx 198rpx;
 	font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
 	font-weight: 400;
-	font-size: 32rpx;
+	font-size: 36rpx;
 	color: #BBFC5B;
 	line-height: 90rpx;
 	text-align: center;
diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue
index c4954f1..f3a9d61 100644
--- a/packageA/center/applyDetail.vue
+++ b/packageA/center/applyDetail.vue
@@ -20,11 +20,11 @@
 							<image v-if="detail.images" :src="detail.images[0]" mode=""
 								style="width: 159rpx;height: 159rpx;border-radius: 18rpx;"></image>
 							<view class="flex align-items flex-column" style="margin-left: 20rpx;">
-								<span class="first-name white-space">{{ detail.title }}</span>
+								<span class="first-name white-space" style="font-weight: 600;">{{ detail.title }}</span>
 								<view class="rbot flex align-items">
 									<image src="/static/center/address.png" mode=""
 										style="width: 32rpx;height: 32rpx;margin-right: 20rpx;"></image>
-									<span class="white-space">{{ detail.address_detail }}</span>
+									<span class="white-space">{{ detail.address }}{{ detail.address_detail }}</span>
 								</view>
 							</view>
 						</view>
diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue
index 11eb289..7373f24 100644
--- a/packageA/center/detailSys.vue
+++ b/packageA/center/detailSys.vue
@@ -300,8 +300,8 @@
 				});
 			},
 			formattedTime() {
-				const startTime = dateWeek(this.detail.sign_start_time);
-				const endTime = dateWeek(this.detail.sign_end_time);
+				const startTime = dateWeek(this.detail.start_time);
+				const endTime = dateWeek(this.detail.end_time);
 				return {
 					formattedTime: `${startTime} ~ ${endTime}`
 				};
diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue
index 791b7c2..77b505b 100644
--- a/packageA/my/cancelActivity.vue
+++ b/packageA/my/cancelActivity.vue
@@ -9,11 +9,12 @@
 						<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>
+								<span class="first-name" style="font-weight: 600;">{{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;border-radius: 50%;"></image>
 								<span style="color:#9C9C9C;padding-left: 10rpx;">{{ detailAny.user.nickname }}</span>
+								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<span
 									style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 
@@ -31,15 +32,16 @@
 					</span>
 					<span class="line"></span>
 
-					<span class="first-image flex align-items space-between" style="width: 100%;"
+					<view 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.address_detail}}</span>
+							<image src="/static/center/address.png" mode="" class="icon-size" style="vertical-align: middle;"></image>
+							<!-- <view class="white-space">{{detail.address}}{{detail.address_detail}}</view> -->
+							<text class="white-space" style="font-weight: 400;font-size: 26rpx;color: #222222;vertical-align: middle;">{{detail.address}}{{detail.address_detail}}</text>
 						</view>
 						<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
 						</image>
-					</span>
+					</view>
 
 				</view>
 
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index 04a69f5..02e06d7 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -22,7 +22,7 @@
 						<image class="tut" :src="item.detail.images[0]"></image>
 						<view style="margin-left: 20rpx;width: 80%;">
 							<view>
-								<span>{{ item.detail.title }}</span>
+								<span style="font-weight: 600;">{{ item.detail.title }}</span>
 							</view>
 							<view style="margin-top: 30rpx;" class="flex flex-between align-items">
 								<span style="font-size: 32rpx;">￥{{ item.totalprice }}</span>
@@ -55,14 +55,13 @@
 					</view>
 				</view>
 
-				<view class="flex justify-center align-items" v-if="list.length == 0" style="height: 90vh;">
-					<view>
-						<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
-						</image>
-						<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无参与活动</view>
-					</view>
+				<view class="flex flex-column flex-start align-items" v-if="list.length == 0"
+					style="margin-top: 300rpx;">
+					<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
+					</image>
+					<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无参与活动</view>
+					<view class="tofb" @click="tofb">参与活动</view>
 				</view>
-
 			</view>
 
 
@@ -226,7 +225,7 @@
 			};
 		},
 		onLoad(option) {
-			
+			 this.isInitialized  = true;  // 标记已初始化 
 			console.log(1);
 			if (option?.status) {
 				this.selected = option.status
@@ -234,11 +233,11 @@
 			} else {
 				this.getList('-3,0,2,3,4,5,6,7,9');
 			}
-			 this.isInitialized  = true;  // 标记已初始化 
+			
 		},
 		onShow() {
 			console.log(2);
-			if (!this.isInitialized)  return;  // 拦截未初始化时的逻辑 
+			if (this.isInitialized)  return;  // 拦截未初始化时的逻辑 
 			setTimeout(()=>{
 				this.list = []
 				this.page = 1
@@ -266,6 +265,11 @@
 		},
 
 		methods: {
+			tofb() {
+				uni.switchTab({
+					url: '/pages/index/index',
+				});
+			},
 			dateWeeks(e) {
 				return dateWeek(e);
 			},
@@ -403,6 +407,7 @@
 						} else {
 							this.loadStatus = 'loading';
 						}
+						 this.isInitialized  = false;  // 标记已初始化 
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -491,7 +496,6 @@
 
 			.hdkuai {
 				background: #FFFFFF;
-				width: 690rpx;
 				// height: 360rpx;
 				// justify-content: space-around;
 				margin: 30rpx;
@@ -888,6 +892,20 @@
 		text-overflow: ellipsis;
 		/* 使用省略号表示被截断的文本 */
 	}
+	.tofb {
+		margin-top: 50rpx;
+		width: 280rpx;
+		height: 70rpx;
+		background: #323232;
+		border-radius: 198rpx;
+		font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #BBFC5B;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 </style>
 <style lang="scss">
 	.foot_btn {
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index ce744a8..03ab011 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="box flex justify-center align-items flex-column">
+	<view class="box">
 		<view class="con-center flex flex-column justify-center align-items">
 			<view class="tabs">
 				<u-tabs :activeStyle="{
@@ -31,156 +31,163 @@
 			</view>
 
 
-			<view :class="['hot', 'flex', 'flex-column', status == 0 || status == -2 ? 'wsh_hot' : '']">
-				<view class="content flex align-items flex-column">
-					<view class="flex flex-column w-100 bbb" style="position: relative;"
-						v-for="(item, index) in hotList" :key="index">
-						<view v-if="status != -2" @click.stop="detail(item.id)">
-							<image v-if="item.auth_status == 0" src="/static/my/daishenhe.png"
-								style="width: 134rpx; height: 106rpx;position: absolute;right: 0;"></image>
-							<image v-if="item.auth_status == 2" src="/static/my/wtg.png"
-								style="width: 134rpx; height: 106rpx;position: absolute;right: 0;"></image>
-							<view class="flex" style="margin-top: 24rpx">
-								<view class="right flex flex-column" style="align-items: self-start;">
-
-									<span class="title white-space" style="padding-left: 30rpx;">{{ item.title }}</span>
-									<span class="first-image flex align-items"
-										style="margin-top: 20rpx; width: 100%;padding-left: 30rpx;">
-										<image :src="item.user.avatar"
-											style="width: 36rpx; height: 36rpx;border-radius: 50%;"></image>
-										<span style="color: #9c9c9c; margin-left: 10rpx;">{{
-											item.user.nickname
-										}}</span>
-										<view class="white-space" style="width: 60%">
-											<span style="color: #0ca013; margin-left: 20rpx"
-												v-for="items_t in item.classes_cate">#{{ items_t }}</span>
-										</view>
-									</span>
-
-									<view class="flex flex-column" style="margin-top: 20rpx;padding-left: 30rpx;">
-										<view class="time flex align-items white-space">
-											<span class="time_tex" v-if="item.status == 2">{{
-												"报名中"
+			<view style="width: 100%;">
+				<view :class="['hot', status == 0 || status == -2 ? 'wsh_hot' : '']">
+					<view class="content flex align-items flex-column">
+						<view class="flex flex-column w-100 bbb" style="position: relative;"
+							v-for="(item, index) in hotList" :key="index">
+							<view v-if="status != -2" @click.stop="detail(item.id)">
+								<image v-if="item.auth_status == 0" src="/static/my/daishenhe.png"
+									style="width: 134rpx; height: 106rpx;position: absolute;right: 0;"></image>
+								<image v-if="item.auth_status == 2" src="/static/my/wtg.png"
+									style="width: 134rpx; height: 106rpx;position: absolute;right: 0;"></image>
+								<view class="flex" style="margin-top: 24rpx">
+									<view class="right flex flex-column" style="align-items: self-start;">
+				
+										<span class="title white-space" style="padding-left: 30rpx;font-weight: 600;">{{ item.title }}</span>
+										<span class="first-image flex align-items"
+											style="margin-top: 20rpx; width: 100%;padding-left: 30rpx;">
+											<image :src="item.user.avatar"
+												style="width: 36rpx; height: 36rpx;border-radius: 50%;"></image>
+											<span style="color: #9c9c9c; margin-left: 10rpx;">{{
+												item.user.nickname
 											}}</span>
-											<span v-if="item.status == 2"
-												style="margin: 0 20rpx">{{ dateWeeks(item.sign_start_time) }}</span>
-											<span v-if="item.status != 2"
-												style="margin: 0 20rpx 0 0">{{ dateWeeks(item.sign_start_time) }}
-											</span><span style="width: 1rpx;height: 22rpx;background: #323232;"></span>
-											<span class="white-space" style="margin-left: 20rpx; width: 260rpx">{{
-													item.address_detail }}</span>
-
-										</view>
-									</view>
-
-									<view class="flex align-items justify-center"
-										style="gap: 16rpx;width: 100%;margin-top: 20rpx;margin-bottom: 32rpx;">
-
-										<view class="imgs_con_div" v-for="(items_img, index) in item.images.slice(0, 3)"
-											:key="index">
-											<image class="imgs_con" :src="items_img"></image>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="bottom flex align-items" v-if="item.auth_status != 0"
-								style="justify-content: space-between;padding: 0rpx 20rpx;">
-								<view v-if="item.status == 1">
-									<image src="/static/index/dian.png"
-										style="width: 60rpx;height: 60rpx;vertical-align: middle;"></image>
-									<text style="margin-left: 20rpx;vertical-align: middle;font-size: 26rpx;">未开始</text>
-								</view>
-								<view v-if="item.status == 2" style="display: flex;align-items: center;">
-									<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30" maxCount="1"
-										gap="0.4"></u-avatar-group>
-									<image src="/static/index/dian.png" style="
-								    width: 60rpx;
-								    height: 60rpx;
-								    margin-left: -20rpx;
-								  "></image>
-									<view style="margin-left: 20rpx;vertical-align: middle;font-size: 24rpx;">
-										{{ Number(item.join_info.people_number) + "人已上车" }}
-									</view>
-								</view>
-								<view style="font-size: 26rpx; width: 24%;">
-									<text>核销：</text>
-									<text style="color: orangered;">{{ item.verification_num }}</text>
-									<text>/{{ item.stock }}</text>
-								</view>
-								<view style="display: flex;align-items: center;justify-content: flex-end;gap: 20rpx;">
-									<view v-if="item.status == 3 || item.status == 4"
-										class="part1 flex justify-center align-items" @click.stop="toHexiao"> 核销 </view>
-									<view class="part flex justify-center align-items" v-if="item.auth_status != 2"
-										@click.stop="detail(item.id)"> 详情 </view>
-								</view>
-							</view>
-						</view>
-						<view v-if="status == -2" @click.stop="detail(item.activity_id)">
-							<view class="flex" style="margin-top: 30rpx">
-								<view class="right flex flex-column"
-									style="align-items: self-start;padding-left: 15px;">
-									<view class="flex flex-column">
-										<view class="time flex align-items white-space">
-											<span style="color: #9C9C9C;">活动时间：{{ dateWeeks(item.detail.sign_start_time)
+											<view class="white-space" style="width: 60%">
+												<span style="color: #0ca013; margin-left: 20rpx"
+													v-for="items_t in item.classes_cate">#{{ items_t }}</span>
+											</view>
+										</span>
+				
+										<view class="flex flex-column" style="margin-top: 20rpx;padding-left: 30rpx;">
+											<view class="time flex align-items white-space">
+												<span class="time_tex" v-if="item.status == 2">{{
+													"报名中"
 												}}</span>
+												<span v-if="item.status == 2"
+													style="margin: 0 20rpx">{{ dateWeeks(item.sign_start_time) }}</span>
+												<span v-if="item.status != 2"
+													style="margin: 0 20rpx 0 0">{{ dateWeeks(item.sign_start_time) }}
+												</span><span style="width: 1rpx;height: 22rpx;background: #323232;"></span>
+												<span class="white-space" style="margin-left: 20rpx; width: 260rpx">{{
+														item.address_detail }}</span>
+				
+											</view>
 										</view>
-									</view>
-									<view style="height: 1px;width: 98%;background-color: #eeeeee;margin: 30rpx 0px;">
-									</view>
-									<view class="flex align-items" style="width: 100%;">
-										<view>
-											<image
-												style="height: 130rpx;width: 130rpx;object-fit: cover;border-radius: 8rpx"
-												:src="item.detail.images[0]"></image>
-										</view>
-										<view class="title white-space" style="padding-left: 20rpx;">
-											<view>{{ item.detail.title }}</view>
-											<view
-												style="display: flex;justify-content: space-between;align-items: center;margin-top: 30rpx;padding-right: 30rpx;">
-												<view>
-													<text style="font-weight: 400;">退款金额：</text>
-													<text v-if="server_status==3"
-														style="color: #FF4810;font-weight: 600;">￥{{ item.first_refundprice }}</text>
-													<text v-if="server_status==6"
-														style="color: #FF4810;font-weight: 600;">￥{{ item.real_refundprice }}</text>
-												</view>
-												<view v-if="item.before_status==-3"
-													style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.num }}</view>
-												<view v-if="item.before_status!=-3"
-													style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.auth_num }}
-												</view>
+				
+										<view class="flex align-items justify-center"
+											style="gap: 16rpx;width: 100%;margin-top: 20rpx;margin-bottom: 32rpx;">
+				
+											<view class="imgs_con_div" v-for="(items_img, index) in item.images.slice(0, 3)"
+												:key="index">
+												<image class="imgs_con" :src="items_img"></image>
 											</view>
 										</view>
 									</view>
-									<view
-										style="height: 1px;width: 98%;background-color: #eeeeee;margin:30rpx 0px 0rpx 0px;">
+								</view>
+								<view class="bottom flex align-items" v-if="item.auth_status != 0"
+									style="justify-content: space-between;padding: 0rpx 20rpx;">
+									<view v-if="item.status == 1">
+										<image src="/static/index/dian.png"
+											style="width: 60rpx;height: 60rpx;vertical-align: middle;"></image>
+										<text style="margin-left: 20rpx;vertical-align: middle;font-size: 26rpx;">未开始</text>
+									</view>
+									<view v-if="item.status == 2" style="display: flex;align-items: center;">
+										<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30" maxCount="1"
+											gap="0.4"></u-avatar-group>
+										<image src="/static/index/dian.png" style="
+									    width: 60rpx;
+									    height: 60rpx;
+									    margin-left: -20rpx;
+									  "></image>
+										<view style="margin-left: 20rpx;vertical-align: middle;font-size: 24rpx;">
+											{{ Number(item.join_info.people_number) + "人已上车" }}
+										</view>
+									</view>
+									<view v-if="item.auth_status != 2" style="font-size: 26rpx; width: 24%;">
+										<text>核销：</text>
+										<text style="color: orangered;">{{ item.verification_num }}</text>
+										<text>/{{ item.stock }}</text>
+									</view>
+									<view style="display: flex;align-items: center;justify-content: flex-end;gap: 20rpx;">
+										<view v-if="item.status == 3 || item.status == 4"
+											class="part1 flex justify-center align-items" @click.stop="toHexiao"> 核销 </view>
+										<view class="part flex justify-center align-items" v-if="item.auth_status != 2"
+											@click.stop="detail(item.id)"> 详情 </view>
+									</view>
+								</view>
+								<view style="padding: 30rpx;">
+									<view v-if="item.auth_status == 2" style="height: 160rpx;color: #323232;font-size: 26rpx;;padding: 20rpx;background: #F7F7F7;border: 1rpx solid #C1C1C1;border-radius: 18rpx 18rpx 18rpx 18rpx;">
+										未通过原因：{{item.reason}}
 									</view>
 								</view>
 							</view>
-							<view class="flex align-items" style="justify-content:space-between;padding: 30rpx">
-								<view style="font-size: 28rpx;color: #323232;">
-									<view v-if="item.auth_status == 1">
-										已同意退款
-									</view>
-									<view v-if="item.auth_status == 2">
-										已驳回
+							<view v-if="status == -2" @click.stop="detail(item.activity_id)">
+								<view class="flex" style="margin-top: 30rpx">
+									<view class="right flex flex-column"
+										style="align-items: self-start;padding-left: 15px;">
+										<view class="flex flex-column">
+											<view class="time flex align-items white-space">
+												<span style="color: #9C9C9C;">活动时间：{{ dateWeeks(item.detail.sign_start_time)
+													}}</span>
+											</view>
+										</view>
+										<view style="height: 1px;width: 98%;background-color: #eeeeee;margin: 30rpx 0px;">
+										</view>
+										<view class="flex align-items" style="width: 100%;">
+											<view>
+												<image
+													style="height: 130rpx;width: 130rpx;object-fit: cover;border-radius: 8rpx"
+													:src="item.detail.images[0]"></image>
+											</view>
+											<view class="title white-space" style="padding-left: 20rpx;">
+												<view>{{ item.detail.title }}</view>
+												<view
+													style="display: flex;justify-content: space-between;align-items: center;margin-top: 30rpx;padding-right: 30rpx;">
+													<view>
+														<text style="font-weight: 400;">退款金额：</text>
+														<text v-if="server_status==3"
+															style="color: #FF4810;font-weight: 600;">￥{{ item.first_refundprice }}</text>
+														<text v-if="server_status==6"
+															style="color: #FF4810;font-weight: 600;">￥{{ item.real_refundprice }}</text>
+													</view>
+													<view v-if="item.before_status==-3"
+														style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.num }}</view>
+													<view v-if="item.before_status!=-3"
+														style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.auth_num }}
+													</view>
+												</view>
+											</view>
+										</view>
+										<view
+											style="height: 1px;width: 98%;background-color: #eeeeee;margin:30rpx 0px 0rpx 0px;">
+										</view>
 									</view>
 								</view>
-								<view
-									style="font-weight: 600;font-size: 28rpx;width: 180rpx;height: 70rpx;text-align: center;line-height: 70rpx;background: linear-gradient( 270deg, #FBF66D 0%, #9CEAA2 100%);border-radius: 276rpx;"
-									@click.stop="goAfterInfo(item.id)"> 查看详情 </view>
+								<view class="flex align-items" style="justify-content:space-between;padding: 30rpx">
+									<view style="font-size: 28rpx;color: #323232;">
+										<view v-if="item.auth_status == 1">
+											已同意退款
+										</view>
+										<view v-if="item.auth_status == 2">
+											已驳回
+										</view>
+									</view>
+									<view
+										style="font-weight: 600;font-size: 28rpx;width: 180rpx;height: 70rpx;text-align: center;line-height: 70rpx;background: linear-gradient( 270deg, #FBF66D 0%, #9CEAA2 100%);border-radius: 276rpx;"
+										@click.stop="goAfterInfo(item.id)"> 查看详情 </view>
+								</view>
 							</view>
 						</view>
+				
+						<view class="flex flex-column flex-start align-items" v-if="hotList.length == 0"
+							style="margin-top: 300rpx;">
+							<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
+							</image>
+							<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无发布活动</view>
+							<view class="tofb" @click="tofb">前往发布</view>
+						</view>
+				
 					</view>
-
-					<view class="flex flex-column flex-start align-items" v-if="hotList.length == 0"
-						style="margin-top: 300rpx;">
-						<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
-						</image>
-						<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无发布活动</view>
-						<view class="tofb" @click="tofb">前往发布</view>
-					</view>
-
 				</view>
 			</view>
 		</view>
@@ -309,7 +316,11 @@
 			});
 			this.page = 1;
 			this.hotList = [];
-			this.getHotList(this.selected);
+			if (this.status == -2) {
+				this.getAfterList();
+			} else {
+				this.getHotList(this.selected);
+			}
 			setTimeout(() => {
 				uni.hideLoading();
 				uni.stopPullDownRefresh();
@@ -696,11 +707,11 @@
 			.shenhe {
 				width: 94%;
 				position: fixed;
-				top: 85rpx;
+				top: 80rpx;
 				//background: #f7f7f7;
 				background: #f7f7f7;
 				z-index: 100;
-				padding: 30rpx 0rpx;
+				padding: 30rpx 0rpx 25rpx 0rpx;
 
 				.span_s {
 					width: 134rpx;
@@ -1048,7 +1059,7 @@
 		margin-top: 80rpx;
 		margin-bottom: 70rpx;
 		min-height: 100vh;
-		width: 94%;
+		padding:0rpx 30rpx;
 
 		.hot-top {
 
@@ -1082,7 +1093,7 @@
 	}
 
 	.wsh_hot {
-		margin-top: 180rpx;
+		margin-top: 175rpx;
 	}
 
 	.content {
diff --git a/packageA/my/pendinPay.vue b/packageA/my/pendinPay.vue
index c63c389..3331293 100644
--- a/packageA/my/pendinPay.vue
+++ b/packageA/my/pendinPay.vue
@@ -9,11 +9,13 @@
 						<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>
+								<span class="first-name" style="font-weight: 600;">{{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;border-radius: 50%;"></image>
+								<image :src="detailAny.user.avatar" mode=""
+									style="width: 36rpx;height: 36rpx;border-radius: 50%;"></image>
 								<span style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</span>
+								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<span
 									style="color:#0CA013;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 								<span style="color:#0CA013;margin-left: 20rpx;"
@@ -39,7 +41,8 @@
 							<span>{{detail.address}}{{detail.address_detail}}</span>
 						</view>
 						<view>
-							<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
+							<image src="/static/detail/daohang.png" class="icon-size"
+								style="width: 50rpx; height: 50rpx;">
 							</image>
 						</view>
 					</span>
@@ -52,15 +55,15 @@
 				<view class="third-center">
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 						<span>订单状态</span>
-						<span>{{detailAny.status == 0 ? '待支付' : '' }}</span>
+						<span style="color: #323232;">{{detailAny.status == 0 ? '待支付' : '' }}</span>
 					</view>
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>订单编号</span>
-						<span>{{detailAny.order_no}}</span>
+						<span style="color: #323232;">{{detailAny.order_no}}</span>
 					</view>
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>创建时间</span>
-						<span>{{ formattime(detailAny.createtime)}}</span>
+						<span style="color: #323232;">{{ formattime(detailAny.createtime)}}</span>
 					</view>
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>付款金额</span>
@@ -68,12 +71,12 @@
 					</view>
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>付款方式</span>
-						<span>{{detailAny.pay_type=='wechat'?'微信支付':'余额'}}</span>
+						<span style="color: #323232;">{{detailAny.pay_type=='wechat'?'微信支付':'余额'}}</span>
 					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
+					<!-- 	<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>付款时间</span>
 						<span>{{ formattime(detailAny.paytime)}}</span>
-					</view>
+					</view> -->
 				</view>
 			</view>
 
@@ -81,13 +84,13 @@
 			<view class="footer flex align-items flex-column" style="justify-content: space-between;">
 
 				<view class="footer-right flex justify-center align-items" @click="pament()">
-					<view class="spans" >
+					<view class="spans">
 						去支付 <u-count-down :time="detailAny.cancel_last_seconds*1000"></u-count-down>
 					</view>
 				</view>
 
 				<view class="footer-right1 flex justify-center align-items" @click="nobuy()">
-					<span class="spans" > 取消订单 </span>
+					<span class="spans"> 取消订单 </span>
 				</view>
 
 			</view>
@@ -952,15 +955,13 @@
 
 	.footer {
 		width: 100%;
-		height: 166rpx;
 		margin-top: 50rpx;
 
 		.footer-right {
 			width: 690rpx;
-			height: 120rpx;
+			height: 90rpx;
 			background: #323232;
 			border-radius: 148rpx;
-			margin-bottom: 30rpx;
 
 			.spans {
 				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
@@ -976,9 +977,10 @@
 
 		.footer-right1 {
 			width: 690rpx;
-			height: 120rpx;
+			height: 90rpx;
 			background: #E4E4E4;
 			border-radius: 148rpx;
+			margin-top: 30rpx;
 
 			.spans {
 				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index 6ccf061..4c91579 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -9,12 +9,13 @@
 						<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">
-								<text class="first-name">{{ detail.title }}</text>
+								<text class="first-name" style="font-weight: 600;">{{ detail.title }}</text>
 							</view>
 							<view class="first-image flex align-items" style="margin-top: 25rpx;">
 								<image :src="detailAny.user.avatar" mode=""
 									style="width: 36rpx;height: 36rpx;border-radius:50%;"></image>
 								<text style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</text>
+								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<text style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number
 									}}人玩过</text>
 							</view>
@@ -122,13 +123,13 @@
 						</span>
 					</view>
 					<view
-						style="display: flex;align-items: center;justify-content: space-between;width: 89%;gap: 30rpx;padding-top: 120rpx;">
+						style="display: flex;align-items: center;justify-content: space-between;width: 89%;gap: 30rpx;padding-top: 30rpx;">
 						<view @click="closeCancels" class="btn_2">关闭</view>
 						<view @click="paidcancel(detailAny.id)"
-							v-if="detailAny.detail.feel == 0 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"
+							v-if="detailAny.detail.feel == 1 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"
 							class="btn_1">确认取消</view>
 						<view @click="cancelOrder(detailAny.id)"
-							v-if="detailAny.detail.feel == 1 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"
+							v-if="detailAny.detail.feel == 0 && detailAny.status == 2 && (detail.status==1 || detail.status==2 || detail.status==3)"
 							class="btn_1">确认取消</view>
 						<!-- <image src="../../static/center/price.png" mode="" style="width: 642rpx;height: 80rpx;"></image> -->
 						<!-- <u-loading-icon :vertical="true" v-if="uloadingShow"></u-loading-icon> -->
@@ -206,7 +207,7 @@
 				is_collect: 0,
 				popupStyleOk: {
 					width: '640rpx',
-					height: '414rpx',
+					height: '300rpx',
 					margin: '0 auto', // 水平居中
 					display: 'flex',
 					justifyContent: 'flex-start',
@@ -1123,12 +1124,11 @@
 
 	.popupBox {
 		width: 640rpx;
-		height: 414rpx;
 		background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/confirm2.png");
-		background-size: 100%;
+		background-size: 100% 100%;
 		background-repeat: no-repeat;
 		border-radius: 44rpx;
-
+    padding-bottom: 30rpx;
 		.pop-header {
 			width: 100%;
 
@@ -1162,7 +1162,7 @@
 				margin-top: 30rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				color: #202020;
 				line-height: 34rpx;
 				text-align: center;
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index f581fc9..1e76580 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -13,11 +13,12 @@
 						<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>
+								<span class="first-name" style="font-weight: 600;">{{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;border-radius: 50%;"></image>
 								<span style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</span>
+								<text style="color:#9C9C9C;margin-left: 20rpx;">/</text>
 								<span style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 
 							</view>
@@ -77,7 +78,9 @@
 						<span style="color: #323232;">{{ formattime(detailAny.paytime)}}</span>
 					</view>
 				</view>
-				<view class="third flex flex-column" style="justify-content: flex-start;" >
+				
+			</view>
+<view class="third flex flex-column" style="justify-content: flex-start;" >
 					<view class="third-center" v-if="detailAny.auth_status == 2">
 						<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 							<text>是否同意退款</text>
@@ -109,8 +112,6 @@
 						
 					</view>
 				</view>
-			</view>
-
 
 			<view class="footer flex align-items flex-column" style="justify-content: space-between;">
 					<view @click="service(detailAny.id)" class="footer-right flex justify-center align-items" v-if="status == 9">
diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue
index 4c12e06..408eb70 100644
--- a/packageA/my/person-detail.vue
+++ b/packageA/my/person-detail.vue
@@ -4,11 +4,11 @@
 		<view class="container">
 			<view class="card">
 				<view class="list">
-					<view class="list-item">
+					<view class="list-item" @click="setAvator">
 						<view class="left">
 							头像设置
 						</view>
-						<view class="right" @click="setAvator">
+						<view class="right" >
 							<view>
 								<u-avatar :src="avatar" shape="circle" size="35"></u-avatar>
 							</view>
@@ -17,11 +17,11 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-item">
+					<view class="list-item"  @click="toName('nc')">
 						<view class="left">
 							昵称设置
 						</view>
-						<view class="right" @click="toName('nc')">
+						<view class="right">
 							<view>
 								<text>{{ niName }}</text>
 							</view>
@@ -30,11 +30,11 @@
 							</view>
 						</view>
 					</view>
-					<view class="list-item">
+					<view class="list-item"  @click="toName('qm')">
 						<view class="left">
 							签名
 						</view>
-						<view class="right" @click="toName('qm')">
+						<view class="right">
 							<view>
 								<text>{{ signature }}</text>
 							</view>
diff --git a/packageA/my/stationDetail.vue b/packageA/my/stationDetail.vue
index eeb117d..087b4a0 100644
--- a/packageA/my/stationDetail.vue
+++ b/packageA/my/stationDetail.vue
@@ -5,8 +5,8 @@
 			<view class="center">
 				<span class="title">{{detail.title}}</span>
 				<view style="margin-top: 15rpx;">
-				 	<rich-text :nodes="detail.desc" selectable user-select style="font-weight: 400;font-size: 26rpx;"></rich-text>
-					<view style="margin:16rpx 0;color: #9c9c9c;">{{detail.createtime_text}}</view>
+				 	<rich-text :nodes="detail.desc" selectable user-select style="font-weight: 400;"></rich-text>
+					<view style="margin:16rpx 0;color: #9c9c9c;font-size: 26rpx;font-weight: 400;">{{detail.createtime_text}}</view>
 				</view>
 			</view>
 		</view>
diff --git a/pages.json b/pages.json
index 79753e4..1384b8f 100644
--- a/pages.json
+++ b/pages.json
@@ -13,8 +13,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "多样青春·活动",
-				"navigationStyle": "custom", //单个页面设置，
-				"enablePullDownRefresh": true
+				"navigationStyle": "custom" //单个页面设置，
 				
 			}
 		},
diff --git a/pages/activity/stationStemys.vue b/pages/activity/stationStemys.vue
index 4e9b553..de5a0b9 100644
--- a/pages/activity/stationStemys.vue
+++ b/pages/activity/stationStemys.vue
@@ -60,6 +60,7 @@
 			};
 		},
 		onShow() {
+			this.resetLists()
 			this.getDetail();
 		},
 		onLoad(option) {
diff --git a/pages/center/index.vue b/pages/center/index.vue
index f63ca9e..8a61c5f 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -353,7 +353,7 @@
 				<view style="padding: 0rpx 30rpx;">
 					<view style="padding: 30rpx 0rpx;border: 2px solid #EEEEEE;border-radius: 20rpx;">
 						<view>
-							<input :focus="priceShow" :cursor-spacing="300" type="digit" placeholder="请输入" v-model="price"
+							<input :focus="priceShow" :maxlength="5" :cursor-spacing="300" type="digit" placeholder="请输入" v-model="price"
 								style="text-align: center;" />
 						</view>
 					</view>
@@ -1353,26 +1353,15 @@ uni.hideShareMenu();
 			}
 			uni.$u.http.post(url, params).then(res => {
 				if (res.code == 1) {
-					uni.showToast({
-						title: '发布成功！',
-						icon: 'none',
-						duration: 2000,
-						complete: function () {
-							setTimeout(function () {
-								uni.navigateTo({
-									url: "/packageA/my/orderList"
-								})
-							}, 2000);
-						}
-					});
 					//置空
 					this.fileList1 = [];
 					this.agree = false;
 					this.list1 = '';
 					this.price = '';
 					this.priceName = '免费';
+					this.qunQrcode='';
 					this.form = {
-						qunQrcode: '',
+						
 						cate_ids: '',
 						// 活动分类名字
 						cate_idsName: "",
@@ -1394,7 +1383,17 @@ uni.hideShareMenu();
 						birth: '', //报名开始日期
 						birth1: '', //报名结束日期
 					}
-
+					
+					uni.showToast({
+						title: '发布成功！',
+						icon: 'none',
+						duration: 2000,
+					});
+					setTimeout(function () {
+						uni.navigateTo({
+							url: "/packageA/my/orderList"
+						})
+					}, 1000);
 				} else {
 					this.$u.toast(res.msg);
 					// uni.showToast({
diff --git a/pages/fenl/index.vue b/pages/fenl/index.vue
index cd5b660..5cb2a04 100644
--- a/pages/fenl/index.vue
+++ b/pages/fenl/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="recharge flex align-items justify-start flex-column">
 		<view class="nav">
-			<u-navbar :is-back="false" :autoBack='false' leftIconColor="#323232"  bgColor="#FFFFFF"> 
+			<u-navbar :is-back="false" :autoBack='false' leftIconColor="#323232" bgColor="#FFFFFF">
 				<view class="serch_top" slot="left">
 					<view class="serch_top1">
 						<u-search class="u-search" v-model="keywords" placeholder="搜索您要找的内容" :showAction="false"
@@ -12,12 +12,13 @@
 				</view>
 			</u-navbar>
 		</view>
-		<view class="box flex justify-start"> 
+		<view class="box flex justify-start">
 
 			<!-- 标签 -->
 			<view class="tab_all">
-				<scroll-view class="tabs" scroll-y="true">
-					<view v-for="(tab, index) in list" :key="index" :class="['tab-item', { active: current === index }]"
+				<scroll-view class="tabs" scroll-y="true" :style="{'height':scrollHeightbt}">
+					<view v-for="(tab, index) in list" :key="index"
+						:class="['tab-item', { active: current === index }, { 'bottomBorder': (current-1) === index }]"
 						@click="handleClick(index, tab.id)">
 						<span>{{ tab.name }}</span>
 					</view>
@@ -37,12 +38,13 @@
 								<view class="first-image flex align-items" style="margin-top: 20rpx;width: 100%;">
 									<span class="time_tex" v-if="item.status == 2">{{ '报名中' }}</span>
 									<image v-if="cate_ids != 1" :src="item.user.avatar"
-										style="width: 36rpx;height: 36rpx;border-radius: 80rpx;margin-left: 10rpx;"></image>
+										style="width: 36rpx;height: 36rpx;border-radius: 80rpx;margin-left: 10rpx;">
+									</image>
 									<image v-else :src="item.headimage"
 										style="width: 36rpx;height: 36rpx;border-radius: 80rpx;"></image>
 									<span v-if="cate_ids != 1"
 										style="color: #9C9C9C;margin-left: 10rpx;">{{ item.user.nickname }}</span>
-									<span v-else 
+									<span v-else
 										style="color: #9C9C9C;margin-left: 10rpx;">{{ item.teacher.name }}</span>
 									<view>
 										<span style="color:#0CA013;margin-left: 20rpx;"
@@ -66,7 +68,7 @@
 									style="margin-top: 20rpx;margin-bottom: 32rpx;">
 									<view class="imgs_con_div" v-for="(items_img, index) in item.images.slice(0, 3)"
 										:key="index">
-										<image class="imgs_con"  :src="items_img"></image>
+										<image class="imgs_con" :src="items_img"></image>
 									</view>
 								</view>
 							</view>
@@ -97,7 +99,8 @@
 
 					</view>
 				</view>
-				<view class="bottom_box flex justify-center align-items" style="height: 1240rpx;width: 100%;" v-if="hotList.length == 0">
+				<view class="bottom_box flex justify-center align-items" style="height: 1240rpx;width: 100%;"
+					v-if="hotList.length == 0">
 					<view style="text-align: center;">
 						<image src="/static/no.png" style="width: 150rpx;height: 150rpx;"></image>
 						<view>暂无数据</view>
@@ -107,7 +110,7 @@
 			</view>
 
 
-			
+
 		</view>
 
 		<tab-bar :tabBarShow="1"></tab-bar>
@@ -157,11 +160,13 @@
 					enterprise_name: '',
 					enterprise_addr: '',
 					outdoor_sport: '',
-				}
+				},
+				scrollHeightbt:'',
 			};
 		},
 		onLoad() {
-			this.getinit();
+			this.onheight();
+			//this.getinit();
 			this.resetLists();
 			this.getHotList();
 			this.getBqList();
@@ -194,6 +199,25 @@
 			}, 2000)
 		},
 		methods: {
+			onheight() {
+				uni.getSystemInfo({
+					success: res => {
+						console.log(res, 'data')
+						console.log(res.screenHeight) //屏幕高度
+						const custom = wx.getMenuButtonBoundingClientRect();
+						//顶部导航栏高度
+						const navHeight = custom.bottom + custom.top - res.statusBarHeight;
+						//目标高度
+						let intHeight;
+						if (/iPad|iPhone|iPod/.test(res.model)) {
+							intHeight = res.screenHeight - navHeight - 80;
+						} else {
+							intHeight = res.screenHeight - navHeight - 55;
+						}
+						this.scrollHeightbt = intHeight + 'px';
+					}
+				});
+			},
 			dateWeeks(e) {
 				return dateWeek(e);
 			},
@@ -214,6 +238,11 @@
 			},
 			// 搜索
 			search() {
+				this.current = 0;
+				this.cate_ids = 0;
+				this.hotList = [];
+				this.page = 1;
+				this.limit = 6;
 				if (this.keywords == "") {
 					this.tjShow = true;
 				} else {
@@ -506,13 +535,13 @@
 		position: fixed;
 		border-radius: 0rpx 18rpx 0rpx 0rpx;
 		left: 0;
-		
+
 		.tabs {
 			display: flex;
 			flex-flow: column;
 			margin-right: 20rpx;
 			width: 188rpx;
-			height: 1290rpx;
+			height: 1300rpx;
 
 
 			/* 优化滚动效果 */
@@ -531,7 +560,8 @@
 				height: 110rpx;
 				line-height: 110rpx;
 				background: #ffffff;
-				span{
+
+				span {
 					width: 100%;
 				}
 			}
@@ -542,70 +572,78 @@
 				color: #323232;
 				background: #f7f7f7;
 				border-radius: 0 0 0 0;
-				&:before{
+
+				&:before {
 					content: '';
 					width: 10rpx;
 					height: 46rpx;
-					background: linear-gradient( 270deg, #FBF66D 0%, #9CEAA2 100%);
+					background: linear-gradient(270deg, #FBF66D 0%, #9CEAA2 100%);
 					border-radius: 91rpx 91rpx 91rpx 91rpx;
 				}
-				+.tab-item { 
+
+				+.tab-item {
 					border-radius: 0 18rpx 0 0;
 				}
 			}
 		}
 	}
 
+
 	.recharge {
 		width: 750rpx;
 		background-color: #f7f7f7;
 		height: 100%;
 		min-height: 100vh;
-		.serch_top {
-				display: flex;
-				align-items: center;
-				.serch_top1 {
-					// margin-top: 10rpx;
-					// margin-bottom: 30rpx;
-					position: relative;
-					width: 500rpx;
-					background: rgba(245, 245, 245,0.6);
-					border-radius: 32rpx 32rpx 32rpx 32rpx;
-					.searchBtn {
-						position: absolute;
-						width: 133rpx;
-						height: 60rpx;
-						background: #323232;
-						border-radius: 40rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						font-size: 26rpx;
-						color: #FFFFFF;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						top: 0;
-						right: 0;
-					}
-				}
 
-				.imgstop_ye {
-					margin-left: 30rpx;
-					width: 174rpx;
-					height: 76rpx;
+		.serch_top {
+			display: flex;
+			align-items: center;
+
+			.serch_top1 {
+				// margin-top: 10rpx;
+				// margin-bottom: 30rpx;
+				position: relative;
+				width: 500rpx;
+				background: rgba(245, 245, 245, 0.6);
+				border-radius: 32rpx 32rpx 32rpx 32rpx;
+
+				.searchBtn {
 					position: absolute;
+					width: 133rpx;
+					height: 60rpx;
+					background: #323232;
+					border-radius: 40rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #FFFFFF;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					top: 0;
 					right: 0;
 				}
+			}
+
+			.imgstop_ye {
+				margin-left: 30rpx;
+				width: 174rpx;
+				height: 76rpx;
+				position: absolute;
+				right: 0;
+			}
 		}
 
 		.box {
 			width: 100%;
 			margin-top: 150rpx;
 			height: 100%;
+
 			.hot {
-				  margin-top: 30rpx;
+				margin-top: 30rpx;
 				margin-bottom: 180rpx;
 				margin-left: 208rpx;
+
 				.content {
 					// height: 462rpx;
 					// overflow-x: auto;
@@ -644,6 +682,7 @@
 								font-size: 26rpx;
 								color: #222222;
 							}
+
 							.time_tex {
 								width: 106rpx;
 								height: 42rpx;
@@ -801,6 +840,7 @@
 						margin-top: 18rpx;
 						margin-right: 24rpx;
 					}
+
 					.part {
 						width: 162rpx;
 						height: 70rpx;
@@ -828,9 +868,9 @@
 			}
 		}
 
-		
 
-		
+
+
 	}
 
 	.white-space {
@@ -889,11 +929,9 @@
 		}
 	}
 
-	
-
-	
-
-	
+	.bottomBorder {
+		border-radius: 0px 0px 18rpx 0;
+	}
 </style>
 <style lang="scss">
 	// .serch_top {
@@ -913,5 +951,4 @@
 	// 		}
 	// 	}
 	// }
-
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2efe06d..9179161 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4,7 +4,7 @@
 		backgroundPosition: 'top',
 		backgroundRepeat: 'no-repeat',
 	}">
-		<view class="box">
+		<view class="box" style="position: relative;">
 			<!-- logo -->
 			<view>
 				<image src="/static/index/logo1.png" mode="" class="logo_css"></image>
@@ -17,7 +17,7 @@
 					</u-search>
 					<span class="searchBtn" @click.stop="search()">搜索</span>
 				</view>
-				<image src="/static/index/schoolNight.png" alt="" class="imgstop_ye" @click="toshool"></image>
+				<image src="/static/index/schoolNight.png" mode="widthFix" class="imgstop_ye" @click="toshool"></image>
 			</view>
 
 			<scroll-view  @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS" @refresherrefresh="onS" scroll-y="true" class="flex align-items" style="height: 1250rpx;box-sizing: border-box;">
@@ -116,7 +116,7 @@
 								<view class="flex align-items toptext">
 									<span class="flex align-items">
 										<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30"
-											maxCount="5" gap="0.4"></u-avatar-group>
+											:maxCount="4" gap="0.4"></u-avatar-group>
 										<image src="/static/index/dian.png"
 											:class="item.join_info.users.length > 0 ? '' : 'smalld'"
 											style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"></image>
@@ -137,9 +137,14 @@
 
 						</view>
 					</view>
+				</view> 
+				<u-loadmore v-if="hotList.length > 0" :status="loadStatus" ></u-loadmore>
+				<view v-if="hotList.length > 0" style="height: 100rpx;width: 100%;"></view>
+				<view class="flex flex-column flex-start align-items" v-if="hotList.length == 0">
+					<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
+					</image>
+					<view style="margin-top: 30rpx;font-size: 28rpx;color: #323232;">暂无发布活动</view>
 				</view>
-				<u-loadmore :status="loadStatus" ></u-loadmore>
-				<view style="height: 100rpx;width: 100%;"></view>
 			</scroll-view>
 			<!-- 全部标签 -->
 			<u-popup :show="showPopbq" mode="bottom" round="20"
@@ -189,9 +194,8 @@
 
 
 			</u-popup>
-			<view class="bottom_box flex justify-center align-items" style="height: 560rpx;" v-if="hotList.length == 0">
-				暂无数据
-			</view>
+			
+							
 			<!-- <u-loadmore v-else style="margin-bottom: 60rpx;" :status="loadStatus" /> -->
 		</view>
 		<u-popup @touchmove.native.stop.prevent :show="formShow" :round="10">
@@ -1026,8 +1030,7 @@ export default {
 
 			.imgstop_ye {
 				margin-left: 30rpx;
-				width: 174rpx;
-				height: 76rpx;
+				width: 150rpx;
 				position: absolute;
 				right: 0;
 			}
diff --git a/pages/my/applyOwner.vue b/pages/my/applyOwner.vue
index 622e469..4ffab2f 100644
--- a/pages/my/applyOwner.vue
+++ b/pages/my/applyOwner.vue
@@ -13,7 +13,7 @@
 					<image class="icons" src="/static/detail/xiangqing.png"></image>
 				</span>
 			</view>	
-			<view style="padding:30rpx 30rpx;">
+			<view style="padding:60rpx 30rpx 30rpx 30rpx;">
 				<view class='text_fl'>
 					<view class="text_lab">
 						类型