From 9dc6093b5a8530d288e6d77aef52f22e7f70f988 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 29 Oct 2020 17:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=B1=BB=E5=9E=8B=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/modulecategory-add-or-update.vue        | 14 ++++----------
 src/views/modules/custom/modulecategory.vue        |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/custom/modulecategory-add-or-update.vue b/src/views/modules/custom/modulecategory-add-or-update.vue
index 0c21a7a..1139085 100644
--- a/src/views/modules/custom/modulecategory-add-or-update.vue
+++ b/src/views/modules/custom/modulecategory-add-or-update.vue
@@ -7,7 +7,7 @@
       <el-form-item prop="categoryCode" label="模块类别编码">
         <el-input v-model="dataForm.categoryCode" placeholder="模块类别编码"></el-input>
       </el-form-item>
-      <el-form-item label="模块样式" prop="moduleStyle">
+      <el-form-item label="模块样式">
         <el-input v-model="dataForm.moduleStyle"  v-show="false"></el-input>
         <el-button type="primary" @click="openModuleStyleSelect">点击选择模块样式</el-button>
         {{moduleStyleName}}
@@ -29,7 +29,7 @@
         </el-input>
       </el-form-item>
       <el-form-item label="模块类别图片"
-                    v-loading="loading" prop="imgUrl">
+                    v-loading="loading">
         <el-upload class="avatar-uploader"
                    :action="uploadUrl"
                    :show-file-list="false"
@@ -59,7 +59,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="是否有banner" prop="bannerFlag">
-        <el-select v-model="dataForm.bannerFlag" placeholder="请选择是否启用">
+        <el-select v-model="dataForm.bannerFlag" placeholder="请选择是否有banner">
           <el-option
               v-for="item in isEnableFlag"
               :key="item.value"
@@ -144,15 +144,9 @@ export default {
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ],
-        imgUrl: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         enableFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        moduleStyle: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         bannerFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
@@ -163,6 +157,7 @@ export default {
     init () {
       this.visible = true
       this.dataForm.imgUrl = ''
+      this.moduleStyleName = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         this.getcategoryList().then(() => {
@@ -174,7 +169,6 @@ export default {
           } else {
             this.dataForm.categoryCode = ''
             this.dataForm.categoryType = ''
-            this.moduleStyleName = ''
           }
         })
       })
diff --git a/src/views/modules/custom/modulecategory.vue b/src/views/modules/custom/modulecategory.vue
index bd47e42..232c4f3 100644
--- a/src/views/modules/custom/modulecategory.vue
+++ b/src/views/modules/custom/modulecategory.vue
@@ -14,7 +14,7 @@
             <el-popover placement="right"
                         title=""
                         trigger="click"
-                        class="big_image">
+                        class="big_image"  v-show="scope.row.imgUrl !== '' && scope.row.imgUrl !== undefined">
               <el-image slot="reference"
                         style="width: 100px;height: 100px"
                         :src="scope.row.imgUrl"