diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 7e66f08..a424927 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -133,7 +133,23 @@ Library ImageHorizonLibrary
#${datetime} Get Current Date result_format=%Y-%m-%d %H:%M:%S
#${time} Add Time To Date ${datetime} 1 days
#${T} Get Substring ${time} 0 19
- #设置一个数字变量
- ${Id} Set Variable 998286299716784128
- ${IdType} Evaluate type(${Id})
- ${Id} Convert To String ${IdType}
+ #设置一个数字变量,转换为string
+ #${Id} Set Variable 998286299716784128
+ #${IdType} Evaluate type(${Id})
+ #${Id} Convert To String ${IdType}
+ #逻辑计算
+ ${validTime} Evaluate random.randint(0,24) random #随机一位正数,优惠券有效期
+ #${assistNumber} Evaluate random.randrange(0,8,2) random #助力人数
+ ${originalPrice} Evaluate round(random.uniform(0.05,0.1),2) random #随机一位浮点数,原价
+ ${Vip_originalPrice} Evaluate round(random.uniform(0.02,0.08),2) random #VIP原价
+ ${discountAmount} Evaluate round(random.uniform(0,${originalPrice}),2) random #优惠金额
+ ${discountAmount} Set Variable If ${validTime}==0 0 ${discountAmount}
+ ${Vip_discountAmount} Evaluate round(random.uniform(0,${Vip_originalPrice}),2) random #VIP优惠金额
+ ${Vip_discountAmount} Set Variable If ${validTime}==0 0 ${Vip_discountAmount}
+ ${transactionPrice} Evaluate round(random.uniform(0,(${originalPrice}-${discountAmount})),2) random #最低成交价
+ ${Vip_transactionPrice} Evaluate round(random.uniform(0,(${Vip_originalPrice}-${Vip_discountAmount})),2) #会员最低成交价
+ ${assistNumber} Evaluate abs(round((${originalPrice}-${discountAmount}-${transactionPrice})*100,0)) #助力人数
+ ${Vip_assistNumber} Evaluate abs(round((${Vip_originalPrice}-${Vip_discountAmount}-${Vip_transactionPrice})*100,0)) #VIP助力人数
+ #${transactionPrice} Set Variable If ${assistNumber}==0 0 ${transactionPrice}
+ #${Vip_transactionPrice} Set Variable If ${assistNumber}==0 0 ${Vip_transactionPrice}
+ #${average} Evaluate (${originalPrice}-${discountAmount}-${transactionPrice})/${assistNumber} random #平均优惠
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index ed8605a..443de94 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-15675143029
\ No newline at end of file
+19128859944
\ No newline at end of file
diff --git a/2-Web/SiteActivity/SiteActivityResources.robot b/2-Web/SiteActivity/SiteActivityResources.robot
index b4e99d8..b7ec7ca 100644
--- a/2-Web/SiteActivity/SiteActivityResources.robot
+++ b/2-Web/SiteActivity/SiteActivityResources.robot
@@ -99,7 +99,22 @@ Library DatabaseLibrary
${beginTime} Get Substring ${beginTime} 0 19
${endTime} Add Time To Date ${applyStartTime} 5 days #活动结束时间
${endTime} Get Substring ${endTime} 0 19
- ${participationAllocations} Set Variable [{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":1,"genderCode":0,"userType":0,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":0,"userType":1,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":1,"userType":0,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.6,"genderCode":1,"userType":1,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0}] #用户参数配置
+ ${validTime} Evaluate random.randint(0,24) random #随机一位正数,优惠券有效期
+ #${assistNumber} Evaluate random.randrange(0,8,2) random #助力人数
+ ${originalPrice} Evaluate round(random.uniform(0.05,0.1),2) random #随机一位浮点数,原价
+ ${Vip_originalPrice} Evaluate round(random.uniform(0.02,0.08),2) random #VIP原价
+ ${discountAmount} Evaluate round(random.uniform(0,${originalPrice}),2) random #优惠金额
+ ${discountAmount} Set Variable If ${validTime}==0 0 ${discountAmount}
+ ${Vip_discountAmount} Evaluate round(random.uniform(0,${Vip_originalPrice}),2) random #VIP优惠金额
+ ${Vip_discountAmount} Set Variable If ${validTime}==0 0 ${Vip_discountAmount}
+ ${transactionPrice} Evaluate round(random.uniform(0,(${originalPrice}-${discountAmount})),2) random #最低成交价
+ ${Vip_transactionPrice} Evaluate round(random.uniform(0,(${Vip_originalPrice}-${Vip_discountAmount})),2) #会员最低成交价
+ #${transactionPrice} Set Variable If ${assistNumber}==0 0 ${transactionPrice}
+ #${Vip_transactionPrice} Set Variable If ${assistNumber}==0 0 ${Vip_transactionPrice}
+ ${assistNumber} Evaluate abs(round(((${originalPrice}-${discountAmount}-${transactionPrice})*100),0)) #助力人数
+ ${Vip_assistNumber} Evaluate abs(round(((${Vip_originalPrice}-${Vip_discountAmount}-${Vip_transactionPrice})*100),0)) #VIP助力人数
+ ${participationAllocations} Set Variable [{"enable":true,"validTime":${validTime},"assistNumber":${assistNumber},"originalPrice":${originalPrice},"genderCode":0,"userType":0,"discountAmount":${discountAmount},"genderValue":"男","transactionPrice":${transactionPrice},"assistRule":0},{"enable":true,"validTime":${validTime},"assistNumber":${Vip_assistNumber},"originalPrice":${Vip_originalPrice},"genderCode":0,"userType":1,"discountAmount":${Vip_discountAmount},"genderValue":"男","transactionPrice":${Vip_transactionPrice},"assistRule":0},{"enable":true,"validTime":${validTime},"assistNumber":${assistNumber},"originalPrice":${originalPrice},"genderCode":1,"userType":0,"discountAmount":${discountAmount},"genderValue":"女","transactionPrice":${transactionPrice},"assistRule":0},{"enable":true,"validTime":${validTime},"assistNumber":${Vip_assistNumber},"originalPrice":${Vip_originalPrice},"genderCode":1,"userType":1,"discountAmount":${Vip_discountAmount},"genderValue":"女","transactionPrice":${Vip_transactionPrice},"assistRule":0}] #存在助力的用户参数配置
+ #${participationAllocations} Set Variable [{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":1,"genderCode":0,"userType":0,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":0,"userType":1,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":1,"userType":0,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.6,"genderCode":1,"userType":1,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0}] #用户参数配置
${numberWoman} Evaluate random.randint(1,25) random #女士数随机获取~25间的正整数
${numberMan} Evaluate random.randint(1,25) random #男士随机获取1~25间的正整数
${numberParticipants} Evaluate ${numberWoman}+${numberMan} #总人数=女士人数+男士人数
diff --git a/output/log.html b/output/log.html
index 57f5770..ac475b8 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};