Merge branch 'master' into 2.5dev

2020-01-07 13:09:38 +08:00
parent ab7c23f383 3e500eed7d
commit c13ed6248b
17 changed files with 27 additions and 19 deletions
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -89,7 +89,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
      </div>
    </el-dialog>
    <!--表格渲染-->
@@ -98,7 +98,7 @@
      <el-table-column :show-overflow-tooltip="true" label="菜单名称" width="125px" prop="name" />
      <el-table-column prop="icon" label="图标" align="center" width="60px">
        <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
+          <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
        </template>
      </el-table-column>
      <el-table-column prop="sort" align="center" label="排序">