From e747aeb0b7d22e79bf05421cbae524a1e8883c2a Mon Sep 17 00:00:00 2001
From: zengjin <zengjin@essa.cn>
Date: Mon, 5 Nov 2018 18:22:12 +0800
Subject: [PATCH] 免定金方式bug修改

---
 src/main/java/com/buyer/pageObject/PayDepositPage.java | 20 ++++++++++++++++----
 src/main/resources/data.xml                            |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/buyer/pageObject/PayDepositPage.java b/src/main/java/com/buyer/pageObject/PayDepositPage.java
index 8b7070d..b7cf58f 100644
--- a/src/main/java/com/buyer/pageObject/PayDepositPage.java
+++ b/src/main/java/com/buyer/pageObject/PayDepositPage.java
@@ -36,6 +36,10 @@ public class PayDepositPage extends BasePage {
 	//po单号
 	@FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span")
 	WebElement poNum;
+
+	//免定金的确认
+	@FindBy (xpath = "//*[@ng-click='submit()']")
+	WebElement submit;
 	
 	/**
 	 * 查看资金详情
@@ -48,7 +52,7 @@ public class PayDepositPage extends BasePage {
 	}
 	
 	/**
-	 * 确认PO
+	 * 确认PO：单柜比例
 	 * @return MyOrderPage
 	 */
 	public MyOrderPage confirm() {
@@ -58,7 +62,13 @@ public class PayDepositPage extends BasePage {
 		}
 		return new MyOrderPage(driver);
 	}
-	
+
+
+	/**
+	 *确认PO操作方法
+	 * @param
+	 * @return
+	 */
 	public void operate() {
 		dynamicWait(By.xpath("//*[contains(text(),'PO information')]"));
 		Model.setPoNum(poNum.getText());
@@ -66,9 +76,11 @@ public class PayDepositPage extends BasePage {
 		if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) {
 			//如果是可用资金不足，跳转到资金管理
 			toAssetManagementPage();
-//		}else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
-		}else {
+		}else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
 			//免定金模式，确认po，跳转到我的订单列表
+			click(submit);
+		}else {
+			//单柜比例定金
 			confirm();
 		}
 		forceWait(2000);
diff --git a/src/main/resources/data.xml b/src/main/resources/data.xml
index d43db73..4b8e61c 100644
--- a/src/main/resources/data.xml
+++ b/src/main/resources/data.xml
@@ -2,7 +2,7 @@
 <test>
 	<data>
 		<!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> -->
-		<buyerAccount>yang471872497@163.com</buyerAccount>
+		<buyerAccount>meng18@essa.cn</buyerAccount>
 		<supplier>物料分析</supplier>
 		<buyerNo>COK09161</buyerNo>
 	</data>
--
libgit2 0.21.2