Merge branch 'feature-dgy-首页改版' into feature-dgy-后台测试

# Conflicts:
#	wwwroot/layuiadmin/modules/Advertisment_Admin.js

wwwroot/layuiadmin/modules/Advertisment_Admin.js

@@ -65,13 +65,11 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            , { field: 'StatusName', width: 150, title: '状态', sort: true }
-            , { field: 'Title', title: '标题', sort: true }
-            , { field: 'ColId', title: '分类', sort: true }
-            , { field: 'PicPath', title: '图片', width: 60, templet: '#imgTpl', unresize: true }
-
+            , { field: 'Title', width: 220, title: '标题', sort: true }
+            , { field: 'ColId', width: 220, title: '分类', sort: true }
+            , { field: 'PicPath', width: 220, title: '图片', templet: '#imgTpl', unresize: true }
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
-            , { title: '操作', width: 220, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { title: '操作', width: 420, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , page: true
         , limit: 30