Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/components/ImageUpload/index.vue

@@ -207,9 +207,9 @@ export default {
     },
     // 预览
     handlePictureCardPreview(file) {
-      // this.dialogImageUrl = file.url;
-      // this.dialogVisible = true;
-      window.open(file.url)
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+      // window.open(file.url)
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {

src/views/ecw/customer/index.vue

@@ -66,7 +66,7 @@
     </el-form>
 
     <!-- 操作工具栏 -->
-    <div style="color: red;margin-bottom: 5px;">
+    <div v-if="path === '/customer/customer'" style="color: red;margin-bottom: 5px;">
       注意：创建的客户需接收
     </div>
     <el-row :gutter="10" class="mb8">