diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index f7bd761..9ea248e 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-13168550964
\ No newline at end of file
+13000000035
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index 08565a9..2543601 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -30,6 +30,7 @@ Library OperatingSystem
... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始
... ELSE 查询婚介征婚人的资料信息
END
+ Sleep 5
检查首次填写${dating}资料序号
#检查首次填写序号
@@ -94,8 +95,9 @@ Library OperatingSystem
#选择性别
Log To Console ${CURDIR} #打印当前路径
Disable Warnings
- ${sex-code} Create List 0 1
- ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
+ #${sex-code} Create List 0 1
+ #${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
+ ${SexCode} Evaluate 1 #固定性别
${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
Create Session dating ${${dating}.dating域名} ${client_header}
${Data} Update Value To Json ${Data} $.genderCode ${SexCode}
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index 52910dd..cedb9ec 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -14,12 +14,14 @@ Library DatabaseLibrary
${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 ${miId_list}
Set Global Variable ${nickName}
+ Set Global Variable ${miId_list}
+ Set Global Variable ${genderCode}
查询${dating}征婚人资料
#通过miId查询征婚人资料
@@ -31,12 +33,18 @@ Library DatabaseLibrary
Set Global Variable ${height}
提交${dating}征婚人头像审核
- ${imgUrl} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/afeb83bebb3e4c7214fd3bb8f2b10cd7.png"] #头像图片
- #${imgUrl} Set Variable 111
+ #${imgUrl} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/f539fda976303cd09b075b23fb971a78.jpg"] #头像图片
+ #男士图片
+ ${manImgList} Create List ["https://dating-agency-test.oss-accelerate.aliyuncs.com/6b1f0e91c84f97fe76737a9bc9605222.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/13430ed896298bcd0ac46f09bf29ece7.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/59004ca9250de9fec6fbb95e6eed6760.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/c5644ac57b91fad169833894a8409fb8.png"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/44600b8d7a00616fbfef5f4199801aa3.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/3e416c672e4a0240d86bd233afc12fb7.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/8048e38b0d4a73f7d06fc1b17995ac6b.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/ed369df1698455041d3caa43e358a998.png"]
+ ${manImgUrl} Evaluate random.choice(${manImgList}) random
+ #女士图片
+ ${womanImgList} Create List ["https://dating-agency-test.oss-accelerate.aliyuncs.com/45d5a86455d48686b6677c6e08c38294.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/f2c441ab2e2bc63afdb0182c3e9365a3.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/520d2089fac428d3b84f9d25db93dd31.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/302803c1647500313cc114de59af053e.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/c97da67055186388335cfb73af718948.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/27491660b76a7ded1f0cad84d0fa136f.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/d586c7311f15bbca574bb10ee2590941.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/73a607e091bfa2696e5c76ea282e3fad.jpg"] ["https://dating-agency-test.oss-accelerate.aliyuncs.com/b58d3b649f9d358fbbe896f5ec4ffc7b.jpg"]
+ ${womanImgUrl} Evaluate random.choice(${womanImgList}) random
+ #${imgUrl} Set Variable 111 #敏感图
${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} }
+ ${data} Set Variable If ${genderCode}==1 { \ \ \ \ "authenticationCode": ${authenticationCode}, \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${womanImgUrl} } { \ \ \ \ "authenticationCode": ${authenticationCode}, \ \ \ \ "miId": "${miId}", \ \ \ \ "imgUrl": ${manImgUrl} }
${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
@@ -74,12 +82,16 @@ Library DatabaseLibrary
提交${dating}征婚人身份证审核
#提交征婚人身份证审核
- ${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400
- ${value} Evaluate random.choice(${value_list}) random
+ #${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400
+ #女生身份证
+ ${woman_value} Set Variable 赖勇兰,441481199509213863
+ #男生身份证
+ ${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X
+ ${man_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}" }
+ ${data} Set Variable If ${genderCode}==1 { \ \ \ \ "authenticationCode":"${code}", \ \ \ \ "miId":"${miId}", \ \ \ \ "value":"${woman_value}" } { \ \ \ \ "authenticationCode":"${code}", \ \ \ \ "miId":"${miId}", \ \ \ \ "value":"${man_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
diff --git a/1-Applet/3-Customer/EquityResource.robot b/1-Applet/3-Customer/EquityResource.robot
index a45db36..3957ba3 100644
--- a/1-Applet/3-Customer/EquityResource.robot
+++ b/1-Applet/3-Customer/EquityResource.robot
@@ -33,8 +33,9 @@ Library DatabaseLibrary
Set Global Variable ${orderId}
Set Global Variable ${paymentOrderId}
END
- #支付订单
+ #创建支付订单
FOR ${client_header} IN @{Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${payData} Set Variable {"paymentOrderId":"${paymentOrderId}","paymentMethod":1}
${reps} POST On Session dating dating-agency-mall/user/pre-pay/third-party ${payData.encode('utf-8')}
+ END
diff --git a/output/log.html b/output/log.html
index 7909018..3d450d4 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};