From e82c721124281796edbe4ba79cd805de52a59cb2 Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Wed, 18 Jul 2018 18:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CLMSDistributorList.jsp                   | 20 +++++++++----------
 .../LDistributorAccountList.jsp               |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
index 9712ce962..30590d44b 100644
--- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
+++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
@@ -36,16 +36,6 @@
 <script type="text/javascript">
 
 function teaming(){
-	var id = getItemValue(0,getRow(0),'ID');
-	//debugger;
-	
-	//alert(id);
-	var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","SelectGroup","id="+id);
-	//var distributor_type=sReturn[3];
-	if(result=="false"){
-		alert("集团外的经销商需收取保证金后再进行激活！");
-		return;
-	}
 	var id = getItemValue(0,getRow(0),'ID');
 		var distributor_status = getItemValue(0,getRow(0),'distributor_status');
 		if(typeof(id)=="undefined" || id.length==0 ){
@@ -73,6 +63,16 @@ function teaming(){
 			alert("更改状态成功");
 			reloadSelf();
 		}
+		var id = getItemValue(0,getRow(0),'ID');
+		//debugger;
+		
+		//alert(id);
+		var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","SelectGroup","id="+id);
+		//var distributor_type=sReturn[3];
+		if(result=="false"){
+			alert("集团外的经销商需收取保证金后再进行激活！");
+			return;
+		}
 }
 
 function teamingSuspend(){
diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
index cc15088f7..baf0392cb 100644
--- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
+++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorAccountList.jsp
@@ -76,7 +76,7 @@
 		 }
  	AsDialog.PopView(sUrl,"id="+sPara,"dialogWidth=800px;dialogHeight=200px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
  		reloadSelf();
-		 },"详情");
+		 },"修改");
  	
 	}
 </script>