Merge branch 'dev/v4.9.27_fu' of qmx/jy into feature/v4.9.27

src/jfw/front/index.go

@@ -304,7 +304,7 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 	if docClassNames != nil && len(*docClassNames) > 0 {
 		docSql := `SELECT d.id,d.docName,d.docFileSuffix,d.docTags,d.previewImgId,d.productType,d.source FROM jydocs.doc d LEFT JOIN jydocs.doc_statistics ds ON d.id=ds.docId WHERE FIND_IN_SET(?,d.docTags) ORDER BY ds.viewTimes DESC LIMIT 10 `
 		for _, dv := range *docClassNames {
-			if len(docClass) > 8 {
+			if len(docClass) > 7 {
 				break
 			}
 			name := common.InterfaceToStr(dv["name"])

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

@@ -37,5 +37,5 @@ func (w *WX) Index(pageLabel string) error {
 		return w.Redirect("/jyapp/jylab/mainSearch?partner=" + pageLabel)
 	}
 	//已登录
-	return w.Redirect("/jy_mobile/tabbar/home?from=wx")
+	return w.Redirect("/jy_mobile/tabbar/home?partner=" + pageLabel)
 }