cms前端参数修复

app/model/admin/sys_login_log/sys_login_log.go

@@ -24,7 +24,7 @@ type SelectPageReq struct {
 func LoginLogListByPage(req *SelectPageReq) (total, page int, list []*Entity, err error) {
 	model := Model
 	page = req.PageNum
-	order := "login_time DESC"
+	order := "info_id DESC"
 
 	if req.LoginName != "" {
 		model = model.Where("login_name like ?", "%"+req.LoginName+"%")

app/model/admin/sys_oper_log/sys_oper_log.go

@@ -75,7 +75,7 @@ func Add(user *user.Entity, menu *auth_rule.Entity, url *url.URL,
 //操作日志列表
 func ListByPage(req *SelectPageReq) (total, page int, list []*Entity, err error) {
 	model := Model
-	order := "oper_time DESC"
+	order := "oper_id DESC"
 	if req != nil {
 		if req.OperName != "" {
 			model = model.Where("oper_name like ?", "%"+req.OperName+"%")

library/response/home/response.go

@@ -40,12 +40,14 @@ func Response(r *ghttp.Request, tpl string, params ...gview.Params) error {
 		},
 		//设置文章参数
 		"SetNewsParams": func(params g.Map, key string, value interface{}) g.Map {
+			data := g.Map{}
 			if params != nil {
-				params[key] = value
-			} else {
-				params = g.Map{key: value}
+				for k, v := range params {
+					data[k] = v
 				}
-			return params
+			}
+			data[key] = value
+			return data
 		},
 		//获取文章列表
 		"GetNewsList": func(cateId int, pageSize int, attr ...*cms_news.ReqListSearchParams) []*cms_news.NewsList {

template/cms/index.html

@@ -47,10 +47,17 @@
                     <div class="swiper-wrapper">
                         ${range $index,$article := $listSlide}
                         <div class="swiper-slide">
+                            ${if eq $article.IsJump 1}
+                            <a href="${$article.JumpUrl}" target="_blank">
+                                <img src="${$.domain}${$article.Thumbnail}">
+                                <h3 class="slide-title">${$article.NewsTitle}</h3>
+                            </a>
+                            ${else}
                             <a href="${$.domain}cms/show/${$article.CateList | getArticleCateId}/${$article.Id}" target="_blank">
                                 <img src="${$.domain}${$article.Thumbnail}">
                                 <h3 class="slide-title">${$article.NewsTitle}</h3>
                             </a>
+                            ${end}
                         </div>
                         ${end}
                     </div>