Commit e747aeb0b7d22e79bf05421cbae524a1e8883c2a
1 parent
fd314991
免定金方式bug修改
Showing
2 changed files
with
17 additions
and
5 deletions
Show diff stats
src/main/java/com/buyer/pageObject/PayDepositPage.java
| @@ -36,6 +36,10 @@ public class PayDepositPage extends BasePage { | @@ -36,6 +36,10 @@ public class PayDepositPage extends BasePage { | ||
| 36 | //po单号 | 36 | //po单号 |
| 37 | @FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span") | 37 | @FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span") |
| 38 | WebElement poNum; | 38 | WebElement poNum; |
| 39 | + | ||
| 40 | + //免定金的确认 | ||
| 41 | + @FindBy (xpath = "//*[@ng-click='submit()']") | ||
| 42 | + WebElement submit; | ||
| 39 | 43 | ||
| 40 | /** | 44 | /** |
| 41 | * 查看资金详情 | 45 | * 查看资金详情 |
| @@ -48,7 +52,7 @@ public class PayDepositPage extends BasePage { | @@ -48,7 +52,7 @@ public class PayDepositPage extends BasePage { | ||
| 48 | } | 52 | } |
| 49 | 53 | ||
| 50 | /** | 54 | /** |
| 51 | - * 确认PO | 55 | + * 确认PO：单柜比例 |
| 52 | * @return MyOrderPage | 56 | * @return MyOrderPage |
| 53 | */ | 57 | */ |
| 54 | public MyOrderPage confirm() { | 58 | public MyOrderPage confirm() { |
| @@ -58,7 +62,13 @@ public class PayDepositPage extends BasePage { | @@ -58,7 +62,13 @@ public class PayDepositPage extends BasePage { | ||
| 58 | } | 62 | } |
| 59 | return new MyOrderPage(driver); | 63 | return new MyOrderPage(driver); |
| 60 | } | 64 | } |
| 61 | - | 65 | + |
| 66 | + | ||
| 67 | + /** | ||
| 68 | + *确认PO操作方法 | ||
| 69 | + * @param | ||
| 70 | + * @return | ||
| 71 | + */ | ||
| 62 | public void operate() { | 72 | public void operate() { |
| 63 | dynamicWait(By.xpath("//*[contains(text(),'PO information')]")); | 73 | dynamicWait(By.xpath("//*[contains(text(),'PO information')]")); |
| 64 | Model.setPoNum(poNum.getText()); | 74 | Model.setPoNum(poNum.getText()); |
| @@ -66,9 +76,11 @@ public class PayDepositPage extends BasePage { | @@ -66,9 +76,11 @@ public class PayDepositPage extends BasePage { | ||
| 66 | if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) { | 76 | if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) { |
| 67 | //如果是可用资金不足，跳转到资金管理 | 77 | //如果是可用资金不足，跳转到资金管理 |
| 68 | toAssetManagementPage(); | 78 | toAssetManagementPage(); |
| 69 | -// }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) { | ||
| 70 | - }else { | 79 | + }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) { |
| 71 | //免定金模式，确认po，跳转到我的订单列表 | 80 | //免定金模式，确认po，跳转到我的订单列表 |
| 81 | + click(submit); | ||
| 82 | + }else { | ||
| 83 | + //单柜比例定金 | ||
| 72 | confirm(); | 84 | confirm(); |
| 73 | } | 85 | } |
| 74 | forceWait(2000); | 86 | forceWait(2000); |
src/main/resources/data.xml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <test> | 2 | <test> |
| 3 | <data> | 3 | <data> |
| 4 | <!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> --> | 4 | <!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> --> |
| 5 | - <buyerAccount>yang471872497@163.com</buyerAccount> | 5 | + <buyerAccount>meng18@essa.cn</buyerAccount> |
| 6 | <supplier>物料分析</supplier> | 6 | <supplier>物料分析</supplier> |
| 7 | <buyerNo>COK09161</buyerNo> | 7 | <buyerNo>COK09161</buyerNo> |
| 8 | </data> | 8 | </data> |