Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

src/views/role/components/userDefault.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 个人会员 -->
   <div class="mainBox">
     <div class="layerBox">
       <el-form ref="form" :model="form" :rules="loginRules" class="login-form" autocomplete="on" label-position="left"
@@ -143,12 +144,11 @@
           </el-form-item>
 
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" :on-preview="handlePreview"
-              :on-remove="handleRemove" :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple
-              :limit="30" :on-exceed="handleExceed" :file-list="otherList" list-type="picture"
-              :before-upload="beforeAvatarUpload">
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+              :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
+              :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload1">
               <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
+              <div slot="tip" class="el-upload__tip">每张图片最大2MB，最多上传30张图片。</div>
             </el-upload>
           </el-form-item>
           <el-form-item label="提示词：" :label-width="formLabelWidth" prop="" class="custom-align-right">
@@ -444,17 +444,15 @@ export default {
       this.photoUrl = ''; // 清空图片 URL
     },
     //2.3 多文件上传
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+      console.log('file, fileList',file, fileList);
+      for(let item of fileList){
+       this.form.other = this.form.other.filter(item => item !== file.url); 
+      }
+      return this.$confirm(`确定移除 ${file.name}?`);
     },
     //获取token
     getTokenFromCookie() {
@@ -482,17 +480,11 @@ export default {
       console.log(this.form.other);
     },
     //只能上传图片
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg';
-      const isPNG = file.type === 'image/png';
-      const isLt1M = file.size / 1024 / 1024 < 1;
+    beforeAvatarUpload1(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
 
-      if (!isJPG && !isPNG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
-        return false;
-      }
-      if (!isLt1M) {
-        this.$message.error('上传图片大小不能超过 1MB!');
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 2MB!');
         return false;
       }
     },

src/views/role/components/userEnterprise.vue

@@ -116,22 +116,11 @@
             <el-input v-model="form.email" autocomplete="off" placeholder="请输入电子邮箱.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload 
-              class="upload-demo" 
-              :action="uploadFileUrl" 
-              :headers="headers" 
-              :on-preview="handlePreview"
-              :on-remove="handleRemove" 
-              :before-remove="beforeRemove" 
-              :on-success="handleUploadSuccess" 
-              multiple
-              :limit="30" 
-              :on-exceed="handleExceed" 
-              :file-list="otherList" 
-              list-type="picture"
-              :before-upload="beforeAvatarUpload">
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+              :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
+              :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload">
               <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
+              <div slot="tip" class="el-upload__tip">每张图片最大2MB，最多上传30张图片。</div>
             </el-upload>
           </el-form-item>
 
@@ -405,18 +394,16 @@ export default {
     //表单收集 end ------------------------------------------------------------>
     //2.提交表单 start ------------------------------------------------------------>
     //2.3 多文件上传
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(aaa);
-      console.log(file);
-    },
+    //文件超出个数限制的钩子函数
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+      console.log('file, fileList',file, fileList);
+      for(let item of fileList){
+       this.form.other = this.form.other.filter(item => item !== file.url); 
+      }
+      return this.$confirm(`确定移除 ${file.name}?`);
     },
     //获取token
     getTokenFromCookie() {
@@ -445,16 +432,10 @@ export default {
     },
     //只能上传图片
     beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg';
-      const isPNG = file.type === 'image/png';
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt2M = file.size / 1024 / 1024 < 2;
 
-      if (!isJPG && !isPNG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
-        return false;
-      }
-      if (!isLt1M) {
-        this.$message.error('上传图片大小不能超过 1MB!');
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 2MB!');
         return false;
       }
     },

src/views/role/components/userInvestigate.vue

@@ -131,12 +131,11 @@
             <el-input v-model="form.address" autocomplete="off" placeholder="请输入门牌号.."></el-input>
           </el-form-item>
           <el-form-item label="相关资料：" :label-width="formLabelWidth" prop="" class="custom-align-right">
-            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" :on-preview="handlePreview"
-              :on-remove="handleRemove" :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple
-              :limit="30" :on-exceed="handleExceed" :file-list="otherList" list-type="picture"
-              :before-upload="beforeAvatarUpload">
+            <el-upload class="upload-demo" :action="uploadFileUrl" :headers="headers" accept=".jpg, .jpeg, .png, .pdf"
+              :before-remove="beforeRemove" :on-success="handleUploadSuccess" multiple :limit="30"
+              :on-exceed="handleExceed" :file-list="otherList" list-type="picture" :before-upload="beforeAvatarUpload1">
               <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">每张图片最大1MB，最多上传30张图片。</div>
+              <div slot="tip" class="el-upload__tip">每张图片最大2MB，最多上传30张图片。</div>
             </el-upload>
           </el-form-item>
           <el-form-item label="提示词：" :label-width="formLabelWidth" prop="" class="custom-align-right">
@@ -432,7 +431,7 @@ export default {
       const isLt2M = file.size / 1024 / 1024 < 2;
 
       if (!isJPG && !isPNG) {
-        this.$message.error('上传头像图片只能是 JPG 或 PNG 格��!');
+        this.$message.error('上传头像图片只能是 JPG 或 PNG 格式!');
         return false;
       }
       if (!isLt2M) {
@@ -462,17 +461,15 @@ export default {
       this.photoUrl = ''; // 清空图片 URL
     },
     //2.3 多文件上传
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 30 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+      console.log('file, fileList',file, fileList);
+      for(let item of fileList){
+       this.form.other = this.form.other.filter(item => item !== file.url); 
+      }
+      return this.$confirm(`确定移除 ${file.name}?`);
     },
     //获取token
     getTokenFromCookie() {
@@ -500,17 +497,11 @@ export default {
       console.log(this.form.other);
     },
     //只能上传图片
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg';
-      const isPNG = file.type === 'image/png';
-      const isLt1M = file.size / 1024 / 1024 < 1;
+    beforeAvatarUpload1(file) {
+      const isLt2M = file.size / 1024 / 1024 < 2;
 
-      if (!isJPG && !isPNG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
-        return false;
-      }
-      if (!isLt1M) {
-        this.$message.error('上传图片大小不能超过 1MB!');
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 2MB!');
         return false;
       }
     },