Merge branch 'develop' into feature/app_dev

* develop:
  增加搜索关键字推荐

go/gopath/src/fohow.com/apps/models/product_model/commend_words.go

@@ -34,7 +34,7 @@ func GetCommendWordsList(perSize int64, useCache bool) (items []*CommendWord) {
 	}
 
 	o := orm.NewOrm()
-	_, err := o.QueryTable(new(CommendWord)).Limit(perSize).OrderBy("-sort").All(&items)
+	_, err := o.QueryTable(new(CommendWord)).Filter("state", true).Limit(perSize).OrderBy("-sort").All(&items)
 	if err != nil {
 		beego.BeeLogger.Debug("GetCommendWordsList err=%s", err)
 	}