diff --git a/model/category.go b/model/category.go index b282973..fb4a7c4 100644 --- a/model/category.go +++ b/model/category.go @@ -137,7 +137,7 @@ func (m *DBModel) GetCategoryList(opt *OptionGetCategoryList) (categoryList []Ca db = db.Offset((opt.Page - 1) * opt.Size).Limit(opt.Size) - err = db.Order("parent_id asc, sort desc, id asc").Find(&categoryList).Error + err = db.Order("parent_id asc, sort desc, title asc").Find(&categoryList).Error if err != nil && err != gorm.ErrRecordNotFound { m.logger.Error("GetCategoryList", zap.Error(err)) } diff --git a/web/pages/index.vue b/web/pages/index.vue index 8d85a55..dc9effa 100644 --- a/web/pages/index.vue +++ b/web/pages/index.vue @@ -521,7 +521,13 @@ export default { padding-bottom: 0; } .el-card__body { - padding: 15px 0; + padding: 15px 0 20px; + max-height: 77px; + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + text-overflow: ellipsis; } a { display: inline-block;