From a47a1ff4fdc4c4c7856c4fd28d7c3b88b81b934c 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: Thu, 19 Jun 2025 18:27:27 +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/info.vue    |  4 +--
 packageA/center/detail.vue      |  3 +-
 packageA/center/detailSys.vue   | 23 ++++++++++--
 packageA/center/signDetail.vue  |  6 +++-
 packageA/my/pendinPay.vue       | 17 ++++-----
 packageA/my/pendinPayDetail.vue |  4 +--
 packageA/my/pendinPayStatus.vue | 16 ++++-----
 pages/fenl/index.vue            |  2 +-
 pages/index/index.vue           |  1 +
 pages/my/applyOwner.vue         | 64 +++++++++++++++++++++++----------
 pages/my/index.vue              |  2 +-
 11 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/packageA/afterSales/info.vue b/packageA/afterSales/info.vue
index a194fcd..2a6e700 100644
--- a/packageA/afterSales/info.vue
+++ b/packageA/afterSales/info.vue
@@ -132,8 +132,8 @@
 						<text>是否同意退款</text>
 						<text style="color: #FF4810;">{{ '否' }}</text>
 					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
-						<text>驳回原因</text>
+					<view class="flex w-100 space-between hui" style="margin-top: 40rpx;">
+						<text style="width: 400rpx;">驳回原因</text>
 						<text style="color: #323232;">{{ info.reason }}</text>
 					</view>
 				</view>
diff --git a/packageA/center/detail.vue b/packageA/center/detail.vue
index 7ca9b57..f303dc6 100644
--- a/packageA/center/detail.vue
+++ b/packageA/center/detail.vue
@@ -1712,7 +1712,7 @@
 		position: absolute;
 		bottom: 173rpx;
 		display: flex;
-		justify-content: space-around;
+		justify-content: center;
 		align-items: self-start;
 		width: 750rpx;
 		height: 247rpx;
@@ -1722,6 +1722,7 @@
 		font-family: PingFang SC Regular, PingFang SC Regular;
 		font-weight: 400;
 		font-size: 28rpx;
+		gap: 180rpx;
 
 		.save {
 			margin-top: 60rpx;
diff --git a/packageA/center/detailSys.vue b/packageA/center/detailSys.vue
index 7373f24..b028aa2 100644
--- a/packageA/center/detailSys.vue
+++ b/packageA/center/detailSys.vue
@@ -177,9 +177,12 @@
 					<image src="@/static/detail/fenxiangsys.png" style="width: 100%;height: 100%;" mode="widthFix">
 					</image>
 				</view>
-				<view v-if="detail.status != -3" class="footer-right" @click="cancelsOpen">
+				<view v-if="detail.status != -3 && detail.status != -1" class="footer-right" @click="cancelsOpen">
 					取消活动
 				</view>
+				<view v-if="detail.status == -1" class="footer-right-no">
+					活动已取消
+				</view>
 			</view>
 
 
@@ -193,7 +196,7 @@
 					<view class="pop-header flex align-items flex-column flex-start">
 						<span class="name white-space">是否确认取消活动</span>
 						<span class="price">
-							取消活动后，如果再次举办活动需重新设置并提交信息审核
+							取消活动后，若再次举办活动，需重新设置活动内容，并提交平台审核
 						</span>
 						<!-- <image src="../../static/center/buy.png" mode="" style="width: 168rpx; height: 48rpx;">
 					</image> -->
@@ -1673,7 +1676,7 @@
 		position: absolute;
 		bottom: 173rpx;
 		display: flex;
-		justify-content: space-around;
+		justify-content: center;
 		align-items: self-start;
 		width: 750rpx;
 		height: 247rpx;
@@ -1683,6 +1686,7 @@
 		font-family: PingFang SC Regular, PingFang SC Regular;
 		font-weight: 400;
 		font-size: 28rpx;
+		gap: 180rpx;
 
 		.save {
 			margin-top: 60rpx;
@@ -1692,6 +1696,19 @@
 			align-items: center;
 		}
 	}
+	.footer-right-no {
+		margin: 0 auto;
+		width: 100%;
+		height: 90rpx;
+		background: #E1E1E1;
+		text-align: center;
+		line-height: 90rpx;
+		border-radius: 200rpx;
+		font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+		font-weight: 400;
+		font-size: 48rpx;
+		color: #999999;
+	}
 </style>
 <style scoped>
 	.no-border-button {
diff --git a/packageA/center/signDetail.vue b/packageA/center/signDetail.vue
index 5d9addc..2e18111 100644
--- a/packageA/center/signDetail.vue
+++ b/packageA/center/signDetail.vue
@@ -46,6 +46,10 @@
 						<view>
 							<text v-if="v.status==3" style="font-size: 28rpx;color: #999999;">未核销</text>
 							<text v-if="v.status==6" style="font-size: 28rpx;color: #FF4810;">已核销</text>
+							
+							<text v-if="v.status==-3" style="font-size: 28rpx;color: #FF4810;">已取消</text>
+							<text v-if="v.server_status==3" style="font-size: 28rpx;color: #FF4810;">售后中</text>
+							<text v-if="v.auth_status==1" style="font-size: 28rpx;color: #FF4810;">已退款</text>
 						</view>
 					</view>
 					<view v-if="i<item.ordercode.length-1"
@@ -81,9 +85,9 @@
 				uni.$u.http.get('/api/school.newworker.activity.order/order_list', {
 					params: {
 						activity_id: that.id,
-						status:'2,3,9',
 						page: 1,
 						limit: 1000,
+						status:'0,2,3,4,7,9'
 					},
 				}).then(res => {
 					if (res.code == 1) {
diff --git a/packageA/my/pendinPay.vue b/packageA/my/pendinPay.vue
index 3331293..17e3f32 100644
--- a/packageA/my/pendinPay.vue
+++ b/packageA/my/pendinPay.vue
@@ -17,9 +17,9 @@
 								<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;"
-									v-for="items_t in detailAny.classes_cate">#{{ items_t }}</span>
+									style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
+								<!-- <span style="color:#0CA013;margin-left: 20rpx;"
+									v-for="items_t in detailAny.classes_cate">#{{ items_t }}</span> -->
 							</view>
 							<view class="flex align-items" style="margin-top: 20rpx;">
 								￥{{detailAny.totalprice}}
@@ -37,8 +37,8 @@
 					<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>{{detail.address}}{{detail.address_detail}}</span>
+							<image src="/static/center/address.png" mode="" class="icon-size" style="vertical-align: middle;"></image>
+							<span style="vertical-align: middle;">{{detail.address}}{{detail.address_detail}}</span>
 						</view>
 						<view>
 							<image src="/static/detail/daohang.png" class="icon-size"
@@ -743,9 +743,10 @@
 							success(res) {
 								if (res.errMsg == "requestPayment:ok") {
 									that.order_no = ''
-									uni.redirectTo({
-										url: "/packageA/my/exercise?status=" + 3
-									})
+									// uni.redirectTo({
+									// 	url: "/packageA/my/exercise?status=" +'2,3'
+									// })
+									uni.navigateBack();
 									console.log('支付成功', res)
 								} else {
 									that.uloadingShow = false
diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index b9c6907..908ffd2 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -117,9 +117,9 @@
 				:safeAreaInsetBottom="false" :closeable="false">
 				<view class="popupBox flex justify-start align-items flex-column">
 					<view class="pop-header flex align-items flex-column flex-start">
-						<span class="name white-space">是否取消参与活动</span>
+						<span class="name white-space">请确认是否取消报名</span>
 						<span class="price">
-							多次取消参与，会限制账号权限请谨慎操作
+							若频繁取消，可能会影响账号部分功能使用。建议您确认行程后再操作。
 						</span>
 					</view>
 					<view
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index 4427503..1a3a5bd 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -76,34 +76,34 @@
 						<span>付款方式</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 v-if="detailAny.paytime!=null " class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
 						<span>付款时间</span>
 						<span style="color: #323232;">{{ formattime(detailAny.paytime)}}</span>
 					</view>
 				</view>
 
 			</view>
-			<view class="third flex flex-column" style="justify-content: flex-start;">
+			<view v-if="detailAny.server_status!=0" class="third flex flex-column" style="justify-content: flex-start;padding-bottom: 30rpx;">
 				
 				<view class="third-center" v-if="detailAny.auth_reason != '' && detailAny.auth_reason != null">
 					<view class="flex w-100 space-between hui align-items">
-						<text>退款原因</text>
-						<text style="color: #323232;">{{ detailAny.auth_reason }}</text>
+						<text style="width: 400rpx;">退款原因</text>
+						<text  style="color: #323232;">{{ detailAny.auth_reason }}</text>
 					</view>
 				</view>
 				
-				<view class="third-center" v-if="detailAny.auth_status == 2">
+				<view class="third-center" v-if="detailAny.auth_status == 2" style="padding: 0rpx 30rpx;">
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 						<text>是否同意退款</text>
 						<text style="color: #FF4810;">否</text>
 					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
-						<text>驳回原因</text>
+					<view class="flex w-100 space-between hui" style="margin-top: 40rpx;">
+						<text style="width: 400rpx;">驳回原因</text>
 						<text style="color: #323232;">{{ detailAny.reason }}</text>
 					</view>
 				</view>
 
-				<view class="third-center" v-if="detailAny.auth_status == 1">
+				<view class="third-center" v-if="detailAny.auth_status == 1" style="padding: 0rpx 30rpx;">
 					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 						<text>是否同意退款</text>
 						<text style="color: #323232;">是</text>
diff --git a/pages/fenl/index.vue b/pages/fenl/index.vue
index f6a08af..6f7001f 100644
--- a/pages/fenl/index.vue
+++ b/pages/fenl/index.vue
@@ -59,7 +59,7 @@
 										<span style="margin-right:20rpx;">{{ dateWeeks(item.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>
+											style="margin-left: 20rpx;width: 260rpx;">{{ item.address }}{{ item.address_detail }}</span>
 									</view>
 
 								</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5fac91..6758a1a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -97,6 +97,7 @@
 											<span style="margin:0 20rpx;">{{ dateWeeks(item.start_time) }}</span><span
 												style="width: 1rpx;height: 22rpx;background: #323232;"></span>
 											<span class="white-space" style="margin-left: 20rpx;width: 260rpx;">{{
+												item.address }}{{
 												item.address_detail }}</span>
 										</view>
 
diff --git a/pages/my/applyOwner.vue b/pages/my/applyOwner.vue
index 4ffab2f..102abf1 100644
--- a/pages/my/applyOwner.vue
+++ b/pages/my/applyOwner.vue
@@ -14,7 +14,7 @@
 				</span>
 			</view>	
 			<view style="padding:60rpx 30rpx 30rpx 30rpx;">
-				<view class='text_fl'>
+				<!-- <view class='text_fl'>
 					<view class="text_lab">
 						类型
 					</view>
@@ -23,8 +23,7 @@
 							placeholder-class="plasty" />
 						<u-icon name="arrow-right" color="#323232"></u-icon>
 					</view>
-				</view>
-				<view class="line-row"></view>
+				</view> -->
 				<view class='text_fl' v-if="formData.type == '机构'">
 					<view class="text_lab">
 						机构名称
@@ -37,20 +36,20 @@
 				<view class="line-row" v-if="formData.type == '机构'"></view>
 				<view class='text_fl'>
 					<view class="text_lab">
-						联系人
+						机构联系人
 					</view>
 					<view>
-						<input type="text" placeholder="请输入姓名" class="input" v-model="formData.realname"
+						<input type="text" placeholder="请输入机构姓名" class="input" v-model="formData.realname"
 							placeholder-class="plasty" />
 					</view>
 				</view>
 				<view class="line-row"></view>
 				<view class='text_fl'>
 					<view class="text_lab">
-						联系电话
+						机构联系电话
 					</view>
 					<view>
-						<input type="text" placeholder="请输入联系电话" class="input" v-model="formData.mobile"
+						<input type="text" placeholder="请输入机构联系电话" class="input" v-model="formData.mobile"
 							placeholder-class="plasty" />
 					</view>
 				</view>
@@ -66,7 +65,15 @@
 					</view>
 				</view>
 				<view class="line-row"></view>
-				
+				<view class='text_fl'>
+					<view class="text_lab">
+						详细地址
+					</view>
+					<view>
+						<input type="text" placeholder="请输入详细地址" class="input" v-model="formData.desc"
+							placeholder-class="plasty" />
+					</view>
+				</view>
 				
 				<view class="btn_1" @click="submitaply()">立即申请</view>
 			</view>
@@ -96,7 +103,8 @@
 					mobile: '',
 					realname: '',
 					address: '',
-					type: '',
+					type: '机构',
+					desc:'',
 				}
 			};
 		},
@@ -168,6 +176,16 @@
 				});
 				return;
 			}
+			// 手机号正则
+			const phoneReg = /^1[3-9]\d{9}$/;
+			if (!phoneReg.test(this.formData.mobile)) {
+				uni.showToast({
+					title: '请输入正确的手机号！',
+					icon: "none",
+				})
+				return;
+			}
+			
 			if (this.formData.name == '' && this.formData.type == '机构') {
 				uni.showToast({
 					title: '请填写机构名称！',
@@ -184,12 +202,20 @@
 				});
 				return;
 			}
+			if (this.formData.desc == '') {
+				uni.showToast({
+					title: '请填写详细地址！',
+					icon: "none",
+					duration: 2000,
+				});
+				return;
+			}
 			let formparms  = { 
 				type: this.formData.type == '个人' ? '1' : '2',
 				name: this.formData.name,
 				realname: this.formData.realname,
 				mobile: this.formData.mobile,
-				address: this.formData.address
+				address: this.formData.address+this.formData.desc
 			};
 			uni.$u.http
 				.post("/api/school/shop/apply", formparms)
@@ -197,7 +223,7 @@
 					console.log(res);
 					if (res.code == 1) {
 						uni.showToast({
-							title: '提交成功！',
+							title: '提交成功，等待审核！',
 							icon: "none",
 							duration: 2000,
 						});
@@ -207,9 +233,12 @@
 							mobile: '',
 							realname: '',
 							address: '',
-							type: '',
+							desc:'',
+							type: '机构',
 						};
-						this.gomy();
+						setTimeout(()=>{
+							uni.navigateBack();
+						},1500)
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -331,7 +360,7 @@
 				justify-content: space-between;
 			}
 			.text_lab{
-				color: #3D3D3D;
+				color: #323232;
 				font-weight: 600;
 				font-family: PingFang SC, PingFang SC;
 				font-size: 32rpx;
@@ -347,15 +376,14 @@
 			.input {
 				text-align: right;
 				font-family: PingFang SC, PingFang SC;
-				font-size: 26rpx;
-				color: #343434;
-				line-height: 32rpx;
+				font-size: 32rpx;
+				color: #323232;
 			}
 
 			.plasty {
 				color: #9C9C9C;
 				font-weight: 300;
-				font-size: 28rpx;
+				font-size: 32rpx;
 				font-family: PingFang SC, PingFang SC;
 			}
 
diff --git a/pages/my/index.vue b/pages/my/index.vue
index f70423e..22fd002 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -163,7 +163,7 @@
 
 				<view class="popup">
 					<img class="img_shouquan" src="https://naweigetetest2.hschool.com.cn/dyqc/shou1.png" alt="" />
-					<text id="txt2">为您授权登陆，授权成功后可参加多种户外活动</text>
+					<text id="txt2">授权成功后即可参加多种户外活动</text>
 					<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 						授权登录
 						<!-- <u-icon label="" labelColor="#fff" size="28" name="/static/wechat1.png"></u-icon> -->