diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 42c26cf..0b7661a 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -6,6 +6,7 @@ Library String
Library Collections
Library OperatingSystem
Library ImageHorizonLibrary
+Resource ../2-Web/Mall/ActivityResource.robot
*** Variables ***
@@ -111,6 +112,10 @@ Library ImageHorizonLibrary
#修改txt文件
#${file_path} Set Variable ${EXECDIR}\\Phone.txt
#Append To File ${file_path} ${phone},888888\n
+ #将'改为"
+ #${ActivityData} Set Variable [{'productId': '975071861488619520', 'productSpecId': '975071861522173952', 'mainCategory': 1, 'subCategory': 101, 'productTitle': '学历认证', 'productDesc': '学历认证产品描述', 'detailDesc': '学历认证详细描述', 'status': 2, 'unitOriginalPrice': 2768.0, 'unitSellingPrice': 2.768, 'productSpecUnit': 102, 'validityPeriodValue': '174', 'freebie': 'true'}, {'productId': '975071862004518912', 'productSpecId': '975071862038073344', 'mainCategory': 2, 'subCategory': 201, 'productTitle': '头像修改', 'productDesc': '头像修改产品描述', 'detailDesc': '头像修改详细描述', 'status': 2, 'unitOriginalPrice': 3639.0, 'unitSellingPrice': 3.639, 'productSpecUnit': 102, 'validityPeriodValue': '131', 'freebie': 'true'}, {'productId': '975071862520418304', 'productSpecId': '975071862553972736', 'mainCategory': 3, 'subCategory': 301, 'productTitle': '解锁更多人数', 'productDesc': '解锁更多人数产品描述', 'detailDesc': '解锁更多人数详细描述', 'status': 2, 'unitOriginalPrice': 3868.0, 'unitSellingPrice': 3.868, 'productSpecUnit': 101, 'validityPeriodValue': '30', 'freebie': 'true'}, {'productId': '975071863040512000', 'productSpecId': '975071863078260736', 'mainCategory': 3, 'subCategory': 302, 'productTitle': '高级搜索', 'productDesc': '高级搜索产品描述', 'detailDesc': '高级搜索详细描述', 'status': 2, 'unitOriginalPrice': 3350.0, 'unitSellingPrice': 3.35, 'productSpecUnit': 102, 'validityPeriodValue': '94', 'freebie': 'true'}, {'productId': '975071863556411392', 'productSpecId': '975071863589965824', 'mainCategory': 4, 'subCategory': 401, 'productTitle': '线下约见面', 'productDesc': '线下约见面产品描述', 'detailDesc': '线下约见面详情描述', 'status': 2, 'unitOriginalPrice': 3792.0, 'unitSellingPrice': 0.01, 'productSpecUnit': 102, 'validityPeriodValue': '250', 'freebie': 'true'}, {'productId': '975071864596598784', 'productSpecId': '975071864630153216', 'mainCategory': 3, 'subCategory': 601, 'productTitle': '会员', 'productDesc': '会员产品描述', 'detailDesc': '会员详情描述', 'status': 2, 'unitOriginalPrice': 3781.0, 'unitSellingPrice': 0.03, 'productSpecUnit': 101, 'validityPeriodValue': '244', 'freebie': 'false'}]
+ 查询婚介平台商品定价列表
+ ${data} Replace String Using Regexp ${activityProductList} ' "
数据库删除用户
Given 读取TXT文件
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index d908fd9..443de94 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-18548157976
\ No newline at end of file
+19128859944
\ No newline at end of file
diff --git a/1-Applet/2-Homepage/Interaction/ILikeitResource.robot b/1-Applet/2-Homepage/Interaction/ILikeitResource.robot
index 36e811e..01c0fde 100644
--- a/1-Applet/2-Homepage/Interaction/ILikeitResource.robot
+++ b/1-Applet/2-Homepage/Interaction/ILikeitResource.robot
@@ -17,6 +17,7 @@ Library DatabaseLibrary
${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #用户性别
${message} Get From Dictionary ${reps.json()} message
Append To List ${miId_list} ${miId}
+ log ${miId_list}
Should Be Equal As Strings ${message} successful
END
Set Global Variable ${nickName}
diff --git a/1-Applet/2-Homepage/Interaction/__init__.robot b/1-Applet/2-Homepage/Interaction/__init__.robot
index e69de29..bd22ac8 100644
--- a/1-Applet/2-Homepage/Interaction/__init__.robot
+++ b/1-Applet/2-Homepage/Interaction/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation 互动
diff --git a/2-Web/Mall/Activity.robot b/2-Web/Mall/Activity.robot
index b69ba36..f52e292 100644
--- a/2-Web/Mall/Activity.robot
+++ b/2-Web/Mall/Activity.robot
@@ -1,5 +1,8 @@
*** Settings ***
-Suite Setup
+Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
Resource ActivityResource.robot
*** Test Cases ***
+创建会员活动
+ Given 查询婚介平台商品定价列表
+ #When 运营创建婚介活动
diff --git a/2-Web/Mall/ActivityResource.robot b/2-Web/Mall/ActivityResource.robot
index 45822bc..dab7e4d 100644
--- a/2-Web/Mall/ActivityResource.robot
+++ b/2-Web/Mall/ActivityResource.robot
@@ -1,10 +1,58 @@
*** Settings ***
Library urllib3
Library String
+Library demjson
Library Collections
+Library HttpLibrary
+Library JSONLibrary
Library RequestsLibrary
Library DatabaseLibrary
+Library HttpLibrary.HTTP
*** Keywords ***
+查询${dating}平台商品定价列表
+ #查询商品列表
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${reps} GET On Session dating dating-agency-mall/user/page/product/by/operator params=pageSize=10&pageNum=1
+ ${records} Get From Dictionary ${reps.json()['data']} records #获取商品列表数据
+ Set Global Variable ${records}
+ END
+ #获取指定下标数据
+ ${activityProductList} Create List
+ ${indexs} Create List 0 1 2 3 4 6
+ FOR ${index} IN @{indexs}
+ ${productData} Set Variable ${records[${index}]}
+ ${subCategory} Get From Dictionary ${productData} subCategory
+ ${Data} Add Object To Json ${productData} $.freebie true #将freebie:true塞到商品json中
+ #${Data} Evaluate demjson.encode(${Data},encoding='utf-8').decode() demjson
+ Set Global Variable ${Data}
+ Run Keyword If ${subCategory}==601 更新数据
+ ... ELSE log ${Data}
+ Append To List ${activityProductList} ${Data}
+ log ${activityProductList}
+ Set Global Variable ${activityProductList}
+ END
+ #将'转换为"
+ ${ActivityDataList} Create List
+ FOR ${data} IN @{activityProductList}
+ ${data} Evaluate demjson.encode(${data},encoding='utf-8').decode() demjson
+ Append To List ${ActivityDataList} ${data}
+ log ${ActivityDataList}
+ END
+ ${ActivityDataList} Evaluate str(${ActivityDataList}).replace("[","").replace("]","").split(",")
+ log ${ActivityDataList}
+ Set Global Variable ${ActivityDataList}
+
+更新数据
+ ${Data} Update Value To Json ${Data} $.freebie false
+ Set Global Variable ${Data}
+
运营创建${dating}活动
#创建活动
+ FOR ${admin_header} IN @{Aheader_list}
+ Create Session dating ${${dating}.dating域名} ${admin_header}
+ ${data} Set Variable { \ \ \ \ "activityName":"测试活动", \ \ \ \ "startTime":"2024-04-11 00:00:00", \ \ \ \ "endTime":"2024-04-11 23:59:59", \ \ \ \ "remark":"创建测试活动2024-04-09", \ \ \ \ "activityProductList":${ActivityDataList} }
+ log ${data}
+ ${reps} POST On Session dating dating-agency-mall/user/save/activity
+ END
diff --git a/output/log.html b/output/log.html
index 27f412d..07b6ec1 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};