Merge branch 'greenUrgent' into allTestUrgent

src/HManagement/siteManage/securityConfig/components/basicSet/index.vue

@@ -32,9 +32,10 @@
           </template>
           <template slot="imgSrc">
             <el-image
+                v-if="watermarkImage.length !== 0"
                 style="width: 40px; height: 40px"
-                :src="watermarkImage.length === 0?require('../../../../../assets/icons/login_type_2.png'):watermarkImage.image"
-                :preview-src-list="watermarkImage.length === 0?[require('../../../../../assets/icons/login_type_2.png')]:[watermarkImage.image]">
+                :src="watermarkImage.image"
+                :preview-src-list="[watermarkImage.image]">
             </el-image>
           </template>
           <template slot="setContent">
@@ -50,9 +51,10 @@
           </template>
           <template slot="imgSrc">
             <el-image
+                v-if="productImage.length !== 0"
                 style="width: 40px; height: 40px"
-                :src="productImage.length === 0?require('../../../../../assets/icons/login_type_2.png'):productImage.image"
-                :preview-src-list="productImage.length === 0?[require('../../../../../assets/icons/login_type_2.png')]:[productImage.image]">
+                :src="productImage.image"
+                :preview-src-list="[productImage.image]">
             </el-image>
           </template>
           <template slot="setContent">