优化

src/components/newBottomCom/viewAI/viewAI.vue

@@ -111,7 +111,7 @@
 		async mounted() {
 			// await this.getCityHouseList();		
 			console.warn("***viewAI***")
-			Indicator.open('加载中...');
+			// Indicator.open('加载中...');
 			this.getDatalist(0);
 			this.getDatalist(1);
 			this.getDatalist(3);
@@ -214,7 +214,7 @@
 				//上传图片
 				var file = e.target.files[0];
 				var fileSize = file.size / 1024 / 1024;
-				// alert('**文件**' + e.target.value + "-fileName=" + file.name);
+				// alert('**文件**' + e.target.value + "-fileName=" + file.name+ "-fileSize="+fileSize);
 				if (!/\.(MP4|mp4|MOV|mov)$/.test(e.target.value)) {
 					this.$message.warning('文件类型必须是mp4或者mov');
 					var videoForm = document.getElementById(form); //获取表单对象
@@ -368,16 +368,20 @@
 				formData.append('file', item.file);
 				formData.append('brandId', $config.brandId);
 				formData.append('userId', this.userId);
-				console.warn("***uploadMaterielFile***");
+				console.warn("****uploadMaterielFile**",$config.brandId,this.userId)
+				// alert("***uploadMaterielFile***"+$config.brandId+this.userId);
 				this.uploadStatus = 1;//上传中
 				this.showPersonView = false;
 				this.addSilhouette();//添加剪影视频
 				let res = await requestConfig('robust_video', formData, true, false,'post',this.uploadProgress,this.cancel)
+				// alert("***uploadMaterielFile1***"+JSON.stringify(res));
 				if (axios.isCancel(res)) {//取消上传处理
 					this.initStatus();//还原初始状态
-				}else if (res.success && res.single) {
+				}else if (res && res.success && res.single) {
 					this.videoId = res.single;//根据Id查询结果
 					this.startInterval();//开始轮询获取结果
+				}else{
+					this.initStatus();//还原初始状态
 				}
 				var videoForm = document.getElementById(form); //获取表单对象
 				videoForm && videoForm.reset(); // 重置表单
@@ -590,7 +594,7 @@
 					typeName = "Virtual_Pet";
 				} else if (type == 3) {
 					typeName = "Virtual_Music";
-					Indicator.close();
+					// Indicator.close();
 				}
 				var parmas = {
 					"type": typeName,

src/services/request.js

@@ -7,6 +7,7 @@ var requestCount = 0; //记录下同时的请求数
 
 axios.defaults.headers.post['elabEnvironment'] = '4'; //axios默认的请求方式,可以自己设置
 axios.defaults.headers.post['userType'] = '1000'; //axios默认的请求方式,可以自己设置
+axios.defaults.timeout = 10*60*1000; //axios默认的请求方式,可以自己设置
 // axios.defaults.headers.post['Authorization'] = 'Token 9837b7480a99ab4df7e3a06ad0d990fbc7b941e4'; //axios默认的请求方式,可以自己设置
 axios.interceptors.request.use(function(config) {
 	if(config.noLoading){
@@ -31,13 +32,13 @@ axios.interceptors.request.use(function(config) {
 		}
 		if (config.url.includes('elab-marketing-operate/mofangTest/user/login')
 		||config.url.includes('elab-marketing-user/vcode/send/verifyCode')) {
-			config.headers['userId'] = "";
-			config.headers['ip'] = "";
+			// config.headers['userId'] = "";
+			// config.headers['ip'] = "";
 		} else {//uploadOss 上传format文件过大时提示不成功，接口500，通过测试与header有关，注释掉上传的header就好了
 			if (!config.url.includes('elab-marketing-sms/aliyun/openapi/uploadOss')
 			&& !config.url.includes('/robust_video')){
-				config.headers['userId'] = mapVue.$route.query.leavePhoneCustomerId || '';
-				config.headers['openId'] = mapVue.$route.query.openid || '';
+				// config.headers['userId'] = mapVue.$route.query.leavePhoneCustomerId || '';
+				// config.headers['openId'] = mapVue.$route.query.openid || '';
 				// config.headers['ip'] = getStorage('ip');
 				// config.headers['maiya_token'] =  getStorage('userInfoThing') ? JSON.parse(getStorage('userInfoThing')).maiya_token || "" : ""; //token
 			}
@@ -63,6 +64,7 @@ axios.interceptors.response.use(function(response) {
 	return result;
 }, function(error) {
 	console.log("***error***", error, requestCount)
+	// alert("***error***"+JSON.stringify(error))
 	if (axios.isCancel(error)) {
 		console.log('上传已取消');
 		requestCount = requestCount - 1;

src/services/requestConfig.js

@@ -40,6 +40,7 @@ const endpoints = {
 	queryEnumList: 'elab-marketing-user/enum/queryEnumList', // 获取数字人
 	rob: 'elab-marketing-file/redpack/rob', // 抢红包
 	robust_video: 'https://robustvideomatting.elab-plus.com/robust_video', // 上传视频
+	// robust_video: 'http://192.168.50.52:5000/robust_video', // 上传视频
 	get_result: 'https://robustvideomatting.elab-plus.com/get_result', // 获取视频上传结果
 	getUserVirtural: 'elab-marketing-file/virtual/getUserVirtural', // 查询用户上传的数字人 
 	addUserVirtural: 'elab-marketing-file/virtual/addUserVirtural', // 修改数字人信息