Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/qfw/member/credit/creditdetail.go

@@ -202,7 +202,7 @@ func (c *credit) YaoqingByEmail() error {
 				//获取二维码随机数
 				userInfo := c.GetSession("userInfo").(*map[string]interface{})
 				openid := (*userInfo)["s_m_openid"].(string)
-				wxnum := cu.FindMyShareId(openid)
+				wxnum := cu.FindMyShareId("email", openid)
 				cu.SendMail("invitebyemail", s_email, nickName+":邀请你加入企明星", nickName, wxnum)
 				//邀请记录
 				yqmap := map[string]interface{}{}
@@ -210,7 +210,7 @@ func (c *credit) YaoqingByEmail() error {
 				yqmap["s_toemail"] = s_email
 				yqmap["i_wxnum"] = wxnum
 				yqmap["l_date"] = time.Now().Unix()
-				mongodb.Save("invite_log", yqmap)
+				mongodb.Save("invitebyemail_log", yqmap)
 				flag = true
 			}
 		}

core/src/web/staticres/css/dev-qfw.css

@@ -1511,9 +1511,9 @@ a{
 	color: #D03102;
 	margin-right: 5px;
 }
-
-style="color:#D03102;margin-right:5px;"
-
+.d-bg-green{
+	
+}
 .a-servicedetail #no_reg{ 
 	margin-bottom:100px; 
 	margin-top:50px;