活动管理优化

platform-admin/src/main/resources/com/platform/dao/ActivityDao.xml

@@ -66,7 +66,7 @@
                 order by ${sidx} ${order}
             </when>
 			<otherwise>
-                order by id desc
+                order by status desc,create_time desc
 			</otherwise>
         </choose>
 		<if test="offset != null and limit != null">

platform-admin/src/main/webapp/js/sys/tbcfclassification.js

@@ -5,7 +5,7 @@ $(function () {
             {label: 'id', name: 'id', index: 'id', key: true, hidden: true},
             /*{label: '一级分类ID', name: 'goodtypeId', index: 'goodtype_id', width: 80},*/
             {label: '标题', name: 'classTitle', index: 'class_title', width: 80},
-            {label: '类型', name: 'type', index: 'type', width: 80 , formatter: typeFormat},
+            {label: '类型', name: 'type', index: 'type', width: 80 , formatter: typeFormat2},
             {label: '排序', name: 'sort', index: 'sort', width: 80},
             {label: '图片', name: 'picture', index: 'picture', width: 80, formatter: imageFormat},
             {label: '是否展示', name: 'isShow', index: 'is_show', width: 80, formatter: validFormat},