修复bug

houtai/src/components/Tab5DialogThree.vue

@@ -117,7 +117,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/components/tab3Dialog.vue

@@ -143,7 +143,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/components/tab5Dialog.vue

@@ -180,7 +180,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/components/tab6Dialog.vue

@@ -159,7 +159,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/forum/list.vue

@@ -150,7 +150,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/forum/look.vue

@@ -238,7 +238,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab1/tab1Add.vue

@@ -188,7 +188,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab1/tab1Add2.vue

@@ -57,6 +57,7 @@
               <div class="delImg el-icon-delete" @click="delGoodsImg(index,item.id)" v-if="imgActive !== index"></div>
             </div>
             <el-upload
+              v-if="this.imgList.length<18"
               ref="upload"
               class="avatar-uploader"
               :action="baseURL + '/cms/goods/upload'"
@@ -72,7 +73,7 @@
           </div>
           <p class="upHint upHint1">格式要求：</p>
           <p class="upHint">
-            1、支持png、jpg、gif和jpeg的图片格式；最大支持20M。
+            1、支持png、jpg、gif和jpeg的图片格式；单张最大支持20M。
           </p>
           <p class="upHint">2、最多可上传18张图片。</p>
         </el-form-item>
@@ -120,7 +121,7 @@ export default {
     async goodsSave () {
       if (this.ruleForm.name.trim() === '') { return this.$message.warning('标题不能为空') }
       if (this.imgList.length === 0) { return this.$message.warning('图片不能为空') }
-      if (this.imgList.length > 18) { return this.$message.warning('图片不能超过18张') }
+      // if (this.imgList.length > 18) { return this.$message.warning('图片不能超过18张') }
       const temp = []
       this.imgList.forEach(v => {
         temp.push(v.id)
@@ -179,12 +180,11 @@ export default {
     },
     // 上传图片
     beforethumbUpload (file) {
-      // console.log(998, file)
       // 限制图片大小和格式
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab2/tab2Add.vue

@@ -171,7 +171,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {
@@ -232,7 +232,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab3/tab3Add.vue

@@ -181,7 +181,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 5
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {
@@ -241,7 +241,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab4/tab4Add.vue

@@ -149,7 +149,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab5/tab5Add.vue

@@ -117,7 +117,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {

houtai/src/views/tab6/tab6Add.vue

@@ -151,7 +151,7 @@ export default {
       const sizeOk = file.size / 1024 / 1024 < 20
       const typeOk =
         file.type === 'image/png' ||
-        file.type === 'image/jpeg' ||
+        (file.type === 'image/jpeg' && !file.name.includes('.jfif')) ||
         file.type === 'image/gif'
 
       return new Promise((resolve, reject) => {