Merge branch 'dev2.10.10' of http://192.168.3.207:10080/qmx/jy into dev2.10.10

src/jfw/front/structedData.go

@@ -53,7 +53,7 @@ func (t *StructedData) VerifyEmail() {
 					"product_type": "历史数据",
 				}, "user_mail", "")
 				//是否是绑定邮箱或者是数据导出邮箱  验证过的邮箱
-				if (emails != nil && util.ObjToString((*emails)["user_mail"]) != "") || (t.GetSession("s_myemail") != nil && email == t.GetSession("s_myemail").(string)) || (t.GetSession("SMVerifySucess") != nil && t.GetSession("SMVerifySucess").(bool)) {
+				if (emails != nil && util.ObjToString((*emails)["user_mail"]) != "") || (t.GetSession("s_myemail") != nil && email == t.GetSession("s_myemail").(string)) || (t.GetSession("SMVerifySucess") != nil && t.GetSession("SMVerifySucess").(bool) && email == t.GetSession("DataSMVerifyEmail")) {
 					status = true
 					msg = "此邮箱已被验证"
 					t.SetSession("SMVerifySucess", true)

src/jfw/modules/app/src/app/front/structedData.go

@@ -51,7 +51,7 @@ func (t *StructedData) VerifyEmail() {
 					"product_type": "历史数据",
 				}, "user_mail", "")
 				//是否是绑定邮箱或者是数据导出邮箱  已验证过的邮箱
-				if (emails != nil && util.ObjToString((*emails)["user_mail"]) != "") || (t.GetSession("s_myemail") != nil && email == t.GetSession("s_myemail").(string)) || (t.GetSession("SMVerifySucess") != nil && t.GetSession("SMVerifySucess").(bool)) {
+				if (emails != nil && util.ObjToString((*emails)["user_mail"]) != "") || (t.GetSession("s_myemail") != nil && email == t.GetSession("s_myemail").(string)) || (t.GetSession("SMVerifySucess") != nil && t.GetSession("SMVerifySucess").(bool) && email == t.GetSession("DataSMVerifyEmail")) {
 					status = true
 					msg = "此邮箱已被验证"
 					t.SetSession("SMVerifySucess", true)