diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 69f744a..ba95afe 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -6,6 +6,10 @@ Library String
Library Collections
*** Test Cases ***
+游客使用婚介平台
+ #游客打开婚介平台
+ Given 游客登录婚介平台
+
手机号验证码登录
#登录婚介平台
Given 读取TXT文件
@@ -77,10 +81,19 @@ Library Collections
#${img} Evaluate demjson.encode(${imgdata}) demjson
#log ${img}
#追加字典
- ${dictData} Set Variable [{"value":0,"desc":"偏瘦"},{"value":1,"desc":"正常"},{"value":2,"desc":"偏胖"},{"value":3,"desc":"肥胖"}]
+ #${dictData} Set Variable [{"value":0,"desc":"偏瘦"},{"value":1,"desc":"正常"},{"value":2,"desc":"偏胖"},{"value":3,"desc":"肥胖"}]
#${dictData} Evaluate type(${dictData})
- ${dict} Set Variable {"value":-1,"desc":"不限"}
- Insert Into List ${dictData} 0 [{"value":-1,"desc":"不限"}]
+ #${dict} Set Variable {"value":-1,"desc":"不限"}
+ #Insert Into List ${dictData} 0 [{"value":-1,"desc":"不限"}]
+ #设置一个参数范围
+ ${age} Evaluate 40
+ ${age_range} Evaluate list(range(${age}-9,${age}+10,1))
+ log ${age_range}
+ ${Age} Evaluate [35,38,40,50]
+ FOR ${i} IN @{Age}
+ Run Keyword If ${i} in ${age_range} log 在范围内
+ ... ELSE log 不在范围内
+ END
数据库删除用户
Given 读取TXT文件
diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index 597f32d..752da62 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -25,6 +25,14 @@ Library OperatingSystem
${phone} Evaluate ${num}${number}
Set Global Variable ${phone}
+游客登录${dating}平台
+ #游客登录婚介平台
+ Disable Warnings
+ Create Session dating ${${dating}.dating域名} ${${dating}.CHeader}
+ ${reps} GET On Session dating /dating-agency-service/user/get/marriage-information/tourist-recommend
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+
用户获取${dating}平台短信验证码
#用户获取婚介平台短信验证码
Disable Warnings
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 9cdb2a5..443de94 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-13977594623
\ No newline at end of file
+19128859944
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index cb966c7..65a1840 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -138,7 +138,7 @@ Library OperatingSystem
选择${dating}征婚人的城市
#选择城市
#获取省市区
- region固定省市-衡阳
+ region固定省市-广州
#选择征婚人地区资料
Disable Warnings
${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
@@ -183,7 +183,7 @@ Library OperatingSystem
#${start-year} Evaluate 1950
#${end-year} Evaluate ${get_year}-18
#${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份
- ${year} Evaluate ${get_year}-39 #固定年龄
+ ${year} Evaluate ${get_year}-42 #固定年龄
${Number} Evaluate 3 #填写序号
Create Session dating ${${dating}.dating域名} ${client_header}
${Data} Update Value To Json ${Data} $.id ${DataId}
diff --git a/1-Applet/2-Homepage/Blind/Blind.robot b/1-Applet/2-Homepage/Blind/Blind.robot
deleted file mode 100644
index 0fc3b12..0000000
--- a/1-Applet/2-Homepage/Blind/Blind.robot
+++ /dev/null
@@ -1,16 +0,0 @@
-*** Settings ***
-Library urllib3
-Library String
-Library Collections
-Library RequestsLibrary
-
-*** Keywords ***
-游客登录${dating}平台
- #游客登录婚介平台
- Disable Warnings
- Create Session dating ${${dating}.dating域名} ${${dating}.CHeader}
- ${reps} GET On Session dating /dating-agency-service/user/get/marriage-information/tourist-recommend
- ${message} Get From Dictionary ${reps.json()} message
- Should Be Equal As Strings ${message} successful
-
-征婚人登录${dating}平台后查看相亲推荐页面
diff --git a/1-Applet/2-Homepage/Blind/BlindDate.robot b/1-Applet/2-Homepage/Blind/BlindDate.robot
deleted file mode 100644
index 6561f2c..0000000
--- a/1-Applet/2-Homepage/Blind/BlindDate.robot
+++ /dev/null
@@ -1,10 +0,0 @@
-*** Settings ***
-Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
-Resource Blind.robot
-
-*** Test Cases ***
-游客使用婚介平台
- #游客打开婚介平台
- Given 游客登录婚介平台
-
-征婚人使用婚介平台-相亲页面
diff --git a/1-Applet/2-Homepage/Blind/__init__.robot b/1-Applet/2-Homepage/Blind/__init__.robot
deleted file mode 100644
index 855fe60..0000000
--- a/1-Applet/2-Homepage/Blind/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation 相亲主页
diff --git a/1-Applet/2-Homepage/BlindDate/Blind.robot b/1-Applet/2-Homepage/BlindDate/Blind.robot
new file mode 100644
index 0000000..33766ec
--- /dev/null
+++ b/1-Applet/2-Homepage/BlindDate/Blind.robot
@@ -0,0 +1,10 @@
+*** Settings ***
+Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
+Resource BlindResource.robot
+
+*** Test Cases ***
+用户查看相亲推荐页
+ #相亲推荐页
+ Given 查询婚介征婚人的资料信息
+ When 查询婚介征婚人资料
+ And 查看婚介平台相亲列表
diff --git a/1-Applet/2-Homepage/BlindDate/BlindResource.robot b/1-Applet/2-Homepage/BlindDate/BlindResource.robot
new file mode 100644
index 0000000..8090692
--- /dev/null
+++ b/1-Applet/2-Homepage/BlindDate/BlindResource.robot
@@ -0,0 +1,73 @@
+*** Settings ***
+Library urllib3
+Library Collections
+Library RequestsLibrary
+
+*** Keywords ***
+查询${dating}征婚人的资料信息
+ #通过userid获取征婚人的资料
+ 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}
+ Should Be Equal As Strings ${message} successful
+ END
+ Set Global Variable ${nickName}
+ Set Global Variable ${miId_list}
+ Set Global Variable ${genderCode}
+
+查询${dating}征婚人资料
+ #通过miId查询征婚人资料
+ FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/details/byid params=miId=${miId}
+ ${age} Get From Dictionary ${reps.json()['data']} age #年龄
+ ${height} Get From Dictionary ${reps.json()['data']} height #获取征婚人身高
+ ${cityCode} Get From Dictionary ${reps.json()['data']} cityCode #现居城市
+ ${birthYear} Get From Dictionary ${reps.json()['data']} birthYear #出生年份
+ ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #性别
+ END
+ Set Global Variable ${age}
+ Set Global Variable ${height}
+ Set Global Variable ${cityCode}
+ Set Global Variable ${birthYear}
+ Set Global Variable ${genderCode}
+
+查看${dating}平台相亲列表
+ #相亲推荐页
+ ${ageRange} Evaluate list(range(${age}-9,${age}+10,1)) #年龄范围
+ ${heightRange} Evaluate list(range(${height}-20,${height}+15,1)) #身高范围
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=queryType=0&pageNum=1&pageSize=30
+ ${records} Get From Dictionary ${reps.json()['data']} records #推荐列表
+ Set Global Variable ${records}
+ 遍历推荐列表
+ END
+ #判断年龄是否在范围内
+ FOR ${a} IN @{age_list}
+ Run Keyword If ${a} in ${ageRange} log ${a}存在于${ageRange}中
+ ... ELSE log ${a}不存在于${ageRange}中
+ END
+ #判断身高是否在范围内
+ FOR ${h} IN @{height_list}
+ Run Keyword If ${h} in ${heightRange} log ${h}存在于${heightRange}中
+ ... ELSE log ${h}不存在于${heightRange}中
+ END
+
+遍历推荐列表
+ ${age_list} Create List
+ ${height_list} Create List
+ FOR ${data} IN @{records}
+ ${age} Get From Dictionary ${data} age
+ ${height} Get From Dictionary ${data} height
+ Append To List ${age_list} ${age}
+ Append To List ${height_list} ${height}
+ END
+ Set Global Variable ${age_list}
+ Set Global Variable ${height_list}
diff --git a/1-Applet/2-Homepage/BlindDate/__init__.robot b/1-Applet/2-Homepage/BlindDate/__init__.robot
new file mode 100644
index 0000000..48df7b9
--- /dev/null
+++ b/1-Applet/2-Homepage/BlindDate/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation 相亲页面
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index 7384d6e..39e51d8 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -93,7 +93,7 @@ Resource ../../../0-Login/LoginResource.robot
#提交征婚人身份证审核
#${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400
#女生身份证
- ${woman_value} Set Variable 赖勇兰,441481199509213863
+ ${woman_value} Set Variable 尤名雅,420101198605250747
#男生身份证
${value_list} Create List 王颖勋,44058319951227041X
${man_value} Evaluate random.choice(${value_list}) random
@@ -183,7 +183,7 @@ Resource ../../../0-Login/LoginResource.robot
#${start-year} Evaluate 1950
#${end-year} Evaluate ${get_year}-18
#${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份
- ${birthYear} Evaluate ${get_year}-25 #固定年龄
+ ${birthYear} Evaluate ${get_year}-29 #固定年龄
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${data} Set Variable {"id":"${miId}","birthYear":${birthYear}}
diff --git a/1-Applet/Logout/LogoutResource.robot b/1-Applet/Logout/LogoutResource.robot
new file mode 100644
index 0000000..f9f8218
--- /dev/null
+++ b/1-Applet/Logout/LogoutResource.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library urllib3
+Library Collections
+Library RequestsLibrary
+
+*** Keywords ***
+用户退出登录${dating}平台
+ #退出登录
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} POST On Session dating dating-agency-uec/user/logout json={}
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
diff --git a/1-Applet/Logout/logout.robot b/1-Applet/Logout/logout.robot
new file mode 100644
index 0000000..aa30157
--- /dev/null
+++ b/1-Applet/Logout/logout.robot
@@ -0,0 +1,7 @@
+*** Settings ***
+Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
+Resource LogoutResource.robot
+
+*** Test Cases ***
+用户退出登录
+ Given 用户退出登录婚介平台
diff --git a/output/log.html b/output/log.html
index 9987119..32ae49e 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};