Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

src/views/setting/sample/index.vue

@@ -327,18 +327,24 @@
         label-width="100px"
       >
         <el-form-item label="商标:" prop="trademark">
-          <image-preview
-            :src="clickNameForm.trademark"
-            width="150px"
-            height="150px"
-          ></image-preview>
+          <div v-if="clickNameForm.trademark">
+            <image-preview
+              :src="clickNameForm.trademark"
+              width="150px"
+              height="150px"
+            ></image-preview>
+          </div>
+          <div v-else>暂无数据</div>
         </el-form-item>
         <el-form-item label="样品照片:" prop="samplePhotos">
-          <image-preview
-            :src="clickNameForm.samplePhotos"
-            width="150px"
-            height="150px"
-          ></image-preview>
+          <div v-if="clickNameForm.samplePhotos">
+            <image-preview
+              :src="clickNameForm.samplePhotos"
+              width="150px"
+              height="150px"
+            ></image-preview>
+          </div>
+          <div v-else>暂无数据</div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">