Merge branch '云仓3.0.1' into test

src/utils/request.js

@@ -125,22 +125,7 @@ service.interceptors.response.use(res => {
       message: message,
       type: "error"
     });
-    // console.log(message);
-    // --- end ---- 开发时候用这段，把错误彻底抛出来 --- end ---
-
-    // --- start --- 正式上线，隐藏报错信息 ----- start ----
-
-    // let ssa = window.location.host;
-    // setTimeout(function () {
-    //   if (ssa == 'localhost:1024') {
-    //     window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
-    //   } else {
-    //     window.location.href = 'http://sso.jxhh.com/logout?redirect=http://' + ssa
-    //   }
-    // }, 1000);
-
-    // --- end  --- 正式上线，隐藏报错信息 ----- end ----
-
+   
     return Promise.reject(error)
   }
 )

src/views/system/goods/add/components/goodsinfomation.vue

@@ -118,6 +118,7 @@
             <el-upload
             v-if="!vediosrc"
           class="upload-img"
+          ref="videoref"
           action="#"
           :limit="1"
           list-type="picture-card"
@@ -126,6 +127,7 @@
           :show-file-list="false"
           :on-preview="handlePictureCardPreview"
           :on-remove="handleRemove"
+          :on-error="vedioerror"
           :file-list="goodsvedioFileList"
         ><i class="el-icon-plus" />
         <!-- v-if="videoform.showvideopath !='' && !videoflag" -->
@@ -319,7 +321,8 @@
       },
       // 上传 视频 之前
       beforeUpGoodsvedio(file) {
-        let isImgSize = (file.size / 1024 / 1024 ) > 100;
+        debugger
+        let isImgSize = (file.size / 1024 / 1024 ) > 10;
 
         if(file.type !== "video/mp4") {
           this.$message({
@@ -331,7 +334,7 @@
 
         if(isImgSize) {
           this.$message({
-            message: '上传视频大小不能超过100MB',
+            message: '上传视频大小不能超过10MB',
             type: "warning"
           });
           return false;
@@ -342,18 +345,31 @@
         const formData = new FormData()
       formData.append('file', param.file)
           uploadVideo(formData).then( res=> {
+        
+            if(res.data&&res.code==1) {
             let urlObj = {'url': ''};
-            if(res.data) {
               urlObj.url = res.data.url;
               this.goodsvedioFileList.push(urlObj);
               this.vediosrc = res.data.url
               this.goodsInfoForm.video = res.data.url
               this.$message({type:'success',message:'视频上传成功'});
+            }else{
+              this.goodsvedioFileList=[]
+              this.vediosrc = ''
+              this.$notify.error({
+                    title: '错误',
+                    message:res.message
+                  });
             }
+          }).catch((err)=>{
+          
+            console.log(err)
           });
       
       },
- 
+      vedioerror(err, file, fileList){
+        console.log(err, file, fileList)
+      },
       onEnd(){
         debugger
         console.log( this.goodsImgFileList)