上传新增提示

src/api/common/common.js

@@ -36,7 +36,8 @@ export function UploadSelfFile(path, file, callback, configObj) {
   var timestamp1 = Date.parse(new Date()) + "_" + (Math.ceil(Math.random() * 1000));
   let str = '/Test';
   var newPath = "/EduSystem" + str + '/Upload/' + path;
-  Loading.show({
+  var uploadLoadding = Loading;
+  uploadLoadding.show({
     message: '正在上传文件,请稍后...'
   })
   if (uploadConfig) {
@@ -44,26 +45,26 @@ export function UploadSelfFile(path, file, callback, configObj) {
       //上传文件到腾讯云
       case 1:
         newPath += "/" + timestamp1 + "" + suffix;
-        UploadFileToTencent(uploadConfig, newPath, file, callback);
+        UploadFileToTencent(uploadConfig, newPath, file, uploadLoadding, callback);
         break;
         //上传文件到阿里云
       case 2:
         newPath += "/" + timestamp1 + "" + suffix;
-        UploadFileToALi(uploadConfig, newPath, file, callback);
+        UploadFileToALi(uploadConfig, newPath, file, uploadLoadding, callback);
         break;
         //上传文件到自己文件服务器
       case 3:
-        UploadFileToSystem(uploadConfig, newPath, file, callback, configObj);
+        UploadFileToSystem(uploadConfig, newPath, file, uploadLoadding, callback, configObj);
         break;
     }
   }
-  Loading.hide();
+  //Loading.hide();
 }
 
 /**
  * 上传文件到本地文件系统
  */
-export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, successCall, configObj) {
+export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, uploadLoadding, successCall, configObj) {
   let url = uploadConfig.UploadDomain + "/Upload?filePath=" + fileFullPath;
   if (configObj) {
     //是否转换图片
@@ -75,6 +76,7 @@ export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, successC
   formData.append('myfile', fileObj)
   let xhr = new XMLHttpRequest()
   xhr.onload = function () {
+    uploadLoadding.hide();
     var jsonObj = JSON.parse(xhr.responseText);
     if (jsonObj.StatusCode == 1 && successCall) {
       var tempArray = [];
@@ -102,7 +104,7 @@ export function UploadFileToSystem(uploadConfig, fileFullPath, fileObj, successC
 /**
  * 上传文件到阿里云
  */
-export function UploadFileToALi(uploadConfig, fileFullPath, fileObj, successCall) {
+export function UploadFileToALi(uploadConfig, fileFullPath, fileObj, uploadLoadding, successCall) {
   var OSS = require('ali-oss');
   var oss = new OSS({
     region: uploadConfig.Region,
@@ -113,6 +115,7 @@ export function UploadFileToALi(uploadConfig, fileFullPath, fileObj, successCall
   var result = oss.multipartUpload(fileFullPath, fileObj, {
     progress: function* (p) {}
   }).then(res => {
+    uploadLoadding.hide();
     var uploadResult = {
       Code: 1,
       FileName: fileObj.name,
@@ -127,7 +130,7 @@ export function UploadFileToALi(uploadConfig, fileFullPath, fileObj, successCall
 /**
  * 上传文件到腾讯云
  */
-export function UploadFileToTencent(uploadConfig, fileFullPath, fileObj, successCall) {
+export function UploadFileToTencent(uploadConfig, fileFullPath, fileObj, uploadLoadding, successCall) {
   var COS = require('cos-js-sdk-v5');
   var cos = new COS({
     SecretId: uploadConfig.SecretId,
@@ -141,6 +144,7 @@ export function UploadFileToTencent(uploadConfig, fileFullPath, fileObj, success
     Body: fileObj, // 上传文件对象
     onProgress: function (progressData) {}
   }, function (err, data) {
+    uploadLoadding.hide();
     if (data && data.statusCode == 200) {
       var uploadResult = {
         Code: 1,
@@ -194,7 +198,7 @@ export function getFileExt(filename) {
  */
 
 export function EduDownLoad(cmd, msg, fileName, callBack) {
-    console.log("callBack",callBack);
+  console.log("callBack", callBack);
   return request({
     url: cmd,
     method: 'post',