Merge branch 'dev-coop-phase2.3-1012' into 'release'

Dev coop phase2.3 1012



See merge request !109

src/router/router.js

@@ -24,6 +24,7 @@ const exportDownload = r => require.ensure([], () => r(require('../views/learnin
 
 const itemShield = r => require.ensure([], () => r(require('../views/education/item-shield.vue')), 'item-shield')
 const entryManager = r => require.ensure([], () => r(require('../views/education/entry-manager.vue')), 'entry-manager')
+const editEntry = r => require.ensure([], () => r(require('../views/education/edit-entry.vue')), 'edit-entry')
 
 export default [{
     path: '/',
@@ -92,6 +93,10 @@ export default [{
             path: '/entry-manager',
             component: entryManager,
         },
+        {
+            path: '/edit-entry',
+            component: editEntry,
+        },
       {
         path: '/msg-push',
         component: msgPush,

src/views/education/entry-manager.vue

@@ -9,10 +9,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="2"></el-col>
-        <el-col :span="2">
+        <el-col :span="12">
           <el-button type="primary" size="small">查询</el-button>
         </el-col>
-        <el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
+        <el-col :span="4" style="padding:0;text-align:right;padding-right:10px;">
           <el-button type="primary" size="small">新建入口</el-button>
         </el-col>
       </el-form>
@@ -27,9 +27,12 @@
         <el-table-column fixed="right" label="状态" align="center">
           <template slot-scope="scope">{{ scope.row.status | shieldStatus }}</template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="150" align="center">
+        <el-table-column fixed="right" label="操作" width="350" align="center">
           <template slot-scope="scope">
-            <el-button type="text" size="small">编辑</el-button>
+            <el-button type="primary" size="small">编辑</el-button>
+            <el-button type="primary" size="small">上架</el-button>
+            <el-button type="primary" size="small">下架</el-button>
+            <el-button type="primary" size="small">删除</el-button>
           </template>
         </el-table-column>
       </el-table>