Merge branch 'feature/v3.3.10_wky' of qmx/qfw into feature/v3.3.10

core/src/config.json

@@ -1,6 +1,6 @@
 {
     "webServerPort": "501",
-    "redisServers": "enterprise=192.168.3.206:1712,service=192.168.3.206:1712,other=192.168.3.206:1712,sso=192.168.3.206:1712,credit=192.168.3.206:1712,session=192.168.3.206:1712",
+    "redisServers": "enterprise=127.0.0.1:6379,service=127.0.0.1:6379,other=127.0.0.1:6379,sso=127.0.0.1:6379,credit=127.0.0.1:6379,session=127.0.0.1:6379",
     "useRedis": false,
     "mongodbServers": "192.168.3.206:27080",
     "elasticsearch": "http://192.168.3.128:9800",
@@ -71,7 +71,7 @@
 		"port": 1483
 	},
 	"per_del_openid":["o5Z_R0nlDnwkXdFHTQHgWBY0uJZc","o5Z_R0nlDnwkXdFHTQHgWBY0uJZc"],
-	"appPushServiceRpc":"192.168.3.11:5566",
+	"appPushServiceRpc":"192.168.3.149:5566",
     "pcHelper":{
       	"version":"V2.5.1",
       	"rpcPushServer":"127.0.0.1:8082",
@@ -79,7 +79,7 @@
     },
   	"mysql":{
 	    "dbName":   "jianyu",
-	    "address":  "192.168.3.11:3366",
+	    "address":  "192.168.3.149:3306",
 	    "userName": "root",
 	    "passWord": "Topnet123"
   	},

core/src/qfw/manage/menu.go

@@ -133,7 +133,7 @@ func (m *menu) MenuList() error {
 			currentPage, _ := m.GetInteger("currentPage")
 			res := map[string]interface{}{}
 			res["totalRows"] = mongodb.Count("jy_topMenu", nil)
-			data := *mongodb.Find("jy_topMenu", nil, `{"i_sort":1,"l_modifydate":-1,"_id":-1}`, `{"title":1,"i_status":1,"i_sort":1,"l_createdate":1,"l_modifydate":1,"top_menu":1,"bottom_link":1}`, false, (currentPage-1)*size, size)
+			data := *mongodb.Find("jy_topMenu", nil, `{"i_sort":1}`, `{"title":1,"i_status":1,"i_sort":1,"l_createdate":1,"l_modifydate":1,"top_menu":1,"bottom_link":1}`, false, (currentPage-1)*size, size)
 			for _, v := range data {
 				data_c := v["l_createdate"]
 				v["l_createdate"] = util.FormatDateWithObj(&data_c, util.Date_Full_Layout)

core/src/web/templates/manage/menu/add.html

@@ -70,6 +70,9 @@ background-color:#FFFFFF;
                             <div class="col-sm-2">
                                 <input type="checkbox" name="topMenu" value="2"> 行业资讯
                             </div>
+                            <div class="col-sm-2">
+                                <input type="checkbox" name="topMenu" value="3"> 新版首页
+                            </div>
                         </div>
                         <div class="form-group" style="display: flex;align-items: center;">
                             <label  class="col-sm-2 control-label" for="name">底部菜单：</label>
@@ -82,6 +85,9 @@ background-color:#FFFFFF;
                             <div class="col-sm-2">
                                 <input type="checkbox" name="bottomLink" value="2"> 行业资讯
                             </div>
+                            <div class="col-sm-2">
+                                <input type="checkbox" name="bottomLink" value="3"> 新版首页
+                            </div>
                         </div>
                         <div class="form-group" style="display: flex;align-items: center;">
                             <label  class="col-sm-2 control-label" for="name">标签：</label>

core/src/web/templates/manage/menu/list.html

@@ -111,6 +111,10 @@ border-bottom:1px dashed #999999;
                                     showValue.push("行业资讯")
                                     break
                                 }
+                                case 3:{
+                                    showValue.push("新版首页")
+                                    break
+                                }
                             }
                         }
                         return showValue.join(",")
@@ -120,7 +124,7 @@ border-bottom:1px dashed #999999;
                     title: "底部链接"
                     , field: "position",
                     callback: function (ct, cd, val, k, m) {
-                        if (!ct["bottom_link"]||ct["top_menu"].length===0) {
+                        if (!ct["bottom_link"]||ct["bottom_link"].length===0) {
                             return "无"
                         }
                         let showValue = []
@@ -138,6 +142,10 @@ border-bottom:1px dashed #999999;
                                     showValue.push("行业资讯")
                                     break
                                 }
+                                case 3:{
+                                    showValue.push("新版首页")
+                                    break
+                                }
                             }
                         }
                         return showValue.join(",")