固定参数，优化

0-Login/Login-interface.robot

@@ -72,10 +72,15 @@ Library           Collections
     #生成1000的整数倍数
     #${number}    Evaluate    random.randrange(9000,50000,1000)    random
     #随机获取多个值
-    ${imgList}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/30464b28455d6ddbc1f049ce4adfda7a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c7c968a93cff69375df767aefe112da4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e1c238e45a3c9264b83c0b1d4054019.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/0c1e15d1c956cb8bb678b2a1f7992f76.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/aea0caca25438b7490305cd4c704d515.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/14eee17ccd0333cda335d68004885f1f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/863db444113cabe238ce37e1ff12d8c8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/42e77d2434934a6fc24638fd5bf130d6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/122668a4d1cc4fcffd91fc3d2934fc8b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/24ef3e3c4e781b97c9e3da52cc2a6a88.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c91757deace453ee22c3d12ea9913bd0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b2b34146d7354dab2d7a7c6e65395762.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/905cbc906449e997be51c6b129c9481e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/18a7ce70dbba030da53442f0ad55e63b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/991c4bc6f06c1c3fb1d6a9a5178ee34c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/df8705ac114d936428d0765f78fc3af8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5d4eeebbf9f7df899a8964d3c802a2b7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/61971786fabc9be4718e10f9323649ef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f99a80033c77b990f9d2c75c2e6b6c1e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6647f59b5f8057c9aa67324261153cdd.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/fde465e0db7e83a6a29ad133c270c8ba.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/647e941c007594cd32d977b172efe58a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ca8faec9558e2aae046f8620fd21fed6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82e53568724f2010025231a600fd78b2.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e40ca792f19cb70f045ebfe04c57c52c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e62e2e3ad1b53d20a933a651c958201.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7f7e09f9c1f83b68de7967df210716d4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/3d9ccb6c9206e28c3dd6104d38eccd19.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ccc7a8fea47b80921b7cc790c87d6bc1.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/71a5453ecfd81a21c7fbbbcea50ec6ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bc07ad3c778a592b48a48a01a6e6bcee.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/228b58091bcdac00789bcefd77886cf2.jpg"]
-    ${imgdata}    Evaluate    random.sample(${imgList},2)    random,string
-    ${img}    Evaluate    demjson.encode(${imgdata})    demjson
-    log    ${img}
+    #${imgList}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/30464b28455d6ddbc1f049ce4adfda7a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c7c968a93cff69375df767aefe112da4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e1c238e45a3c9264b83c0b1d4054019.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/0c1e15d1c956cb8bb678b2a1f7992f76.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/aea0caca25438b7490305cd4c704d515.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/14eee17ccd0333cda335d68004885f1f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/863db444113cabe238ce37e1ff12d8c8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/42e77d2434934a6fc24638fd5bf130d6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/122668a4d1cc4fcffd91fc3d2934fc8b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/24ef3e3c4e781b97c9e3da52cc2a6a88.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c91757deace453ee22c3d12ea9913bd0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b2b34146d7354dab2d7a7c6e65395762.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/905cbc906449e997be51c6b129c9481e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/18a7ce70dbba030da53442f0ad55e63b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/991c4bc6f06c1c3fb1d6a9a5178ee34c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/df8705ac114d936428d0765f78fc3af8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5d4eeebbf9f7df899a8964d3c802a2b7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/61971786fabc9be4718e10f9323649ef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f99a80033c77b990f9d2c75c2e6b6c1e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6647f59b5f8057c9aa67324261153cdd.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/fde465e0db7e83a6a29ad133c270c8ba.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/647e941c007594cd32d977b172efe58a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ca8faec9558e2aae046f8620fd21fed6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82e53568724f2010025231a600fd78b2.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e40ca792f19cb70f045ebfe04c57c52c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e62e2e3ad1b53d20a933a651c958201.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7f7e09f9c1f83b68de7967df210716d4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/3d9ccb6c9206e28c3dd6104d38eccd19.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ccc7a8fea47b80921b7cc790c87d6bc1.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/71a5453ecfd81a21c7fbbbcea50ec6ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bc07ad3c778a592b48a48a01a6e6bcee.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/228b58091bcdac00789bcefd77886cf2.jpg"]
+    #${imgdata}    Evaluate    random.sample(${imgList},2)    random,string
+    #${img}    Evaluate    demjson.encode(${imgdata})    demjson
+    #log    ${img}
+    #追加字典
+    ${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":"不限"}]
 
 数据库删除用户
     Given 读取TXT文件

0-Login/LoginResource.robot

@@ -115,6 +115,8 @@ Library           OperatingSystem
         Run Keyword If    ${code}==0    Should Be Equal As Strings    ${message}    successful
         ...    ELSE    Should Be Equal As Strings    ${message}    验证码错误或无效验证码，请重试！
     END
+    ${phone}    Set Variable    ${account}
+    Set Global Variable    ${phone}
     Set Global Variable    ${userid_list}
     Set Global Variable    ${Aheader_list}
     Set Global Variable    ${Cheader_list}

0-Login/phone-test.txt

@@ -1,2 +1,2 @@
 手机号
-15873640527
+13473579062

1-Applet/1-WriteInfo/InfoResource.robot

@@ -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}-21    #固定年龄
+    ${year}    Evaluate    ${get_year}-27    #固定年龄
     ${Number}    Evaluate    3    #填写序号
     Create Session    dating    ${${dating}.dating域名}    ${client_header}
     ${Data}    Update Value To Json    ${Data}    $.id    ${DataId}
@@ -269,8 +269,8 @@ Library           OperatingSystem
     #${number}    Evaluate    random.randint(1,2)    random
     #${name}    Set Variable
     #FOR    ${i}    IN RANGE    ${number}
-        #${name}    Set Variable    ${name}${secondName}
-        #${nickName}    Set Variable    ${firstName}${name}
+    #${name}    Set Variable    ${name}${secondName}
+    #${nickName}    Set Variable    ${firstName}${name}
     #END
     ${Name}    Set Variable    ["缘来是你","一枚普通人","向阳","洛天神女","寻那个TA","一片烨","有一个朋友","Tough","陌上花开李公子","冲浪boy","小十七","黑色星期四","Alan","人生若只如初见","Te-amo","王小帅","王先生","牛仔","张先生","伞下铭","骑士","细水长流","就等你了","弱水三千，我只取你一瓢","搬石头砸你的jio","遗落世间的小仙女","阳光正好，微风不燥","故乡的原风景","万里&长城","遥远的旅途2024","禁忌女孩","如果当时...","漫天星河不及你回朦一瞥","雪落下的地方","故事的小黄花","天蝎座的宁静","心之所向","烟火","白色气球","带你去浪漫的土耳其","风居住的城堡","别打了我是酱油","山东在逃挖掘机","餐桌C位","网名不要太长像我这样就好","村里在逃翠花❀","林黛玉醉打蒋门神","萝莉啰嗦","美少女壮士","百变少女猪刚","诺贝尔可爱奖","睡到人间煮饭时","虚天渊","用发际线换对象","龙卷风卷走爱情","死于脚气攻心","发型不乱，一切好办","农夫三拳有点疼","举不动的小公主"]
     ${nickName}    Evaluate    random.choice(${Name})    random

1-Applet/2-Homepage/MarriageInfo/Authentication.robot

@@ -68,7 +68,7 @@ Resource          ../../../0-Login/LoginResource.robot
     ${manimgUrl_List}    Evaluate    demjson.encode(${manimgUrl_data})    demjson
     #女生相册
     ${woman_imgUrllist}    Set Variable    ["https://dating-agency-test.oss-accelerate.aliyuncs.com/71e2ac4806378e5c6f29e2e9d01f1b3b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cd5dda0a1f539861cc78f1bef4a8e8ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82d51050e13fea977a054a0208d1e616.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c6fc977ab1effc2f57c1b61ea0b4a10b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/59aae418037d0bf103f63de805eeb86b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/960b3d371ed4af8788c1fc4a8c889933.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/884c65f91e6b346bb7c9e26e750ce4d3.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c5e4bca3b533fdfbcc2557e83512215c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bbef238ab2bea9bd3e831d0e9d9557e4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1c771bf0c01eb0e5fab3fede9dab7608.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6df02f3978e72f14fb2b33b9a3e56fe9.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c9525ae0873fe94a5dd15a01717c07a0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/417ebe61e78592b42d212eb00a2ec23c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1adabba412cc81d3fa40fdf78eba46d7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/afcf0ad64c7224a8a08163cc98ef6cb6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/84b55bb41fcf7350d2c86d0d518bf546.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/80d9c390581014ea327efabc749cf042.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7ea11516b07156a1bcfa227c4fef9207.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/abae88e4e07536531d0ac7d03f7f576b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/a2826ad22aab2d082bb3598b387f1689.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b26399e635fa7dd44808342595fa334a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b3a641d16e9e547228a8ccbc8e7e5aef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cc28a387d249a8673a0cd24cf9e49896.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7615cc23bd2cf922e50e5fb3810e749f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/d0d15693e059e2525d4ea469451e4387.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f43b18d37584c0797d8ef3606d578a11.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/55f9f41f1ff9f2b71837af94ec02126a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/af74f07f326842a4c958f855ce11544b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/753745c3d3bdbffc9fecff9b3869d880.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5e3fb99b37448612749dd8b3fc5cf917.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/91b79f1e3eb2b13fa334de8157a6b9be.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/94ebc0dc461bea0feea8876620a922fb.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e94e9f29216a38527dbdc3aa75f7f415.jpg"]
-    ${womanimgUrl_data}    Evaluate    random.sample(${woman_imgUrllist},5)    random,string    #随机获取5张图片
+    ${womanimgUrl_data}    Evaluate    random.sample(${woman_imgUrllist},3)    random,string    #随机获取5张图片
     ${womanimgUrl_List}    Evaluate    demjson.encode(${womanimgUrl_data})    demjson
     ${Code}    Evaluate    6
     FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
@@ -95,7 +95,7 @@ Resource          ../../../0-Login/LoginResource.robot
     #女生身份证
     ${woman_value}    Set Variable    赖勇兰,441481199509213863
     #男生身份证
-    ${value_list}    Create List    李博,429006198410300956
+    ${value_list}    Create List    王颖勋,44058319951227041X
     ${man_value}    Evaluate    random.choice(${value_list})    random
     ${code}    Evaluate    0
     FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
@@ -171,7 +171,8 @@ Resource          ../../../0-Login/LoginResource.robot
         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    #随机获取
+        #${maritalStatusData}    Evaluate    random.choice(${data_list})    random    #随机获取
+        ${maritalStatusData}    Get From List    ${data_list}    0    #0未婚，1离异。2丧偶
         ${maritalStatusCode}    Get From Dictionary    ${maritalStatusData}    value    #婚介状况编码
         ${maritalStatusName}    Get From Dictionary    ${maritalStatusData}    desc    #婚介状况名称
         Set Global Variable    ${maritalStatusCode}
@@ -215,7 +216,8 @@ Resource          ../../../0-Login/LoginResource.robot
         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_data}    Evaluate    random.choice(${data})    random
+        ${Nation_data}    Get From List    ${data}    0    #固定民族
         ${nation}    Get From Dictionary    ${Nation_data}    cn    #获取民族名称
         ${nationCode}    Get From Dictionary    ${Nation_data}    id    #获取民族编码
         Set Global Variable    ${nation}
@@ -308,6 +310,18 @@ Resource          ../../../0-Login/LoginResource.robot
         ${reps}    POST On Session    dating    dating-agency-service/user/save/marriage/Information    ${data.encode('utf-8')}
     END
 
+提交${dating}征婚人是否独生子女
+    FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        #${onlyChild_data}    Create List    0    1    #0否1是
+        #${onlyChild}    Evaluate    random.choice(${onlyChild_data})    random
+        ${onlyChild}    Evaluate    1
+        ${data}    Set Variable    {"id":"${miId}","onlyChild":${onlyChild}}
+        ${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}征婚人的学历审核
     #提交征婚人学历审核
     数据库新增学历认证次数
@@ -327,8 +341,8 @@ Resource          ../../../0-Login/LoginResource.robot
 
 修改${dating}征婚人昵称
     #${num}    Evaluate    random.randint(1,999)    random    #随机获取一个数字
-    #${first_name}    Set Variable    ["赵", "钱", "孙", "李", "周", "吴", "郑", "王", "冯", "陈", "褚", "卫", "蒋", "沈", "韩", "杨", "朱", "秦", "尤", "许", "何", "吕", "施", "张", "孔", "曹", "严", "华", "金", "魏", "陶", "姜", "戚", "谢", "邹", "喻", "柏", "水", "窦", "章","云", "苏", "潘", "葛", "奚", "范", "彭", "郎", "鲁", "韦", "昌", "马", "苗", "凤", "花", "方", "俞", "任", "袁", "柳","酆", "鲍", "史", "唐", "费", "廉", "岑", "薛", "雷", "贺", "倪", "汤", "滕", "殷", "罗", "毕", "郝", "邬", "安", "常", "乐", "于", "时", "傅", "皮", "卞", "齐", "康", "伍", "余", "元", "卜", "顾", "孟", "平", "黄", "和", "穆", "萧", "尹", "姚", "邵", "堪", "汪", "祁", "毛", "禹", "狄", "米", "贝", "明", "臧", "计", "伏", "成", "戴", "谈", "宋", "茅", "庞","熊", "纪", "舒", "屈", "项", "祝", "董", "梁"]
-    #${second_name}    Set Variable    [ "秀", "娟", "英", "华", "慧", "巧", "美", "娜", "静", "淑", "惠", "珠", "翠", "雅", "芝", "玉", "萍", "红", "娥", "玲","芬", "芳", "燕", "彩", "春", "菊", "兰", "凤", "洁", "梅", "琳", "素", "云", "莲", "真", "环", "雪", "荣", "爱", "畅","霞", "香", "月", "莺", "媛", "艳", "瑞", "凡", "佳", "嘉", "琼", "勤", "珍", "贞", "莉", "桂", "娣", "叶", "璧", "璐", "娅", "琦", "晶", "妍", "茜", "秋", "珊", "莎", "锦", "黛", "青", "倩", "婷", "姣", "婉", "娴", "瑾", "颖", "露", "瑶", "怡", "婵", "雁", "蓓", "纨", "仪", "荷", "丹", "蓉", "眉", "君", "琴", "蕊", "薇", "菁", "梦", "岚", "苑", "婕", "馨","瑗", "琰", "韵", "融", "园", "艺", "咏", "卿", "聪", "澜", "纯", "毓", "悦", "昭", "冰", "爽", "琬", "茗", "羽", "希", "宁", "欣", "飘", "育", "滢", "馥", "筠", "柔", "竹", "霭", "凝", "晓", "欢", "霄", "枫", "芸", "菲", "寒", "伊", "亚","宜", "可", "姬", "舒", "影", "荔", "枝", "思", "丽", "伟", "刚", "勇", "毅", "俊", "峰", "强", "军", "平", "保", "东", "文", "辉", "力", "明", "永", "健", "世", "广", "志", "义", "兴", "良", "海", "山", "仁", "波", "宁", "贵", "福", "生","龙", "元", "全", "国", "胜", "学", "祥", "才", "发", "武", "新", "利", "清", "飞", "彬", "富", "顺", "信", "子", "杰", "涛", "昌", "成", "康", "星", "光", "天", "达", "安", "岩", "中", "茂", "进", "林", "有", "坚", "和", "彪", "博", "诚", "先", "敬", "震", "振", "壮", "会", "思", "群", "豪", "心", "邦", "承", "乐", "绍", "功", "松", "善", "厚", "庆", "磊", "民", "友", "裕", "河", "哲", "江", "超", "浩", "亮", "政", "谦", "亨", "奇", "固", "之", "轮", "翰", "朗", "伯", "宏","言", "若", "鸣", "朋", "斌", "梁", "栋", "维", "启", "克", "伦", "翔", "旭", "鹏", "泽", "晨", "辰", "士", "以", "建","家", "致", "树", "炎", "德", "行", "时", "泰", "盛", "雄", "琛", "钧", "冠", "策", "腾", "楠", "榕", "风", "航", "弘"]
+    #${first_name}    Set Variable    ["赵","钱","孙","李","周","吴","郑","王","冯","陈","褚","卫","蒋","沈","韩","杨","朱","秦","尤","许","何","吕","施","张","孔","曹","严","华","金","魏","陶","姜","戚","谢","邹","喻","柏","水","窦","章","云","苏","潘","葛","奚","范","彭","郎","鲁","韦","昌","马","苗","凤","花","方","俞","任","袁","柳","酆","鲍","史","唐","费","廉","岑","薛","雷","贺","倪","汤","滕","殷","罗","毕","郝","邬","安","常","乐","于","时","傅","皮","卞","齐","康","伍","余","元","卜","顾","孟","平","黄","和","穆","萧","尹","姚","邵","堪","汪","祁","毛","禹","狄","米","贝","明","臧","计","伏","成","戴","谈","宋","茅","庞","熊","纪","舒","屈","项","祝","董","梁"]
+    #${second_name}    Set Variable    ["秀","娟","英","华","慧","巧","美","娜","静","淑","惠","珠","翠","雅","芝","玉","萍","红","娥","玲","芬","芳","燕","彩","春","菊","兰","凤","洁","梅","琳","素","云","莲","真","环","雪","荣","爱","畅","霞","香","月","莺","媛","艳","瑞","凡","佳","嘉","琼","勤","珍","贞","莉","桂","娣","叶","璧","璐","娅","琦","晶","妍","茜","秋","珊","莎","锦","黛","青","倩","婷","姣","婉","娴","瑾","颖","露","瑶","怡","婵","雁","蓓","纨","仪","荷","丹","蓉","眉","君","琴","蕊","薇","菁","梦","岚","苑","婕","馨","瑗","琰","韵","融","园","艺","咏","卿","聪","澜","纯","毓","悦","昭","冰","爽","琬","茗","羽","希","宁","欣","飘","育","滢","馥","筠","柔","竹","霭","凝","晓","欢","霄","枫","芸","菲","寒","伊","亚","宜","可","姬","舒","影","荔","枝","思","丽","伟","刚","勇","毅","俊","峰","强","军","平","保","东","文","辉","力","明","永","健","世","广","志","义","兴","良","海","山","仁","波","宁","贵","福","生","龙","元","全","国","胜","学","祥","才","发","武","新","利","清","飞","彬","富","顺","信","子","杰","涛","昌","成","康","星","光","天","达","安","岩","中","茂","进","林","有","坚","和","彪","博","诚","先","敬","震","振","壮","会","思","群","豪","心","邦","承","乐","绍","功","松","善","厚","庆","磊","民","友","裕","河","哲","江","超","浩","亮","政","谦","亨","奇","固","之","轮","翰","朗","伯","宏","言","若","鸣","朋","斌","梁","栋","维","启","克","伦","翔","旭","鹏","泽","晨","辰","士","以","建","家","致","树","炎","德","行","时","泰","盛","雄","琛","钧","冠","策","腾","楠","榕","风","航","弘"]
     #${firstName}    Evaluate    random.choice(${first_name})    random
     #${secondName}    Evaluate    random.choice(${second_name})    random
     #${number}    Evaluate    random.randint(1,2)    random
@@ -337,7 +351,7 @@ Resource          ../../../0-Login/LoginResource.robot
     #${name}    Set Variable    ${name}${secondName}
     #${nickName}    Set Variable    ${firstName}${name}
     #END
-    ${name_data}    Set Variable    ["草泥马"]
+    ${name_data}    Set Variable    ["缘来是你","一枚普通人","向阳","洛天神女","寻那个TA","一片烨","有一个朋友","Tough","陌上花开李公子","冲浪boy","小十七","黑色星期四","Alan","人生若只如初见","Te-amo","王小帅","王先生","牛仔","张先生","伞下铭","骑士","细水长流","就等你了","弱水三千，我只取你一瓢","搬石头砸你的jio","遗落世间的小仙女","阳光正好，微风不燥","故乡的原风景","万里&长城","遥远的旅途2024","禁忌女孩","如果当时...","漫天星河不及你回朦一瞥","雪落下的地方","故事的小黄花","天蝎座的宁静","心之所向","烟火","白色气球","带你去浪漫的土耳其","风居住的城堡","别打了我是酱油","山东在逃挖掘机","餐桌C位","网名不要太长像我这样就好","村里在逃翠花❀","林黛玉醉打蒋门神","萝莉啰嗦","美少女壮士","百变少女猪刚","诺贝尔可爱奖","睡到人间煮饭时","虚天渊","用发际线换对象","龙卷风卷走爱情","死于脚气攻心","发型不乱，一切好办","农夫三拳有点疼","举不动的小公主"]
     ${nickName}    Evaluate    random.choice(${name_data})    random
     FOR    ${miId}    ${client_header}    IN ZIP    ${miId_list}    ${Cheader_list}
         Create Session    dating    ${${dating}.dating域名}    ${client_header}
@@ -387,7 +401,8 @@ Resource          ../../../0-Login/LoginResource.robot
         Create Session    dating    ${${dating}.dating域名}    ${client_header}
         ${reps}    GET On Session    dating    dating-agency-service/user/get/car/purchase/situation
         ${data}    Get From Dictionary    ${reps.json()}    data
-        ${carPurchaseSituationData}    Evaluate    random.choice(${data})    random    #随机获取购车情况
+        #${carPurchaseSituationData}    Evaluate    random.choice(${data})    random    #随机获取购车情况
+        ${carPurchaseSituationData}    Get From List    ${data}    0    #0已购车，1未购车
         ${carPurchaseSituation}    Get From Dictionary    ${carPurchaseSituationData}    desc    #购车情况
         ${carPurchaseSituationCode}    Get From Dictionary    ${carPurchaseSituationData}    value    #购车编码
         Set Global Variable    ${carPurchaseSituation}
@@ -408,7 +423,8 @@ Resource          ../../../0-Login/LoginResource.robot
         Create Session    dating    ${${dating}.dating域名}    ${client_header}
         ${reps}    GET On Session    dating    dating-agency-service/user/get/property/permits
         ${data}    Get From Dictionary    ${reps.json()}    data
-        ${propertyPermitsData}    Evaluate    random.choice(${data})    random    #随机获取购房情况
+        #${propertyPermitsData}    Evaluate    random.choice(${data})    random    #随机获取购房情况
+        ${propertyPermitsData}    Get From List    ${data}    3    #0家人同住，1已购房，2租房，3婚后购房，4单位宿舍
         ${propertyPermits}    Get From Dictionary    ${propertyPermitsData}    desc    #购房情况
         ${propertyPermitsCode}    Get From Dictionary    ${propertyPermitsData}    value    #购房编码
         Set Global Variable    ${propertyPermits}
@@ -478,7 +494,7 @@ region固定省市-广州
     FOR    ${city}    IN    @{city_data}
         ${cityCode}    Get From Dictionary    ${city}    value    #获取市编码
         ${cityName}    Get From Dictionary    ${city}    label    #获取市名称
-        Exit For Loop If    '${cityName}'=='深圳市'
+        Exit For Loop If    '${cityName}'=='广州市'
     END
     ${district_data}    Get From Dictionary    ${city}    children    #广州市列表数据
     log    ${district_data}

1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot

@@ -69,6 +69,10 @@ Resource          ../../../0-Login/LoginResource.robot
     Given 查询婚介征婚人的资料信息
     Then 提交婚介征婚人的职业
 
+提交征婚人是否独生子女
+    Given 查询婚介征婚人的资料信息
+    When 提交婚介征婚人是否独生子女
+
 提交征婚人学历认证
     Given 查询婚介征婚人的资料信息
     When 提交婚介征婚人的学历审核

1-Applet/2-Homepage/MarriageInfo/MateSelection.robot

@@ -60,6 +60,11 @@ Resource          Selection.robot
     When 查询婚介征婚人择偶条件数据
     And 提交婚介征婚人的择偶条件-体型
 
+提交征婚人的择偶条件-是否独生
+    Given 查询婚介用户资料
+    When 查询婚介征婚人择偶条件数据
+    And 提交婚介征婚人的择偶条件-是否独生子女
+
 提交征婚人的择偶条件-职业要求
     Given 查询婚介用户资料
     When 查询婚介征婚人择偶条件数据

1-Applet/2-Homepage/MarriageInfo/Selection.robot

@@ -164,7 +164,8 @@ region
         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
-        ${nationData}    Evaluate    random.choice(${data})    random    #随机获取名族数据
+        #${nationData}    Evaluate    random.choice(${data})    random    #随机获取名族数据
+        ${nationData}    Get From List    ${data}    0
         ${nation}    Get From Dictionary    ${nationData}    cn    #民族名称
         ${nationCode}    Get From Dictionary    ${nationData}    id    #民族编码
         Set Global Variable    ${nation}
@@ -241,7 +242,7 @@ region
 提交${dating}征婚人的择偶条件-是否独生子女
     FOR    ${client_header}    IN    @{Cheader_list}
         Create Session    dating    ${${dating}.dating域名}    ${client_header}
-        ${onlyChild_list}    Create List    1    0
+        ${onlyChild_list}    Create List    -1    1    0
         ${onlyChild}    Evaluate    random.choice(${onlyChild_list})    random
         ${data}    Set Variable    { \ \ \ \ "miId": "${miId}", \ \ \ \ "onlyChild": ${onlyChild} }
         ${reps}    POST On Session    dating    dating-agency-service/user/save/demand/marriage    ${data.encode('utf-8')}

output/report.html

@@ -1629,22 +1629,22 @@ storage = function () {
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[1,0,1766],[[4,5,6,7,[],[1,16,382],[[8,9,10,11,[],[1,16,366],[],[[12,0,0,[],[1,206,176],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,398,1027],[[16,17,18,0,[],[1,398,1027],[[19,20,21,22,[],[1,398,1027],[[23,24,25,26,[],[1,398,1027],[],[[27,0,0,[],[1,441,984],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]],[28,29,30,0,[],[1,1441,325],[[31,32,33,34,[],[1,1441,325],[[35,36,37,0,[],[1,1441,325],[],[[38,0,0,[],[1,1456,310],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[3,3,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,534],[[4,5,6,7,[],[1,16,283],[[8,9,10,11,[],[1,32,266],[],[[12,0,0,[],[1,142,156],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,300,234],[[16,17,18,0,[],[1,302,232],[[19,20,21,22,[],[1,303,231],[[23,24,25,26,[],[1,304,230],[],[[27,0,0,[],[1,326,208],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[2,2,0,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888","*1-Applet","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet","*../1-Applet","*2-Homepage","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage","*../1-Applet/2-Homepage","*MarriageInfo","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo","*../1-Applet/2-Homepage/MarriageInfo","*<p>征婚人资料\x3c/p>","*DataAuthentication","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo\\DataAuthentication.robot","*../1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot","*<p>资料认证\x3c/p>","*提交征婚人学历认证","*2-Web","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web","*../2-Web","*InfoAudit","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web\\InfoAudit","*../2-Web/InfoAudit","*<p>资料审核\x3c/p>","*AuditInfomation","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\2-Web\\InfoAudit\\AuditInfomation.robot","*../2-Web/InfoAudit/AuditInfomation.robot","*审核征婚人提交的资料-相册"]);
+window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888","*1-Applet","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet","*../1-Applet","*2-Homepage","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage","*../1-Applet/2-Homepage","*MarriageInfo","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo","*../1-Applet/2-Homepage/MarriageInfo","*<p>征婚人资料\x3c/p>","*DataAuthentication","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\MarriageInfo\\DataAuthentication.robot","*../1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot","*<p>资料认证\x3c/p>","*添加征婚人联系方式"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:01","fail":0,"label":"All Tests","pass":3,"skip":0}],[],[{"elapsed":"00:00:02","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":3,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.MarriageInfo","name":"MarriageInfo","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.MarriageInfo.DataAuthentication","name":"DataAuthentication","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3","label":"Dating-agency.2-Web","name":"2-Web","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3-s1","label":"Dating-agency.2-Web.InfoAudit","name":"InfoAudit","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s3-s1-s1","label":"Dating-agency.2-Web.InfoAudit.AuditInfomation","name":"AuditInfomation","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:00","fail":0,"label":"All Tests","pass":2,"skip":0}],[],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":2,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.MarriageInfo","name":"MarriageInfo","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.MarriageInfo.DataAuthentication","name":"DataAuthentication","pass":1,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1711525334580;
+window.output["baseMillis"] = 1711605188037;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 1781;
+window.output["generated"] = 550;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;