接口修改

@@ -747,7 +747,7 @@ export function delPayment(payIds) {
 }
 }
 export function paymentDel(payIds) {
 export function paymentDel(payIds) {
 	return request({
 	return request({
-		url: `/person/paymentRange/${payIds}`,
+		url: `/person/paymentRangeNew/${payIds}`,
 		method: 'DELETE'
 		method: 'DELETE'
 	})
 	})
 }
 }
@@ -1303,7 +1303,14 @@ export function certifiedNew(params) {
 // 模拟回调
 // 模拟回调
 export function callBack2(orderId) {
 export function callBack2(orderId) {
   return request({
   return request({
-    url: `/system/certifiedNew/callBack2/${orderId}`
+    url: `/system/certifiedNew/callBack2/${orderId}`,
+	method: 'get',
+  })
+}
+export function pcallBack2(orderId) {
+  return request({
+    url: `/person/paymentRangeNew/callBack2/${orderId}`,
+	method: 'get',
   })
   })
 }
 }
 // 优惠政策回显
 // 优惠政策回显

@@ -195,10 +195,11 @@ async function confirmAddExpireExaminer() {
 .search-buttons {
 .search-buttons {
   display: flex;
   display: flex;
   justify-content: space-between;
   justify-content: space-between;
-  margin-top: 10rpx;
+  margin-top: 30rpx;
+  margin-left: 80px;
 }
 }
 .search-btn, .reset-btn {
 .search-btn, .reset-btn {
-  width: 200rpx;
+  width: 220rpx;
   height: 70rpx;
   height: 70rpx;
   line-height: 70rpx;
   line-height: 70rpx;
   border-radius: 8rpx;
   border-radius: 8rpx;

 <template>
 <template>
 	<view class="container">
 	<view class="container">
-		<!-- 主内容区域 -->
 		<view class="content">
 		<view class="content">
-			<!-- 缴费年限 + 费用卡片 -->
 			<view class="card">
 			<view class="card">
-				<!-- 缴费年限 -->
 				<view class="yearRow">
 				<view class="yearRow">
 					<view class="label">缴费年限</view>
 					<view class="label">缴费年限</view>
 					<view class="control">
 					<view class="control">
@@ -112,9 +109,9 @@ const handelPay = async () => {
 		})
 		})
     } else {
     } else {
     if (data.orderId) {
     if (data.orderId) {
-        await callBack2(data.orderId)	
+        api.callBack2(data.orderId)	
 		uni.navigateTo({
 		uni.navigateTo({
-			url: `/myCenter/goPay`
+			url: `/myCenter/sucPay`
 		})
 		})
 
 
       }
       }

@@ -93,18 +93,18 @@ async function handlePay() {
     payLoading.value = true
     payLoading.value = true
     const res = await api.goPay(rangeId.value)
     const res = await api.goPay(rangeId.value)
     
     
-    // 订单ID存在则调用回调接口
     if (res.data?.orderId) {
     if (res.data?.orderId) {
-      await api.callBack2(res.data.orderId)
+      api.pcallBack2(res.data.orderId)
+        uni.navigateTo({
+        url: `/myCenter/sucPay?rangeId=${rangeId.value}from=payOrder`
+      })
     }
     }
     
     
     // 跳转到支付成功页
     // 跳转到支付成功页
-    uni.navigateTo({
-      url: `/pages/payOk/payOk?rangeId=${rangeId.value}`
-    })
+   
   } catch (err) {
   } catch (err) {
-    console.error('支付失败：', err)
-    uni.showToast({ title: err.data.msg, icon: 'none' })
+    const errMsg = err?.data?.msg || err?.message || '支付失败，请稍后重试'
+    uni.showToast({ title: errMsg, icon: 'none' })
   } finally {
   } finally {
     payLoading.value = false
     payLoading.value = false
   }
   }

@@ -41,23 +41,30 @@
 
 
     <!-- 确定按钮（渐变+动效） -->
     <!-- 确定按钮（渐变+动效） -->
     <view class="confirm-btn-area">
     <view class="confirm-btn-area">
-      <button class="confirm-btn" @click="handleConfirm">确定</button>
+      <button class="confirm-btn" @click="goBack">确定</button>
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
 import { onLoad } from '@dcloudio/uni-app'
 import { onLoad } from '@dcloudio/uni-app'
+const goBack = () => {
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  const { from } = currentPage.options || {}
 
 
-// 确定按钮点击事件
-const handleConfirm = () => {
-  uni.navigateBack({ delta: 1 })
-  // 也可跳转首页：uni.redirectTo({ url: '/pages/index/index' })
+  let delta = 1 
+
+  if (from === 'payOrder') {
+    delta = 2 // 来自添加会员 / 订单页 → 返回 2 级
+  }else{
+     delta = 3 
+  }
+
+  uni.navigateBack({ delta })
 }
 }
 
 
 onLoad((option) => {
 onLoad((option) => {
-  // 可接收订单参数动态渲染，示例：
-  // if (option.amount) { /* 赋值给金额变量 */ }
 })
 })
 </script>
 </script>
 
 

@@ -67,11 +67,7 @@
 							<image mode="aspectFill" v-if="baseFormData.photo2" style="height:200rpx;width:200rpx;" :src="config.baseUrl_api + baseFormData.photo2"/>
 							<image mode="aspectFill" v-if="baseFormData.photo2" style="height:200rpx;width:200rpx;" :src="config.baseUrl_api + baseFormData.photo2"/>
 						</uni-forms-item>
 						</uni-forms-item>
 					</view>
 					</view>
-
-
-
 				</uni-forms>
 				</uni-forms>
-
 			</view>
 			</view>
 			<view class="agreeline">
 			<view class="agreeline">
 				<image @click="changeAgree(agree)" v-if="agree"
 				<image @click="changeAgree(agree)" v-if="agree"
@@ -84,7 +80,7 @@
 		<view class="fixedBottom"><button class="btn-red" @click="goSubmit">确 定</button></view>
 		<view class="fixedBottom"><button class="btn-red" @click="goSubmit">确 定</button></view>
 
 
 		<!-- 会员须知 -->
 		<!-- 会员须知 -->
-		<uni-popup ref="popup" type="bottom" background-color="#fff" animation>
+		<uni-popup ref="popup" type="bottom" background-color="#fff" animation :disable-scroll="true"  :mask-click="false">
 			<view class="tt">入会须知</view>
 			<view class="tt">入会须知</view>
 			<view class="popBody">
 			<view class="popBody">
 				_{{baseFormData.name}}_欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
 				_{{baseFormData.name}}_欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
@@ -106,7 +102,7 @@
 			</view>
 			</view>
 		</uni-popup>
 		</uni-popup>
 
 
-		<uni-popup ref="infoConfirm" type="center">
+		<uni-popup ref="infoConfirm" type="center" :disable-scroll="true"  :mask-click="false">
 			<view class="tt">确认信息</view>
 			<view class="tt">确认信息</view>
 			<view class="popBody">
 			<view class="popBody">
 				<view>
 				<view>
@@ -504,7 +500,6 @@
 					const time = new Date().valueOf() + ''
 					const time = new Date().valueOf() + ''
 					baseFormData.value.t = time + Math.floor(Math.random() * 10)
 					baseFormData.value.t = time + Math.floor(Math.random() * 10)
 					baseFormData.value.signT = aes2.AESEncrypt(baseFormData.value.idcType + time)
 					baseFormData.value.signT = aes2.AESEncrypt(baseFormData.value.idcType + time)
-          console.log(baseFormData.value)
 					api.addPersonToMyDept(baseFormData.value).then(Response => {
 					api.addPersonToMyDept(baseFormData.value).then(Response => {
 						if (Response.data == 0) {
 						if (Response.data == 0) {
 							let msg = '该成员，实名认证未通过，注册失败！'
 							let msg = '该成员，实名认证未通过，注册失败！'
@@ -573,6 +568,7 @@
 		align-items: center !important;
 		align-items: center !important;
 		justify-content: flex-end !important;
 		justify-content: flex-end !important;
 		text-align: right !important;
 		text-align: right !important;
+		flex-wrap: nowrap !important; 
 	}
 	}
 	
 	
 	/* 输入框内容右对齐 */
 	/* 输入框内容右对齐 */
@@ -587,18 +583,24 @@
 	/* 文本内容右对齐 */
 	/* 文本内容右对齐 */
 	.uni-forms-item .uni-forms-item__content text,
 	.uni-forms-item .uni-forms-item__content text,
 	.uni-forms-item .uni-forms-item__content > text {
 	.uni-forms-item .uni-forms-item__content > text {
-		text-align: right !important;
-		width: 100%;
-		display: block;
+	display: inline-block !important;
+	white-space: nowrap !important; 
 	}
 	}
 	
 	
-	/* 覆盖原有样式 */
-	:deep(.uni-forms-item__content) {
-		justify-content: flex-end !important;
-	}
 </style>
 </style>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+	:deep(.uni-popup__mask) {
+	overflow: hidden !important;
+	position: fixed !important;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	}
+	:deep(.uni-popup) {
+	overflow: hidden !important;
+	}
 	:deep(.segmented-control) {
 	:deep(.segmented-control) {
 		height: 100rpx;
 		height: 100rpx;
 	}
 	}
@@ -617,6 +619,8 @@
 	.popBody {
 	.popBody {
 		font-size: 28rpx;
 		font-size: 28rpx;
 		line-height: 1.5;
 		line-height: 1.5;
+		height: 70vh;
+  		overflow-y: auto; 
 		font-family: 华文仿宋;
 		font-family: 华文仿宋;
 		height: 80vh;
 		height: 80vh;
 		overflow: auto;
 		overflow: auto;
@@ -633,6 +637,7 @@
 		display: flex;
 		display: flex;
 		font-size: 30rpx;
 		font-size: 30rpx;
 		
 		
+
 		text {
 		text {
 			color: #014A9F;
 			color: #014A9F;
 		}
 		}
@@ -671,4 +676,13 @@
 	:deep(.item-text-overflow) {
 	:deep(.item-text-overflow) {
 		text-align: left;
 		text-align: left;
 	}
 	}
+	:deep(.fixUniFormItemStyle .uni-data-picker__input-box) {
+	justify-content: flex-start !important;
+	text-align: left !important;
+	}
+
+	/* 让地区选择器的文本左对齐 */
+	:deep(.fixUniFormItemStyle .uni-data-picker__text) {
+	text-align: left !important;
+	}
 </style>
 </style>
\ No newline at end of file

@@ -266,7 +266,7 @@
 	}
 	}
 
 
 	.vipData {
 	.vipData {
-		padding: 10rpx 20rpx;
+		padding: 10rpx 20rpx 5rpx;
 		font-size: 28rpx;
 		font-size: 28rpx;
 		color: #666;
 		color: #666;
 		view { margin-bottom: 10rpx; }
 		view { margin-bottom: 10rpx; }

@@ -200,7 +200,7 @@
 			.icon {
 			.icon {
 				width: 40rpx;
 				width: 40rpx;
 				height: 40rpx;
 				height: 40rpx;
-				margin-right: 20rpx;
+				margin:0 20rpx;
 			}
 			}
 			
 			
 			.photobox {
 			.photobox {