Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/assets/css/common.css

@@ -40,6 +40,9 @@
 .w200{
     width:200px!important;
 }
+.w150{
+    width:150px!important;
+}
 .el-icon-search{
     cursor: pointer;
 }

src/components/StoreDesign/roleList.vue

@@ -11,7 +11,7 @@
         <div>
           <div class="searchInput">
             <el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入角色名称"
-              v-model="msg.NavIconName" size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()">
+              v-model="msg.RoleName" size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()">
             </el-input>
             <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
               @click="msg.pageIndex=1,getList()"> </span>
@@ -24,9 +24,9 @@
           </el-table-column>
           <el-table-column prop="RoleIntro" label="备注/描述">
           </el-table-column>
-          <el-table-column prop="Creater" label="创建者" width="150">
+          <el-table-column prop="CreateByName" label="创建者" width="150">
           </el-table-column>
-          <el-table-column prop="CreateTime" label="添加日期" width="220">
+          <el-table-column prop="CreateDateStr" label="添加日期" width="220">
           </el-table-column>
           <el-table-column label="操作" width="260">
             <template slot-scope="scope">
@@ -77,6 +77,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 15,
+          RoleName:"",
         },
         total: 0,
         roleIsShowAdd: true,

src/components/sallCenter/templateEdit.vue

@@ -589,13 +589,13 @@
               Id: 'topic',
               isCked: false,
               data: {
-                style: 'normal',
-                count: 1,
-                logo_1: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-1.png',
-                logo_2: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-2.png',
-                icon: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-r.png',
+                style: 'normal',//专题样式
+                count: 1,//显示行数
+                logo_1: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-1.png',//logo(1行)
+                logo_2: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-2.png',//logo(2行)
+                icon: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/icon-topic-r.png',//专题标签
                 list: [],
-                cat_show: false,
+                cat_show: false,//是否显示分类
                 topic_list: []
               }
             }

src/router/index.js

@@ -328,6 +328,12 @@ export default new Router({
           name: 'ProjectClassific',
           component: resolve => require(['@/components/StoreDesign/ProjectClassific'], resolve),
         },
+        //店铺管理 内容管理 专题
+        {
+          path: '/special',
+          name: 'special',
+          component: resolve => require(['@/components/StoreDesign/special'], resolve),
+        },
         //店铺管理 内容管理 视频管理
         {
           path: '/videoManage',