ui add

src/test/java/ui/cases/Activity/优惠券_Activity_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Activity;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.Activity_egg_Page;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,17 +14,25 @@ import static com.codeborne.selenide.Selenide.open;
 public class 优惠券_Activity_ui extends DuibaBaseUi{
     @Test
     public void 正常流程() throws Exception {
+//        new MoblieLogin("5074",this);
+//        clickByClass("btn-close");
+//        screenshot();
+//        clickByTextEqual("ui自动化-活动工具-优惠券");
+//        screenshot();
+//        clickByClass("egg jump");
+//
+//        clickByTextEqual("ui自动化-优惠券（活动）");
+//        sleep(2);
+//        clickByClass("J_gotoDetail logandgo");
+
+
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-活动工具-优惠券");
-        screenshot();
-        clickByClass("egg jump");
+        //手机端楼层
+        new HomePage("ui自动化-活动工具-优惠券",this);
 
-        clickByTextEqual("ui自动化-优惠券（活动）");
+        new Activity_egg_Page("ui自动化-优惠券（活动）",this);
         sleep(2);
         clickByClass("J_gotoDetail logandgo");
-//        driver.findElementByXPath("")
     }
 
 

src/test/java/ui/cases/Activity/实物_Activity_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Activity;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.Activity_egg_Page;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,15 +14,15 @@ import static com.codeborne.selenide.Selenide.open;
 public class 实物_Activity_ui extends DuibaBaseUi{
     @Test
     public void 正常流程() throws Exception {
+
+
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-活动工具-实物");
-        screenshot();
-        clickByClass("egg jump");
+        //手机端楼层
+        new HomePage("ui自动化-活动工具-实物",this);
 
+        new Activity_egg_Page(null,this);
         sleep(2);
         clickByClass("J_gotoDetail logandgo");
-//        driver.findElementByXPath("")
+
     }
 }

src/test/java/ui/cases/Activity/支付宝_Activity_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Activity;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.Activity_egg_Page;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,16 +14,13 @@ import static com.codeborne.selenide.Selenide.open;
 public class 支付宝_Activity_ui extends DuibaBaseUi{
     @Test
     public void 正常流程() throws Exception {
+
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-活动工具-支付宝");
-        screenshot();
-        clickByClass("egg jump");
+        //手机端楼层
+        new HomePage("ui自动化-活动工具-支付宝",this);
 
-//        clickByTextEqual("ui自动化-优惠券（活动）");
+        new Activity_egg_Page(null,this);
         sleep(2);
         clickByClass("J_gotoDetail logandgo");
-//        driver.findElementByXPath("")
     }
 }

src/test/java/ui/cases/Activity/虚拟商品_Activity_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Activity;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.Activity_egg_Page;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,12 +14,12 @@ import static com.codeborne.selenide.Selenide.open;
 public class 虚拟商品_Activity_ui extends DuibaBaseUi{
     @Test
     public void 正常流程() throws Exception {
+
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-活动工具-虚拟商品");
-        screenshot();
-        clickByClass("egg jump");
+        //手机端楼层
+        new HomePage("ui自动化-活动工具-支付宝",this);
+
+        new Activity_egg_Page(null,this);
 
 
 

src/test/java/ui/cases/Activity/谢谢参与_Activity_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Activity;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.Activity_egg_Page;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,16 +14,12 @@ import static com.codeborne.selenide.Selenide.open;
 public class 谢谢参与_Activity_ui extends DuibaBaseUi{
     @Test
     public void 正常流程() throws Exception {
+
+
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-活动工具-优惠券");
-        screenshot();
-        clickByClass("egg jump");
+        //手机端楼层
+        new HomePage("ui自动化-活动工具-谢谢参与",this);
 
-        clickByTextEqual("ui自动化-优惠券（活动）");
-        sleep(2);
-        clickByClass("J_gotoDetail logandgo");
-//        driver.findElementByXPath("")
+        new Activity_egg_Page(null,this);
     }
 }

src/test/java/ui/cases/Exchange/实物_ExchangeTest_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Exchange;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.ExchangePage;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,17 +14,29 @@ import static com.codeborne.selenide.Selenide.open;
 public class 实物_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void 实物兑换_正常流程() throws Exception {
+//        new MoblieLogin("5074",this);
+//        clickByClass("btn-close");
+//        screenshot();
+//        clickByTextEqual("ui自动化-实物");
+//        screenshot();
+//        clickByTextEqual("马上兑换");
+//        screenshot();
+//        clickByTextEqual("确定");
+//        screenshot();
+//        sleep(5);
+//        screenshot();
+
+
+
+        //通过dafuweng登陆手机端
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("ui自动化-实物");
-        screenshot();
-        clickByTextEqual("马上兑换");
-        screenshot();
-        clickByTextEqual("确定");
-        screenshot();
+        //手机端楼层
+        new HomePage("ui自动化-实物",this);
+        //兑换页面
+        new ExchangePage("马上兑换",this);
         sleep(5);
         screenshot();
 
+
     }
 }

src/test/java/ui/cases/Exchange/支付宝_ExchangeTest_ui.java

@@ -2,6 +2,8 @@ package ui.cases.Exchange;
 
 import base.DuibaBaseUi;
 import org.testng.annotations.Test;
+import ui.service.ExchangePage;
+import ui.service.HomePage;
 import ui.service.MoblieLogin;
 
 import static com.codeborne.selenide.Selenide.open;
@@ -12,15 +14,14 @@ import static com.codeborne.selenide.Selenide.open;
 public class 支付宝_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void  支付宝_正常流程() throws Exception {
+
+
+        //通过dafuweng登陆手机端
         new MoblieLogin("5074",this);
-        clickByClass("btn-close");
-        screenshot();
-        clickByTextEqual("支付宝充值");
-        screenshot();
-        clickByTextEqual("马上兑换");
-        screenshot();
-        clickByTextEqual("确定");
-        screenshot();
+        //手机端楼层
+        new HomePage("支付宝充值",this);
+        //兑换页面
+        new ExchangePage("马上兑换",this);
         sleep(5);
         screenshot();