Merge branch 'feature/3-2迭代' into dev

* feature/3-2迭代:
  权限配置

src/views/activity/holiday-manage.vue

@@ -9,8 +9,8 @@
         </el-select>
       </el-row>
       <el-row type="flex" align="middle">
-        <el-button @click="categoryManage">分类管理</el-button>
-        <el-button type="primary" @click="addHoliday()">新增节日</el-button>
+        <el-button @click="categoryManage" v-if="$getButtonLimit($buttonCode.HolidayCategoryManage)" :limit-code='$buttonCode.HolidayCategoryManage'>分类管理</el-button>
+        <el-button type="primary" @click="addHoliday()" v-if="$getButtonLimit($buttonCode.AddHoliday)" :limit-code='$buttonCode.AddHoliday'>新增节日</el-button>
       </el-row>
     </el-row>
 
@@ -28,8 +28,8 @@
       <el-table-column label="操作" min-width="110px">
         <template slot-scope="{ row }">
           <el-row type="flex">
-            <el-button type="text" @click="edit(row)">编辑</el-button>
-            <el-button type="text" @click="del(row)">删除</el-button>
+            <el-button type="text" @click="edit(row)" v-if="$getButtonLimit($buttonCode.EditHoliday)" :limit-code='$buttonCode.EditHoliday'>编辑</el-button>
+            <el-button type="text" @click="del(row)" v-if="$getButtonLimit($buttonCode.DelHoliday)" :limit-code='$buttonCode.DelHoliday'>删除</el-button>
           </el-row>
         </template>
       </el-table-column>