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

core/src/qfw/yellowpage/yellowpagemanager.go

@@ -448,7 +448,7 @@ func (yp *Yellowpage) GetRelation() error {
 	var relation map[string]interface{}
 	var flag bool
 	//判断登录状态
-	if yp.GetSession("userType") != nil && util.IntAll(yp.GetSession("userType")) > 0 /*&& util.IntAll(yp.GetSession("identWay")) == 1 */ {
+	if yp.GetSession("userType") != nil && util.IntAll(yp.GetSession("userType")) > 0 && util.IntAll(yp.GetSession("identWay")) == 1 {
 		regNo := yp.GetString("regNo")
 		entName := yp.GetString("entName")
 		if regNo != "" && entName != "" {

core/src/web/staticres/js/entportrait.js

@@ -156,7 +156,6 @@ function b_afterLogin(flag,result){
 	if(typeof(result) != "undefined"){
 		identWayFlag = result.identWay == 1;
 	}
-	identWayFlag = true;//暂时把认证权限放开
 	relationFlag = flag && identWayFlag && !relFlag;
 	if(!$(".ent-tab>li:eq(1)").hasClass("ent-active") && relationFlag){
 		$(".ent-tab>li:eq(1)").addClass("disabled");

weixin/src/qfw/weixin/msgtxtchandler.go

@@ -99,10 +99,14 @@ func MsgTxtHandler(w ResponseWriter, r *Request) {
 		total := dao.GetMyInvitePersons(r.FromUserName)
 		//log.Println(r.FromUserName, total)
 		w.ReplyText(fmt.Sprintf("感谢您，已经成功邀请%d个用户", total))
+	} else if r.Content == "剑鱼" || r.Content == "招标" {
+		w.ReplyNews([]Article{Article{
+			Title:       "四步设置剑鱼招标订阅，只需一分钟",
+			Description: "剑鱼招标订阅简单四步",
+			PicUrl:      "http://cdn.qmx.top:9000/images/swordfish/jianyu_weixin.jpg",
+			Url:         "http://mp.weixin.qq.com/s?__biz=MzA5MTk0MTk5Ng==&mid=406103124&idx=1&sn=c12f1cc34899f0c3b36492885567315a#rd",
+		}})
 	} else {
-		//属于在线咨询，暂时直接中转到微信客服系统
-		//w.Reply2CustomerService()
-		//"小主的吩咐我们已经收到了，请耐心等待或留下您的联系方式（手机号或qq号），企明星客服会在下一个工作日9:00-17:00给小主回复哦！"
 		now := time.Now()
 		if now.Weekday() == 6 || now.Weekday() == 0 || (now.Hour() > 17 || now.Hour() < 9) {
 			dao.SaveWeixinOfflineMessage(r.FromUserName, r.Content, now.Unix())