|
|
@@ -56,7 +56,7 @@
|
|
|
},
|
|
|
],
|
|
|
hasRedBox:false, //是否添加了红包
|
|
|
- limit:50,
|
|
|
+ limit:200,
|
|
|
videoId:'', //上传视频的id
|
|
|
videoUrl:'', //处理好的视频地址
|
|
|
progress:0, //进度条
|
|
|
@@ -66,7 +66,7 @@
|
|
|
showPopView:false, //是否显示确认取消框
|
|
|
uploadStatus:0, //视频处理的状态 -1 压缩中 0 未开始，1 上传中，2绿幕抠图中-服务端处理中，3处理成功 4 处理失败
|
|
|
count:0, //结果请求次数
|
|
|
- timeOut:90000, //超时时间
|
|
|
+ timeOut:20*60*1000, //超时时间
|
|
|
outTimer:null, //延时处理对象
|
|
|
timer:null, //轮询对象
|
|
|
widthHeight:'', //用户上传视频尺寸
|
|
|
@@ -297,16 +297,17 @@
|
|
|
self.uploadStatus = 1;//上传中
|
|
|
self.showPersonView = false;
|
|
|
self.addSilhouette();//添加剪影视频
|
|
|
- var fileName = decodeURIComponent(encodeURIComponent(Date.now() + '/video' + Math.floor(Math.random()*1000))) + tp;
|
|
|
+ let _name = Math.floor(Math.random()*1000);
|
|
|
+ var fileName = decodeURIComponent(encodeURIComponent(Date.now() + '/video' +_name )) + tp;
|
|
|
var observable = qiniu.upload(file, fileName, token, putExtra, config);
|
|
|
var subscription = observable.subscribe(self.next, self.error, async function(res){
|
|
|
- self.uploading=false;
|
|
|
- let VideoUrl = resultUrl + fileName;
|
|
|
- console.warn("视频上传七牛成功",VideoUrl);
|
|
|
+ let videoUrl = resultUrl + fileName;
|
|
|
+ let realVideoUrl = 'https://dm.static.elab-plus.com/' + "video" + _name +'_elab.mp4';
|
|
|
+ console.warn("视频上传七牛成功",videoUrl ,realVideoUrl);
|
|
|
// self.$message.success('视频上传成功');
|
|
|
// alert("***uploadMaterielFile***"+$config.brandId+this.userId);
|
|
|
let data = {
|
|
|
- "url":VideoUrl,
|
|
|
+ "url":videoUrl,
|
|
|
"brandId": $config.brandId,
|
|
|
"userId":self.userId
|
|
|
}
|
zjs_project