diff --git a/Login/Login-interface.robot b/0-Login/Login-interface.robot
similarity index 72%
rename from Login/Login-interface.robot
rename to 0-Login/Login-interface.robot
index a20a2ed..95ed353 100644
--- a/Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     接口：短信验证码登录认证
-Suite Setup       Import Variables    ${EXECDIR}\\Dating-agency\\DA_data.yaml
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
 Resource          LoginResource.robot
 
 *** Test Cases ***
@@ -20,8 +20,5 @@ Resource          LoginResource.robot
     And 用户手机号错误验证码登录婚介平台
 
 000
-    ${id-list}    Create List    1    2    3
-    FOR    ${id}    IN    @{id-list}
-        Set Global Variable    ${id}
-    END
-    ${tempdir}    Set Variable    ${EXECDIR}
+    Given 创建一个列表
+    Then 同时执行多个参数的FOR循环
diff --git a/Login/LoginResource.robot b/0-Login/LoginResource.robot
similarity index 91%
rename from Login/LoginResource.robot
rename to 0-Login/LoginResource.robot
index b0535e7..a7b0b83 100644
--- a/Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -106,13 +106,22 @@ Library           OperatingSystem
         Disable Warnings
         Create Session    dating    ${${dating}.dating域名}    ${login_header}
         ${reps}    GET On Session    dating    /dating-agency-uec/user/list/own-organization    params=userId=${userid}
+        ${data}    Get From Dictionary    ${reps.json()}    data    #获取用户组织数据
         ${message}    Get From Dictionary    ${reps.json()}    message
         Should Be Equal As Strings    ${message}    successful
+        Run Keyword If    ${data}==[]    log    未获取到组织信息！
+        ...    ELSE    log    ${data}
     END
 
-000
+创建一个列表
     ${result}    Create List    4    5    6
-    FOR    ${i}    IN    @{result}
-        ${data}    Set Variable    { \ \ \ \ "id": "${id}", \ \ \ \ "result": "${i}" }
-        log    ${data}
+    ${pid_list}    Create List    7    8    9
+    Set Global Variable    ${result}
+    Set Global Variable    ${pid_list}
+
+同时执行多个参数的FOR循环
+    ${id-list}    Create List    1    2
+    FOR    ${id}    ${pid}    ${i}    IN ZIP    ${id-list}    ${pid_list}    ${result}
+        ${data}    Set Variable    { \ \ \ \ "id": "${id}", \ \ \ \ "result": "${i}", \ \ \ \ "pid": "${pid}" }
     END
+    ${tempdir}    Set Variable    ${EXECDIR}    #获取脚本执行路径
diff --git a/0-Login/__init__.robot b/0-Login/__init__.robot
new file mode 100644
index 0000000..2e21a97
--- /dev/null
+++ b/0-Login/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation     用户登录婚介平台
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
new file mode 100644
index 0000000..5e06aa7
--- /dev/null
+++ b/0-Login/phone-test.txt
@@ -0,0 +1,2 @@
+手机号
+15014242835
\ No newline at end of file
diff --git a/WriteInfo/InfoResource.robot b/1-WriteInfo/InfoResource.robot
similarity index 85%
rename from WriteInfo/InfoResource.robot
rename to 1-WriteInfo/InfoResource.robot
index 67ad62a..08565a9 100644
--- a/WriteInfo/InfoResource.robot
+++ b/1-WriteInfo/InfoResource.robot
@@ -21,6 +21,13 @@ Library           OperatingSystem
         Should Be Equal As Strings    ${message}    successful
         Set Global Variable    ${Data}
         Run Keyword If    ${fillSerialNumber}==0    填写婚介征婚人的基础资料
+        ...    ELSE IF    ${fillSerialNumber}==1    填写婚介征婚人资料-城市开始
+        ...    ELSE IF    ${fillSerialNumber}==2    填写婚介征婚人的资料-出生年份开始
+        ...    ELSE IF    ${fillSerialNumber}==3    填写婚介征婚人的资料-身高开始
+        ...    ELSE IF    ${fillSerialNumber}==4    填写婚介征婚人的资料-学历开始
+        ...    ELSE IF    ${fillSerialNumber}==5    填写婚介征婚人的资料-婚姻状况开始
+        ...    ELSE IF    ${fillSerialNumber}==6    填写婚介征婚人的资料-月收入开始
+        ...    ELSE IF    ${fillSerialNumber}==7    填写婚介征婚人的资料-昵称开始
         ...    ELSE    查询婚介征婚人的资料信息
     END
 
@@ -41,6 +48,48 @@ Library           OperatingSystem
     选择婚介征婚人的月收入
     选择婚介征婚人的昵称
 
+填写${dating}征婚人资料-城市开始
+    选择婚介征婚人的城市
+    选择婚介征婚人的出生年份
+    选择婚介征婚人的身高
+    选择婚介征婚人的学历
+    选择婚介征婚人的婚姻状况
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-出生年份开始
+    选择婚介征婚人的出生年份
+    选择婚介征婚人的身高
+    选择婚介征婚人的学历
+    选择婚介征婚人的婚姻状况
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-身高开始
+    选择婚介征婚人的身高
+    选择婚介征婚人的学历
+    选择婚介征婚人的婚姻状况
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-学历开始
+    选择婚介征婚人的学历
+    选择婚介征婚人的婚姻状况
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-婚姻状况开始
+    选择婚介征婚人的婚姻状况
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-月收入开始
+    选择婚介征婚人的月收入
+    选择婚介征婚人的昵称
+
+填写${dating}征婚人的资料-昵称开始
+    选择婚介征婚人的昵称
+
 选择${dating}性别资料
     #选择性别
     Log To Console    ${CURDIR}    #打印当前路径
diff --git a/WriteInfo/Infomation.robot b/1-WriteInfo/Infomation.robot
similarity index 92%
rename from WriteInfo/Infomation.robot
rename to 1-WriteInfo/Infomation.robot
index 474dbc5..306b60b 100644
--- a/WriteInfo/Infomation.robot
+++ b/1-WriteInfo/Infomation.robot
@@ -1,7 +1,7 @@
 *** Settings ***
-Suite Setup       Import Variables    ${EXECDIR}\\Dating-agency\\DA_data.yaml
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
 Resource          InfoResource.robot
-Resource          ../Login/LoginResource.robot
+Resource          ../0-Login/LoginResource.robot
 Library           Collections
 Library           RequestsLibrary
 
@@ -44,6 +44,3 @@ region
     Set Global Variable    ${districtName}
     Set Global Variable    ${provinceCode}
     Set Global Variable    ${provinceName}
-
-test
-    查询首次填写的婚介资料信息
diff --git a/1-WriteInfo/__init__.robot b/1-WriteInfo/__init__.robot
new file mode 100644
index 0000000..7fada03
--- /dev/null
+++ b/1-WriteInfo/__init__.robot
@@ -0,0 +1,3 @@
+*** Settings ***
+Documentation     登陆后填写基础资料
+Suite Setup
diff --git a/Homepage/Blind/Blind.robot b/2-Homepage/Blind/Blind.robot
similarity index 90%
rename from Homepage/Blind/Blind.robot
rename to 2-Homepage/Blind/Blind.robot
index d13ba6d..0fc3b12 100644
--- a/Homepage/Blind/Blind.robot
+++ b/2-Homepage/Blind/Blind.robot
@@ -12,3 +12,5 @@ Library           RequestsLibrary
     ${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/Homepage/Blind/BlindDate.robot b/2-Homepage/Blind/BlindDate.robot
similarity index 59%
rename from Homepage/Blind/BlindDate.robot
rename to 2-Homepage/Blind/BlindDate.robot
index 3b002a2..6561f2c 100644
--- a/Homepage/Blind/BlindDate.robot
+++ b/2-Homepage/Blind/BlindDate.robot
@@ -1,8 +1,10 @@
 *** Settings ***
-Suite Setup       Import Variables    ${EXECDIR}\\Dating-agency\\DA_data.yaml
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
 Resource          Blind.robot
 
 *** Test Cases ***
 游客使用婚介平台
     #游客打开婚介平台
     Given 游客登录婚介平台
+
+征婚人使用婚介平台-相亲页面
diff --git a/2-Homepage/Blind/__init__.robot b/2-Homepage/Blind/__init__.robot
new file mode 100644
index 0000000..855fe60
--- /dev/null
+++ b/2-Homepage/Blind/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation     相亲主页
diff --git a/2-Homepage/MarriageInfo/Authentication.robot b/2-Homepage/MarriageInfo/Authentication.robot
new file mode 100644
index 0000000..103aab5
--- /dev/null
+++ b/2-Homepage/MarriageInfo/Authentication.robot
@@ -0,0 +1,243 @@
+*** Settings ***
+Library           urllib3
+Library           String
+Library           Collections
+Library           RequestsLibrary
+Library           DatabaseLibrary
+
+*** 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
+        ${miId_list}    Create List
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Append To List    ${miId_list}    ${miId}
+        Should Be Equal As Strings    ${message}    successful
+    END
+    Set Global Variable    ${miId_list}
+
+查询${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}
+        ${height}    Get From Dictionary    ${reps.json()['data']}    height    #获取征婚人身高
+    END
+    Set Global Variable    ${height}
+
+提交${dating}征婚人头像审核
+    ${imgUrl}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/afeb83bebb3e4c7214fd3bb8f2b10cd7.png"]    #头像图片
+    ${imgUrl_list}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/0c4daad4c119ccfd883355522d51965c.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/8a5d712d621922dabae05f937d92789f.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/7d95f8b0c73e02032b48c219a7670cd0.jpeg"]    #相册图片
+    ${authenticationCode}    Evaluate    8    #0：身份证 1：学历 2：工作 3：收入 4：车辆 5：房产 6：相册 7：介绍信息 8：头像
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "authenticationCode": "${authenticationCode}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${imgUrl} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/certification/audit    ${data.encode('utf-8')}
+        ${auditId}    Get From Dictionary    ${reps.json()}    data    #获取审核id
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Run Keyword If    ${auditId}==None    Should Be Equal As Strings    ${message}    正在审核中！请等待审核完成。
+        ...    ELSE    Should Be Equal As Strings    ${message}    successful
+        Set Global Variable    ${auditId}
+    END
+
+查询数据库头像审核表
+    Connect To Database Using Custom Params    pymysql    database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    ${check}    Query    SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '8' AND `is_delete` = '0'    #查询头像审核语句
+    ${id}    Set Variable    ${check[0][0]}
+    Should Be Equal As Strings    ${id}    ${auditId}    #断言
+    Disconnect From Database
+
+提价${dating}征婚人相册审核
+    ${imgUrl_list}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/0c4daad4c119ccfd883355522d51965c.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/8a5d712d621922dabae05f937d92789f.png","https://dating-agency-test.oss-accelerate.aliyuncs.com/7d95f8b0c73e02032b48c219a7670cd0.jpeg"]    #相册图片
+    ${Code}    Evaluate    6
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "authenticationCode": "${Code}", \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${imgUrl_list} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/certification/audit    ${data.encode('utf-8')}
+        ${auditId}    Get From Dictionary    ${reps.json()}    data    #相册审核id
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+    Set Global Variable    ${auditId}
+
+查询数据库相册审核表
+    Connect To Database Using Custom Params    pymysql    database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    ${check}    Query    SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '6' AND `is_delete` = '0'    #查询相册审核语句
+    ${id}    Set Variable    ${check[0][0]}
+    Should Be Equal As Strings    ${id}    ${auditId}    #断言
+    Disconnect From Database
+
+提交${dating}征婚人身份证审核
+    #提交征婚人身份证审核
+    ${value_list}    Create List    李博,429006198410300956    王颖勋,4400819951227356X    就是不吃饭,441481199509213863    王颖勋,4400
+    ${value}    Evaluate    random.choice(${value_list})    random
+    ${code}    Evaluate    0
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "authenticationCode":"${code}", \ \ \ \ "miId":"${miId}", \ \ \ \ "value":"${value}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/certification/audit    ${data.encode('utf-8')}
+        ${data}    Get From Dictionary    ${reps.json()}    data
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Run Keyword If    ${data}!=None    Should Be Equal As Strings    ${message}    successful
+        ...    ELSE    log    ${message}
+        Set Global Variable    ${data}
+    END
+
+查询数据库身份证审核数据
+    Connect To Database Using Custom Params    pymysql    database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    ${check}    Query    SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' AND `authentication_code` = '0' AND `is_delete` = '0'    #查询相册审核语句
+    ${id}    Set Variable    ${check[0][0]}
+    Should Be Equal As Strings    ${id}    ${data}    #断言
+    Disconnect From Database
+
+提交${dating}征婚人的户口所在地
+    region
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+        ${miId}    Get From Dictionary    ${reps.json()}    data
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+        Set Global Variable    ${miId}
+    END
+
+查询数据库户口所在地数据
+    Connect To Database Using Custom Params    pymysql    database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    ${check}    Query    SELECT domicile_place_city_name FROM `dating-agency-service`.`da_marriage_information` WHERE `id` = '${miId}' AND `is_delete` = '0'    #查询相册审核语句
+    ${city_name}    Set Variable    ${check[0][0]}
+    Should Be Equal As Strings    ${city_name}    ${cityName}    #断言
+    Disconnect From Database
+
+region
+    #获取户口所在地
+    Disable Warnings
+    Create Session    region    http://qncloud.oss-cn-shenzhen.aliyuncs.com
+    ${reps}    GET On Session    region    address.json
+    ${local_data}    Get From Dictionary    ${reps.json()}    data
+    #随机获取省
+    ${province}    Evaluate    random.choice(${local_data})    random    #随机获取省区域
+    ${provinceCode}    Get From Dictionary    ${province}    value    #获取省编码
+    ${provinceName}    Get From Dictionary    ${province}    label    #获取省名称
+    ${Children}    Get From Dictionary    ${province}    children    #获取省市
+    #随机获取市
+    ${city_data}    Evaluate    random.choice(${Children})    random    #随机获取市区域
+    ${cityCode}    Get From Dictionary    ${city_data}    value    #获取市编码
+    ${cityName}    Get From Dictionary    ${city_data}    label    #获取市名称
+    Set Global Variable    ${cityCode}
+    Set Global Variable    ${cityName}
+    Set Global Variable    ${provinceCode}
+    Set Global Variable    ${provinceName}
+
+提交${dating}征婚人的体重
+    查询婚介征婚人资料
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${weight}    Evaluate    random.randint(30,149)    random    #获取随机体重
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${weight}", \ \ \ \ "height": "${height}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人民族信息
+    #获取名族字典
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    dating-agency-service/user/get/nation/list
+        ${data}    Get From Dictionary    ${reps.json()}    data
+        ${Nation_data}    Evaluate    random.choice(${data})    random
+        ${nation}    Get From Dictionary    ${Nation_data}    cn    #获取民族名称
+        ${nationCode}    Get From Dictionary    ${Nation_data}    id    #获取民族编码
+        Set Global Variable    ${nation}
+        Set Global Variable    ${nationCode}
+    END
+    #提交民族信息
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "nation": "${nation}", \ \ \ \ "nationCode": "${nationCode}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人星座信息
+    #获取星座字典
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    dating-agency-service/user/get/constellation/list
+        ${data}    Get From Dictionary    ${reps.json()}    data
+        ${ConstellationData}    Evaluate    random.choice(${data})    random    #随机获取星座json
+        ${constellation}    Get From Dictionary    ${ConstellationData}    constellation    #获取星座名称
+        ${constellationCode}    Get From Dictionary    ${ConstellationData}    constellationCode    #获取星座编码
+        Set Global Variable    ${constellation}
+        Set Global Variable    ${constellationCode}
+    END
+    #提交征婚人星座数据
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "constellation": "${constellation}", \ \ \ \ "constellationCode": "${constellationCode}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的户口类型
+    #获取户口类型
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    dating-agency-service/user/get/account/type
+        ${data}    Get From Dictionary    ${reps.json()}    data    #获取户口类型字典
+        ${accounttypeData}    Evaluate    random.choice(${data})    random    #随机获取户口类型
+        ${accountTypeCode}    Get From Dictionary    ${accounttypeData}    accountTypeCode    #户口类型编码
+        ${accountTypeName}    Get From Dictionary    ${accounttypeData}    accountTypeName    #户口类型名称
+        Set Global Variable    ${accountTypeCode}
+        Set Global Variable    ${accountTypeName}
+    END
+    #提交征婚人户口类型
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "accountTypeName": "${accountTypeName}", \ \ \ \ "accountTypeCode": "${accountTypeCode}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的籍贯信息
+    #提交征婚人的籍贯信息
+    region
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "nativePlaceName": "${provinceName}", \ \ \ \ "nativePlaceCode": "${provinceCode}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encoede('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的职业
+    #获取职业字典
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    dating-agency-service/user/get/occupation/list
+        ${data}    Get From Dictionary    ${reps.json()}    data    #获取职业字典
+        ${industryData}    Evaluate    random.choice(${data})    random    #随机获取职业一级分类
+        ${industry}    Get From Dictionary    ${industryData}    industry    #职业大类名称
+        ${industryCode}    Get From Dictionary    ${industryData}    industryCode    #职业大类编码
+        ${occupationList}    Get From Dictionary    ${industryData}    occupationList    #获取职业二级分类
+        ${occupationData}    Evaluate    random.choice(${occupationList})    random
+        ${occupation}    Get From Dictionary    ${occupationData}    occupation    #职业名称
+        ${occupationCode}    Get From Dictionary    ${occupationData}    occupationCode    #职业编码
+        Set Global Variable    ${industry}
+        Set Global Variable    ${occupation}
+        Set Global Variable    ${industryCode}
+        Set Global Variable    ${occupationCode}
+    END
+    #提交职业信息
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "id": "${miId}", \ \ \ \ "industry": "${industry}", \ \ \ \ "industryCode": "${industryCode}", \ \ \ \ "occupation": "${occupation}", \ \ \ \ "occupationCode": "${occupationCode}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
+    END
diff --git a/2-Homepage/MarriageInfo/DataAuthentication.robot b/2-Homepage/MarriageInfo/DataAuthentication.robot
new file mode 100644
index 0000000..4b5f6ce
--- /dev/null
+++ b/2-Homepage/MarriageInfo/DataAuthentication.robot
@@ -0,0 +1,54 @@
+*** Settings ***
+Documentation     资料认证
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
+Resource          Authentication.robot
+Resource          ../../0-Login/LoginResource.robot
+
+*** Test Cases ***
+提交征婚人头像审核信息-无审核中
+    Given 查询婚介征婚人的资料信息
+    When 提交婚介征婚人头像审核
+    Then 查询数据库头像审核表
+    And 查询婚介征婚人的资料信息
+
+提交征婚人头像审核信息-存在审核中数据
+    Given 查询婚介征婚人的资料信息
+    When 提交婚介征婚人头像审核
+
+提交征婚人相册审核信息
+    Given 查询婚介征婚人的资料信息
+    When 提价婚介征婚人相册审核
+    Then 查询数据库相册审核表
+
+提交征婚人身份证审核信息
+    Given 查询婚介征婚人的资料信息
+    When 提交婚介征婚人身份证审核
+
+提交征婚人户口所在地
+    Given 查询婚介征婚人的资料信息
+    When 提交婚介征婚人的户口所在地
+    Then 查询数据库户口所在地数据
+
+提交征婚人的体重
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人的体重
+
+提交征婚人的民族信息
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人民族信息
+
+提交征婚人的星座信息
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人星座信息
+
+提交征婚人的户口类型
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人的户口类型
+
+提交征婚人的籍贯
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人的籍贯信息
+
+提交征婚人的职业
+    Given 查询婚介征婚人的资料信息
+    Then 提交婚介征婚人的职业
diff --git a/2-Homepage/MarriageInfo/MateSelection.robot b/2-Homepage/MarriageInfo/MateSelection.robot
new file mode 100644
index 0000000..d85e128
--- /dev/null
+++ b/2-Homepage/MarriageInfo/MateSelection.robot
@@ -0,0 +1,21 @@
+*** Settings ***
+Documentation     择偶条件
+Suite Setup       Import Variables    ${EXECDIR}\\DA_data.yaml
+Resource          Selection.robot
+
+*** Test Cases ***
+提交征婚人择偶数据-户口所在地
+    Given 查询婚介用户资料
+    When 查询婚介征婚人择偶条件数据
+    And 提交婚介征婚人择偶条件-户口所在地
+    Then 查询数据库择偶表的数据
+
+提交征婚人的择偶条件-身高范围
+    Given 查询婚介用户资料
+    When 查询婚介征婚人择偶条件数据
+    And 提交婚介征婚人的择偶条件-身高范围
+
+提交征婚人的择偶条件-学历
+    Given 查询婚介用户资料
+    When 查询婚介征婚人择偶条件数据
+    And 提交婚介征婚人的择偶条件-学历
diff --git a/2-Homepage/MarriageInfo/Selection.robot b/2-Homepage/MarriageInfo/Selection.robot
new file mode 100644
index 0000000..1863f93
--- /dev/null
+++ b/2-Homepage/MarriageInfo/Selection.robot
@@ -0,0 +1,130 @@
+*** Settings ***
+Library           urllib3
+Library           String
+Library           Collections
+Library           RequestsLibrary
+Library           DatabaseLibrary
+
+*** Keywords ***
+region
+    #获取户口所在地
+    Disable Warnings
+    Create Session    region    http://qncloud.oss-cn-shenzhen.aliyuncs.com
+    ${reps}    GET On Session    region    address.json
+    ${local_data}    Get From Dictionary    ${reps.json()}    data
+    #随机获取省
+    ${province}    Evaluate    random.choice(${local_data})    random    #随机获取省区域
+    ${provinceCode}    Get From Dictionary    ${province}    value    #获取省编码
+    ${provinceName}    Get From Dictionary    ${province}    label    #获取省名称
+    ${Children}    Get From Dictionary    ${province}    children    #获取省市
+    #随机获取市
+    ${city_data}    Evaluate    random.choice(${Children})    random    #随机获取市区域
+    ${cityCode}    Get From Dictionary    ${city_data}    value    #获取市编码
+    ${cityName}    Get From Dictionary    ${city_data}    label    #获取市名称
+    Set Global Variable    ${cityCode}
+    Set Global Variable    ${cityName}
+    Set Global Variable    ${provinceCode}
+    Set Global Variable    ${provinceName}
+
+查询${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
+        ${miId_list}    Create List
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Append To List    ${miId_list}    ${miId}
+        Should Be Equal As Strings    ${message}    successful
+    END
+    Set Global Variable    ${miId_list}
+
+查询${dating}征婚人择偶条件数据
+    #通过资料ID查询
+    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/demand/marriage/details    params=miId=${miId}
+        ${miId}    Get From Dictionary    ${reps.json()['data']}    miId
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+        Set Global Variable    ${miId}
+    END
+
+提交${dating}征婚人择偶条件-户口所在地
+    region
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+查询数据库择偶表的数据
+    Connect To Database Using Custom Params    pymysql    database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    ${check}    Query    SELECT domicile_place_city_name FROM `dating-agency-service`.`da_demand_marriage` WHERE `mi_id` = '${miId}'    #查询择偶表中城市数据
+    ${city_name}    Set Variable    ${check[0][0]}
+    Should Be Equal As Strings    ${city_name}    ${cityName}    #断言
+    Disconnect From Database
+
+提交${dating}征婚人择偶条件-年龄范围
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${minAge}    Evaluate    randomrandint(18,28)    random    #随机获取最小择偶年龄
+        ${maxAge}    Evaluate    randomrandint(${minAge},28)    random    #随机获取最大择偶年龄
+        ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "minAge": ${minAge}, \ \ \ \ "maxAge": ${maxAge} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的择偶条件-身高范围
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${minHeight}    Evaluate    randomrandint(170,175)    random    #随机获取最小择偶身高
+        ${maxHeight}    Evaluate    randomrandint(${minAge},185)    random    #随机获取最大择偶身高
+        ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "minHeight": ${minHeight}, \ \ \ \ "maxHeight": ${maxHeight} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${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}    Get From Dictionary    ${education_data}    desc    #学历名称
+        ${educationCode}    Get From Dictionary    ${education_data}    value    #学历编码
+        Set Global Variable    ${education}
+        Set Global Variable    ${educationCode}
+    END
+    #提交择偶学历
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "education": ${education}, \ \ \ \ "educationCode": ${educationCode} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的择偶条件-收入范围
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${minIncome}    Evaluate    randomrandint(9000,10000)    random    #随机获取最小择偶收入
+        ${maxIncome}    Evaluate    randomrandint(${minAge},50000)    random    #随机获取最大择偶收入
+        ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "minIncome": ${minIncome}, \ \ \ \ "maxIncome": ${maxIncome} }
+        ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
+
+提交${dating}征婚人的择偶条件-婚姻状况
+    #查询婚姻状况，随机获取
+    FOR    ${client_header}    IN    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${reps}    GET On Session    dating    dating-agency-service/user/get/marital/status/list
+        ${data_list}    Get From Dictionary    ${reps.json()}    data
+        ${maritalStatusData}    Evaluate    random.choice(${data_list})    random    #随机获取
diff --git a/Homepage/MarriageInfo/__init__.robot b/2-Homepage/MarriageInfo/__init__.robot
similarity index 100%
rename from Homepage/MarriageInfo/__init__.robot
rename to 2-Homepage/MarriageInfo/__init__.robot
diff --git a/Homepage/Blind/__init__.robot b/Homepage/Blind/__init__.robot
deleted file mode 100644
index 18f63c1..0000000
--- a/Homepage/Blind/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Documentation     主页
diff --git a/Homepage/MarriageInfo/MarriageInfo.robot b/Homepage/MarriageInfo/MarriageInfo.robot
deleted file mode 100644
index 0d40ada..0000000
--- a/Homepage/MarriageInfo/MarriageInfo.robot
+++ /dev/null
@@ -1,17 +0,0 @@
-*** Settings ***
-Library           urllib3
-Library           String
-Library           Collections
-Library           RequestsLibrary
-
-*** Keywords ***
-查询${dating}征婚人的资料信息
-    #获取征婚人的资料
-    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}
-        ${message}    Get From Dictionary    ${reps.json()}    message
-        Should Be Equal As Strings    ${message}    successful
-    END
-
-上传${dating}征婚人头像
diff --git a/Homepage/MarriageInfo/MarryInfo.robot b/Homepage/MarriageInfo/MarryInfo.robot
deleted file mode 100644
index 22ac34c..0000000
--- a/Homepage/MarriageInfo/MarryInfo.robot
+++ /dev/null
@@ -1,8 +0,0 @@
-*** Settings ***
-Suite Setup       Import Variables    ${EXECDIR}\\Dating-agency\\DA_data.yaml
-Resource          MarriageInfo.robot
-Resource          ../../Login/LoginResource.robot
-
-*** Test Cases ***
-征婚人头像信息
-    Given 查询婚介征婚人的资料信息
diff --git a/Login/phone-test.txt b/Login/phone-test.txt
deleted file mode 100644
index 75cdb36..0000000
--- a/Login/phone-test.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-手机号
-19128859944
-15014242835
\ No newline at end of file
diff --git a/WriteInfo/__init__.robot b/WriteInfo/__init__.robot
deleted file mode 100644
index a69b32d..0000000
--- a/WriteInfo/__init__.robot
+++ /dev/null
@@ -1,2 +0,0 @@
-*** Settings ***
-Suite Setup