Merge remote-tracking branch 'origin/master'

3 years ago · d4a309656e
2 changed files with 2 additions and 2 deletions
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue
@ -6,7 +6,7 @@
    <!--start 按钮部分开始 :icon="item.icon"-->
    <div>
      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
-        <svg-icon :iconClass="item.icon"/>{{ item.btnLabel }}
+        <svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
      </el-button>
    </div>
    <!--end 按钮部分结束-->
--- a/anrui-scm/anrui-scm-ui/src/components/ButtonBar/index.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/ButtonBar/index.vue
@ -6,7 +6,7 @@
    <!--start 按钮部分开始 :icon="item.icon"-->
    <div>
      <el-button v-for="item in btnList" :key="item.btnKey" :type="item.type" :size="item.size" :disabled="btndisabled" @click="btnHandle(item.btnKey)">
-        <svg-icon :iconClass="item.icon"/>{{ item.btnLabel }}
+        <svg-icon v-if="item.icon" :iconClass="item.icon"/>{{ item.btnLabel }}
      </el-button>
    </div>
    <!--end 按钮部分结束-->