From 687b04093179c9e03a974fcff892c05126d9d51e 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 14:22:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageA/my/cancelActivity.vue  |  13 +-
 packageA/my/orderList.vue       |   4 +-
 packageA/my/pendinPayDetail.vue |   8 +-
 packageA/my/pendinPayStatus.vue | 225 ++++++++++++++++++--------------
 4 files changed, 139 insertions(+), 111 deletions(-)

diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue
index 77b505b..c402d18 100644
--- a/packageA/my/cancelActivity.vue
+++ b/packageA/my/cancelActivity.vue
@@ -245,14 +245,13 @@
 							title: '核销成功',
 							icon: 'success',
 							duration: 2000,
-							complete: function() {
-								setTimeout(function() {
-									uni.redirectTo({
-										url: "/packageA/my/orderList?status=" + 4
-									})
-								}, 2000);
-							}
 						});
+						setTimeout(function() {
+							// uni.redirectTo({
+							// 	url: "/packageA/my/orderList?status=" + 4
+							// })
+							uni.navigateBack();
+						}, 1500);
 					} else {
 						uni.showToast({
 							title: res.msg,
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index 03ab011..985221a 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -115,8 +115,8 @@
 											@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;">
+								<view style="padding: 30rpx;" v-if="item.auth_status == 2">
+									<view  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>
diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index 4c91579..b9c6907 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -285,13 +285,13 @@
 					url: "/packageA/center/detail?id=" + id
 				})
 			},
-			// 取消订单 (1)
+			// 取消订单 (1)  免费活动
 			paidcancel() {
 				uni.showLoading({
 					title: '处理中...'
 				});
 				this.cancelsShow = false;
-				uni.$u.http.post('/api/school.newactivity.order/paidcancel', {
+				uni.$u.http.post('/api/school.newactivity.order/freecancel', {
 					order_no: this.order_no
 				}).then(res => {
 					if (res.code == 1) {
@@ -330,10 +330,10 @@
 					});
 				});
 			},
-			// 取消订单 (0)
+			// 取消订单 (0) 付费
 			cancelOrder() {
 				this.cancelsShow = false;
-				uni.$u.http.post('/api/school.newactivity.order/freecancel', {
+				uni.$u.http.post('/api/school.newactivity.order/paidcancel', {
 					order_no: this.order_no
 				}).then(res => {
 					if (res.code == 1) {
diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue
index 1e76580..4427503 100644
--- a/packageA/my/pendinPayStatus.vue
+++ b/packageA/my/pendinPayStatus.vue
@@ -1,25 +1,27 @@
 <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>
+			<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="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="first-box flex flex-start flex-column justify-start">
 					<view class="flex align-items justify-center" @click="openInfo()">
-						<image class="head_img" v-if="detail.images.length > 0" :src="detail.images[0]" mode="" ></image>
+						<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" style="font-weight: 600;">{{detail.title}}</span>
-							</view>				
+							</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:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
+								<span
+									style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 
 							</view>
 							<view class="flex align-items" style="margin-top: 20rpx;">
@@ -35,16 +37,17 @@
 					</span>
 					<span class="line"></span>
 
-					<view class="first-image flex align-items space-between"
-						style="width: 100%;margin-top: 10rpx;"
+					<view class="first-image flex align-items space-between" style="width: 100%;margin-top: 10rpx;"
 						@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
 						<view style="display: flex;">
 							<view>
 								<image src="/static/center/address.png" mode="" class="icon-size"></image>
 							</view>
-							<view class="white-space" style="font-size: 26rpx;color: #222222;font-weight: 400;">{{detail.address}}{{detail.address_detail}}</view>
+							<view class="white-space" style="font-size: 26rpx;color: #222222;font-weight: 400;">
+								{{detail.address}}{{detail.address_detail}}</view>
 						</view>
-						<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
+						<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
+						</image>
 					</view>
 
 				</view>
@@ -53,70 +56,79 @@
 			</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;" >
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
 						<span>订单状态</span>
-						<span  style="color: #323232;">{{ toptitle }}</span>
+						<span style="color: #323232;">{{ toptitle }}</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 style="color: #323232;">{{detailAny.order_no}}</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 style="color: #323232;">{{ formattime(detailAny.createtime)}}</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 style="color: #FF4810;">￥{{detailAny.totalprice}}</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 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 style="color: #323232;">{{ formattime(detailAny.paytime)}}</span>
 					</view>
 				</view>
-				
+
 			</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>
-							<text style="color: #FF4810;">否</text>
-						</view>
-						<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
-							<text>驳回原因</text>
-							<text style="color: #323232;">{{ detailAny.reason }}</text>
-						</view>
-					</view>
+			<view class="third flex flex-column" style="justify-content: flex-start;">
 				
-					<view class="third-center" v-if="detailAny.auth_status == 1">
-						<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-							<text>是否同意退款</text>
-							<text style="color: #323232;">是</text>
-						</view>
-						<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
-							<text>退款数量</text>
-							<text v-if="detailAny.before_status!=-3" style="color: #323232;">{{ detailAny.auth_num }}</text>
-							<text v-if="detailAny.before_status==-3" style="color: #323232;">{{ detailAny.num }}</text>
-						</view>
-						<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
-							<text>退款金额</text>
-							<text v-if="detailAny.server_status == 3" style="color: #FF4810;font-weight: 600;">￥{{
-								detailAny.first_refundprice }}</text>
-							<text v-if="detailAny.server_status == 6" style="color: #FF4810;font-weight: 600;">￥{{
-								detailAny.total_refundprice}}</text>
-						</view>
-						
+				<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>
+					</view>
+				</view>
+				
+				<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>
+						<text style="color: #FF4810;">否</text>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
+						<text>驳回原因</text>
+						<text style="color: #323232;">{{ detailAny.reason }}</text>
 					</view>
 				</view>
 
+				<view class="third-center" v-if="detailAny.auth_status == 1">
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
+						<text>是否同意退款</text>
+						<text style="color: #323232;">是</text>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
+						<text>退款数量</text>
+						<text v-if="detailAny.before_status!=-3" style="color: #323232;">{{ detailAny.auth_num }}</text>
+						<text v-if="detailAny.before_status==-3" style="color: #323232;">{{ detailAny.num }}</text>
+					</view>
+					<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
+						<text>退款金额</text>
+						<text v-if="detailAny.server_status == 3" style="color: #FF4810;font-weight: 600;">￥{{
+								detailAny.first_refundprice }}</text>
+						<text v-if="detailAny.server_status == 6" style="color: #FF4810;font-weight: 600;">￥{{
+								detailAny.total_refundprice}}</text>
+					</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">
-						<span > 申请售后 </span>
-					</view>		
+				<view @click="service(detailAny.id)" class="footer-right flex justify-center align-items"
+					v-if="status == 9">
+					<span> 申请售后 </span>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -162,7 +174,7 @@
 					img: 'width: 100%'
 
 				},
-				value_slide:0,
+				value_slide: 0,
 				scrollTop: 0,
 				overlay: false,
 				userInfo: {},
@@ -177,7 +189,7 @@
 				order_no: '',
 				PayPirce: 0,
 				detail: {},
-				detailAny:{},
+				detailAny: {},
 				people: {},
 				qrUrl: '',
 				is_collect: 0,
@@ -203,7 +215,7 @@
 					fontSize: '32rpx',
 					fontWeight: 'bold'
 				},
-				status:null,
+				status: null,
 				toptitle: '',
 			};
 		},
@@ -217,20 +229,20 @@
 			this.status = options.status;
 			if (options.status == 9) {
 				this.toptitle = '已完成'
-			}else if(options.status == -3){
+			} else if (options.status == -3) {
 				this.toptitle = '已关闭'
-			}else if(options.status == 4 || options.status == 7){
+			} else if (options.status == 4 || options.status == 7) {
 				this.toptitle = '售后中'
-			}else if(options.status == 5){
+			} else if (options.status == 5) {
 				this.toptitle = '退款中'
-			}else if(options.status == 6){
+			} else if (options.status == 6) {
 				this.toptitle = '已退款'
 			}
 			this.getDetail()
 		},
 
 		methods: {
-			openInfo(){
+			openInfo() {
 				uni.navigateTo({
 					url: `/packageA/center/detail?id=${this.detail.activity_id}`
 				})
@@ -246,8 +258,8 @@
 				return dateWeek(timestamp)
 			},
 			//完整时间
-			formattime(e){
-				return dayjs(e*1000).format('YYYY-MM-DD HH:mm:ss')
+			formattime(e) {
+				return dayjs(e * 1000).format('YYYY-MM-DD HH:mm:ss')
 			},
 
 			overlayShow() {
@@ -269,14 +281,14 @@
 					});
 				}
 			},
-			
-			
 
-			
 
-			
-			
-			
+
+
+
+
+
+
 			// 提示
 			showErrorToast(msg) {
 				uni.showToast({
@@ -304,11 +316,11 @@
 					}
 				}).catch(error => {});
 			},
-			
-			
-			
-			
-			
+
+
+
+
+
 			// 导航
 			toMap(latitude, longitude, name) {
 				uni.openLocation({
@@ -327,25 +339,26 @@
 					url: "/pages/index/index"
 				})
 			},
-		
 
-			
 
-			
-			
-			
-			
-		
-			
+
+
+
+
+
+
+
+
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	.detail_all{
+	.detail_all {
 		background-color: #f7f7f7;
 		height: 100vh;
 	}
+
 	.w-100 {
 		width: 100%;
 	}
@@ -391,8 +404,8 @@
 		margin-top: 30rpx;
 
 	}
-	
-	
+
+
 
 	.space-between {
 		justify-content: space-between;
@@ -416,13 +429,14 @@
 		padding: 30rpx;
 		border-radius: 44rpx;
 		box-sizing: border-box;
-		.head_img{
-			width: 160rpx; 
+
+		.head_img {
+			width: 160rpx;
 			height: 160rpx;
 			border-radius: 18rpx;
 		}
 
-		.first-name{
+		.first-name {
 			width: 440rpx;
 			height: 39rpx;
 			font-family: PingFang SC, PingFang SC;
@@ -447,8 +461,9 @@
 				font-size: 26rpx;
 				color: #222222;
 			}
-			.xieyi{
-				background-color:#BBFC5B;
+
+			.xieyi {
+				background-color: #BBFC5B;
 				width: 156rpx;
 				height: 48rpx;
 				border-radius: 8rpx;
@@ -486,10 +501,12 @@
 	.third {
 		width: 100%;
 		background: #ffffff;
-		margin-top:30rpx;
+		margin-top: 30rpx;
 		border-radius: 44rpx;
+
 		.third-center {
 			padding: 30rpx;
+
 			.hui {
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
@@ -527,6 +544,7 @@
 			background: #323232;
 			border-radius: 148rpx;
 			margin-bottom: 30rpx;
+
 			span {
 				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
 				font-weight: 400;
@@ -534,11 +552,13 @@
 				color: #BBFC5B;
 			}
 		}
+
 		.footer-right1 {
 			width: 690rpx;
 			height: 90rpx;
 			background: #E4E4E4;
 			border-radius: 148rpx;
+
 			span {
 				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
 				font-weight: 400;
@@ -906,12 +926,14 @@
 	}
 </style>
 <style lang="scss">
-	.value_slide{
+	.value_slide {
 		width: 50%;
-		::v-deep .uni-slider-handle-wrapper{
+
+		::v-deep .uni-slider-handle-wrapper {
 			height: 10rpx;
 		}
-		::v-deep .uni-slider-handle{
+
+		::v-deep .uni-slider-handle {
 			background: url('@/static/detail/qiu.png') !important;
 			border-radius: 0;
 			background-size: 36rpx 36rpx !important;
@@ -920,17 +942,21 @@
 			top: 14rpx;
 			margin-left: -18rpx !important;
 		}
-		::v-deep .uni-slider-value{
+
+		::v-deep .uni-slider-value {
 			color: #323232;
-			&::after{
+
+			&::after {
 				content: '%';
 			}
 		}
+
 		// #ifdef MP-WEIXIN
-		.wx-slider-handle-wrapper{
+		.wx-slider-handle-wrapper {
 			height: 8rpx;
 		}
-		.wx-slider-handle{
+
+		.wx-slider-handle {
 			background: url('@/static/detail/qiu.png') !important;
 			border-radius: 0;
 			background-size: 28rpx 28rpx !important;
@@ -939,14 +965,17 @@
 			top: 18rpx;
 			margin-left: -14rpx !important;
 		}
-		.wx-slider-value{
+
+		.wx-slider-value {
 			display: flex;
 			width: 30rpx;
 			color: #323232;
-			&::after{
+
+			&::after {
 				content: '%';
 			}
 		}
+
 		// #endif
 	}
 </style>
\ No newline at end of file