Compare View
Commits (3)
Showing
3 changed files
Show diff stats
src/main/java/com/buyer/pageObject/PayDepositPage.java
| ... | ... | @@ -36,6 +36,10 @@ public class PayDepositPage extends BasePage { |
| 36 | 36 | //po单号 |
| 37 | 37 | @FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span") |
| 38 | 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 | 52 | } |
| 49 | 53 | |
| 50 | 54 | /** |
| 51 | - * 确认PO | |
| 55 | + * 确认PO：单柜比例 | |
| 52 | 56 | * @return MyOrderPage |
| 53 | 57 | */ |
| 54 | 58 | public MyOrderPage confirm() { |
| ... | ... | @@ -58,7 +62,13 @@ public class PayDepositPage extends BasePage { |
| 58 | 62 | } |
| 59 | 63 | return new MyOrderPage(driver); |
| 60 | 64 | } |
| 61 | - | |
| 65 | + | |
| 66 | + | |
| 67 | + /** | |
| 68 | + *确认PO操作方法 | |
| 69 | + * @param | |
| 70 | + * @return | |
| 71 | + */ | |
| 62 | 72 | public void operate() { |
| 63 | 73 | dynamicWait(By.xpath("//*[contains(text(),'PO information')]")); |
| 64 | 74 | Model.setPoNum(poNum.getText()); |
| ... | ... | @@ -66,9 +76,11 @@ public class PayDepositPage extends BasePage { |
| 66 | 76 | if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) { |
| 67 | 77 | //如果是可用资金不足，跳转到资金管理 |
| 68 | 78 | toAssetManagementPage(); |
| 69 | -// }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) { | |
| 70 | - }else { | |
| 79 | + }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) { | |
| 71 | 80 | //免定金模式，确认po，跳转到我的订单列表 |
| 81 | + click(submit); | |
| 82 | + }else { | |
| 83 | + //单柜比例定金 | |
| 72 | 84 | confirm(); |
| 73 | 85 | } |
| 74 | 86 | forceWait(2000); | ... | ... |
src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryTaskPage.java
| ... | ... | @@ -97,14 +97,12 @@ public class ProductInquiryTaskPage extends BasePage { |
| 97 | 97 | * @return 询价反馈页面 |
| 98 | 98 | */ |
| 99 | 99 | public ProductInquiryFeedbackPage POtoFeedback() { |
| 100 | + forceWait(1000); | |
| 100 | 101 | dynamicWait(By.xpath("//*[@ng-table='tableParams1']/tbody/tr[1]")); |
| 101 | 102 | click(advancedQuery); |
| 102 | 103 | sendKeys(POQuery, Model.getPoNum()); |
| 103 | 104 | click(search); |
| 104 | 105 | dynamicWait(By.xpath("//*[@id='mask' and @style='display: none;']")); |
| 105 | -// dynamicWait(By.xpath("//*[@ng-table='tableParams1']/tbody/tr[1]")); | |
| 106 | -// mywait(firstRow); | |
| 107 | -// forceWait(2000); | |
| 108 | 106 | click(firstRow); |
| 109 | 107 | click(feedBack); |
| 110 | 108 | return new ProductInquiryFeedbackPage(driver); | ... | ... |
src/main/resources/data.xml