xiugai

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

@@ -285,7 +285,20 @@ func (l *Login) WxLogin() {
 			log.Println("微信注册签名错误！")
 			return -2
 		}
-		query := bson.M{"s_m_openid": u.OpenId, "i_appid": 2}
+		query := bson.M{"s_unionid": u.UnionId, "i_appid": 2}
+		user, ok := mongodb.FindOne("user", query)
+		if !ok {
+			return 0
+		}
+		rid := l.GetString("rid")
+		if user != nil && len(*user) > 0 {
+			//登录
+			returnSign = afterLogin(*user, query, l.Session(), u.OpenId, rid, qutil.IntAll((*user)["i_type"]))
+			return 1
+		} else {
+			return -3
+		}
+		/*query := bson.M{"s_m_openid": u.OpenId, "i_appid": 2}
 		user, ok := mongodb.FindOne("user", query)
 		if !ok {
 			return 0
@@ -325,7 +338,7 @@ func (l *Login) WxLogin() {
 				returnSign = afterLogin(newUser, nil, l.Session(), u.OpenId, rid, 2)
 				return 1
 			}
-		}
+		}*/
 		return 0
 	}()
 	//返回

src/jfw/modules/app/src/web/staticres/jyapp/css/wxkeyset.css

@@ -10,7 +10,7 @@ img{
 	border-radius: 2px;
 }
 .header{
-	background-color: #2CB7CA;
+	background-color: #F5F4FA;
 	line-height: 50px;
 	height: 50px;
 	padding: 0px 15px;

src/jfw/modules/app/src/web/templates/me/login.html

@@ -125,6 +125,8 @@
 				success: function(r){
 					if(r.status == 1){
 						loginSuccess(r.sign);
+					}else if(r.status == -3){
+						EasyAlert.show("请先关注“剑鱼招标订阅”公众号",undefined,2000);
 					}else{
 						EasyAlert.show("登录失败");
 					}

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -9,7 +9,7 @@
 {{include "/common/js.html"}}
 <style type="text/css">
 .app-layout-header{
-	background-color: #2BB6C9;
+	background-color: #2CB7CA;
 	color: #FFFFFF;
 }
 </style>