Merge branch 'release_1.3_20160104' of 192.168.3.17:zhanghongbo/qfw into release_1.3_20160104

core/src/qfw/member/membermanager.go

@@ -85,6 +85,7 @@ func autoAuth(uid, uname, s_avatar, entid, promotion_id string) {
 		if len(s_action) == 2 { //已经认证过
 			return
 		}
+		fmt.Println("222222222222222222222", s_action)
 		entName := ObjToString((*ent)["EntName"])
 		email := ObjToString((*ent)["Nb_email"])
 		t := time.Now().Local().Unix()
@@ -146,7 +147,7 @@ func autoAuth(uid, uname, s_avatar, entid, promotion_id string) {
 					})
 				}, func(e interface{}) {})
 
-				Update("enterprise", `{"_id":"`+entid+`"}`, `{'$set':{'s_action':'01','s_avatar':'`+s_avatar+`'}}`, false, false)
+				Update("enterprise", `{"_id":"`+entid+`"}`, `{'$set':{'s_action':'01','s_avatar':'`+s_avatar+`','s_submitid':'`+uid+`'}}`, false, false)
 				elastic.UpdateEntDoc(entid)
 				redis.Del("enterprise", "enterpriseInfo_"+entid, "enterpriseInfo_user_"+entid)
 			}()
@@ -792,7 +793,7 @@ func (m *Member) Setpwd() error {
 
 //验证输入的邮箱是否是没认证的企业邮箱
 func (m *Member) CheckConMail() error {
-	userId := m.GetSession("userId").(string)
+	//userId := m.GetSession("userId").(string)
 	var smail = m.GetString("checkmail")
 	var EntName = ""
 	var ac = ""
@@ -800,14 +801,16 @@ func (m *Member) CheckConMail() error {
 	var uname = ""
 	var s_avatar = ""
 	pk := "1"
-	r := *FindOne("enterprise", M{"s_submitid": userId, "Nb_email": smail})
-	ac = r["s_action"].(string)
-	if len(r) > 0 && ac == "" {
-		EntName = r["EntName"].(string)
-		uname = m.GetSession("loginName").(string)
-		s_avatar = r["s_avatar"].(string)
-		pk = "2"
-		id = strings.Split(fmt.Sprintf("%s", r["_id"]), `"`)[1]
+	r := *FindOne("enterprise", M{"Nb_email": smail})
+	if len(r) > 0 {
+		ac = ObjToString(r["s_action"])
+		if ac == "" {
+			EntName = r["EntName"].(string)
+			uname = m.GetSession("loginName").(string)
+			s_avatar = ObjToString(r["s_avatar"])
+			pk = "2"
+			id = strings.Split(fmt.Sprintf("%s", r["_id"]), `"`)[1]
+		}
 	}
 	m.ServeJson(map[string]interface{}{
 		"pk":       pk,
@@ -873,7 +876,7 @@ func (m *Member) Bindmail() error {
 					//邮箱绑定认证
 					if contype == "1" {
 						r := *FindById("enterprise", entid, nil)
-						ac := r["s_action"].(string)
+						ac := ObjToString(r["s_action"])
 						if len(r) > 0 && ac == "" {
 							autoAuth(usid, uname, avatar, entid, proid)
 							//发系统消息

core/src/web/templates/member/accountset/bindmail.html

@@ -141,7 +141,7 @@ function ocheckMail(){
 		if (data.pk == "2")	{
 			$("#tishi1").removeClass("hide");
 			$("#tishi2").removeClass("hide");
-			$("#tishinr").html('“您绑定的是'+data.EntName+'公司在工商年报时登记的邮箱，您是否需要系统自动帮您完成企业实名认证，而无需上传营业执照？”');
+			$("#tishinr").html('您绑定的是企业 “'+data.EntName+'” 在工商年报时登记的邮箱，您是否需要系统自动帮您完成企业实名认证，而无需上传营业执照？');
 			var entid = data.id;
 			$("#entid").val(entid);
 			$("#uname").val(data.uname);