diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 2bc1b8d..0c4bca5 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,3 +1,2 @@ 手机号 -15121074365 -13630297765 \ No newline at end of file +15121074365 \ No newline at end of file diff --git a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot index 1b691ee..28a103c 100644 --- a/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot +++ b/1-Applet/2-Homepage/BlindDate/AdvancedsearchResource.robot @@ -8,20 +8,22 @@ Library DateTime *** Keywords *** 查询${dating}征婚人的资料信息 #通过userid获取征婚人的资料 + ${miId_list} Create List + ${genderCodeList} Create List FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId} ${miId} Get From Dictionary ${reps.json()['data']} id #获取资料id ${nickName} Get From Dictionary ${reps.json()['data']} nickName #获取用户名称 - ${miId_list} Create List ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #用户性别 ${message} Get From Dictionary ${reps.json()} message Append To List ${miId_list} ${miId} + Append To List ${genderCodeList} ${genderCode} Should Be Equal As Strings ${message} successful END Set Global Variable ${nickName} Set Global Variable ${miId_list} - Set Global Variable ${genderCode} + Set Global Variable ${genderCodeList} 查询${dating}征婚人资料 #通过miId查询征婚人资料 diff --git a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot index 92d0f92..b8c609e 100644 --- a/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot +++ b/1-Applet/2-Homepage/BlindDate/NormalsearchResource.robot @@ -215,14 +215,12 @@ region固定省市-广州 选择${dating}征婚人的学历 #获取学历列表 - FOR ${client_header} IN @{Cheader_list} - Create Session dating ${${dating}.dating域名} ${client_header} - ${reps} GET On Session dating dating-agency-service/user/get/education/list - ${data_list} Get From Dictionary ${reps.json()} data - ${education_data} Evaluate random.choice(${data_list}) random #随机获取学历 - #${education_data} Get From List ${data_list} 3 #0高中以下,1中专,2大专,3本科。4硕士,5博士 - ${education} Get From Dictionary ${education_data} desc #学历名称 - ${educationCode} Get From Dictionary ${education_data} value #学历编码 - Set Global Variable ${education} - Set Global Variable ${educationCode} - END + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/education/list + ${data_list} Get From Dictionary ${reps.json()} data + ${education_data} Evaluate random.choice(${data_list}) random #随机获取学历 + #${education_data} Get From List ${data_list} 3 #0高中以下,1中专,2大专,3本科。4硕士,5博士 + ${education} Get From Dictionary ${education_data} desc #学历名称 + ${educationCode} Get From Dictionary ${education_data} value #学历编码 + Set Global Variable ${education} + Set Global Variable ${educationCode} diff --git a/output/log.html b/output/log.html index e46f80b..5278f2e 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,13 +1806,13 @@ function stopPropagation(event) { window.output = {};