微信撤回

src/jfw/modules/weixin/src/wx/wx.go

@@ -360,11 +360,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		newUser["i_appid"] = int(2)
 		newUser["i_ispush"] = 1
 		newUser["s_m_openid"] = u.OpenId
-		var unionId = u.UnionId
-		if u.UnionId == u.OpenId {
-			unionId = "un_" + u.UnionId
-		}
-		newUser["s_unionid"] = unionId
+		newUser["s_unionid"] = u.UnionId
 		newUser["s_unique"] = "wx_" + u.UnionId
 		newUser["l_registedate"] = u.SubscribeTime
 		newUser["s_nickname"] = u.Nickname
@@ -693,7 +689,7 @@ func Subscribe(w ResponseWriter, r *Request) {
 					isAutoRepl = true
 				}
 			}
-		} else if pccodepre == "13" || pccodepre == "130" { //18pc关注项目=13  pc百度爬虫快照页=130
+		} else if pccodepre == "13" { //18pc关注项目=13
 			param := new(jrpc.FollowData)
 			param.UserId = FindUserId(openid) //查询userid
 			param.Server = fmt.Sprint(config.Sysconfig["webrpcport"])
@@ -1085,7 +1081,7 @@ func ScanHandler(w ResponseWriter, r *Request) {
 			}
 		} else {
 			userId := util.ObjToString(BsonIdToSId((*m)["_id"]))
-			if pccodepre == "13" || pccodepre == "130" { //13pc关注项目 130百度爬虫快照页关注项目
+			if pccodepre == "13" { //103pc关注项目
 				param := new(jrpc.FollowData)
 				param.UserId = userId
 				param.Server = fmt.Sprint(config.Sysconfig["webrpcport"])

src/web/staticres/js/login.js

@@ -225,7 +225,7 @@ var getNewShareId = function(num,isFirst){
 						}
 					}
 					break;
-				case "13","130"://快照页
+				case "13"://快照页
 					$("#layerImg").attr("src","/front/share/"+pageshareid);
 					$("#wxCode").attr("src","/front/share/"+kopshareid);
 					//生成二维码