From 83b274183d88d71bb0faac1fa71120157833a477 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Tue, 12 Aug 2025 13:59:30 +0800
Subject: [PATCH 1/3] no message

---
 root/person/marge.vue | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/root/person/marge.vue b/root/person/marge.vue
index 9960879..2300b95 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -273,15 +273,25 @@ export default {
 		openApply(){
 			let that = this;
 			if(that.applysRecord && that.applysRecord.length < 1){
-				that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
-					console.log('创建人手机号：',createRes)
-					that.createData = {
-						isShow:true,
-						code:'',
-						tel: createRes.tel,
-						telEncrypt: createRes.telEncrypt
-					};
+				let _result = that.applysRecord.filter(item => {
+					return item.state == 0;
 				})
+				if(_result && _result.length > 1){
+					that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
+						console.log('创建人手机号：',createRes)
+						that.createData = {
+							isShow:true,
+							code:'',
+							tel: createRes.tel,
+							telEncrypt: createRes.telEncrypt
+						};
+					})
+				}else{
+					uni.showToast({
+						icon:'none',
+						title:'只能有一个审核中的合并申请'
+					})
+				}
 			}else{
 				uni.showToast({
 					icon:'none',

From 1c6dc59181538c7ad61cc20172675fca27ef3b54 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Tue, 12 Aug 2025 14:01:21 +0800
Subject: [PATCH 2/3] no message

---
 root/person/marge.vue | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/root/person/marge.vue b/root/person/marge.vue
index 2300b95..bd4f8d4 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -272,26 +272,19 @@ export default {
 		},
 		openApply(){
 			let that = this;
-			if(that.applysRecord && that.applysRecord.length < 1){
-				let _result = that.applysRecord.filter(item => {
-					return item.state == 0;
+			let _result = that.applysRecord.filter(item => {
+				return item.state == 0;
+			})
+			if(_result && _result.length > 1){
+				that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
+					console.log('创建人手机号：',createRes)
+					that.createData = {
+						isShow:true,
+						code:'',
+						tel: createRes.tel,
+						telEncrypt: createRes.telEncrypt
+					};
 				})
-				if(_result && _result.length > 1){
-					that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
-						console.log('创建人手机号：',createRes)
-						that.createData = {
-							isShow:true,
-							code:'',
-							tel: createRes.tel,
-							telEncrypt: createRes.telEncrypt
-						};
-					})
-				}else{
-					uni.showToast({
-						icon:'none',
-						title:'只能有一个审核中的合并申请'
-					})
-				}
 			}else{
 				uni.showToast({
 					icon:'none',

From 5ce471e5aad7b35c791f8b4f4e9423973bb1ac61 Mon Sep 17 00:00:00 2001
From: jscyl13849007907 <13849007907@163.com>
Date: Tue, 12 Aug 2025 14:05:10 +0800
Subject: [PATCH 3/3] no message

---
 root/person/marge.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/root/person/marge.vue b/root/person/marge.vue
index bd4f8d4..77d1bb5 100644
--- a/root/person/marge.vue
+++ b/root/person/marge.vue
@@ -275,7 +275,8 @@ export default {
 			let _result = that.applysRecord.filter(item => {
 				return item.state == 0;
 			})
-			if(_result && _result.length > 1){
+			console.log('that.applysRecord',that.applysRecord,'--',_result)
+			if(_result && _result.length == 0){
 				that.G.Get(that.api.person_getCreatorTel,{},(createRes)=>{
 					console.log('创建人手机号：',createRes)
 					that.createData = {