Commit f56b6376 authored by 黄奎's avatar 黄奎

页面修改

parent 6922b66c
...@@ -117,8 +117,10 @@ ...@@ -117,8 +117,10 @@
:content="item.Name" placement="top-start"> :content="item.Name" placement="top-start">
<div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''" <div @click="PageSelect(item,index)" :class="item.Selected ? 'selected' :''"
class="el-tooltip item material-item "> class="el-tooltip item material-item ">
<img :src="getIconLink(item.Path)+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'" <img :src="getIconLink(item.Path)+'?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast'"
class="material-img" style="width: 140px; height: 140px;"> class="material-img" style="width: 140px; height: 140px;">
<div class="material-video-info"><i class="el-icon-video-play"></i> <div class="material-video-info"><i class="el-icon-video-play"></i>
<span>{{Time(item.VideoTime)}}</span></div> <span>{{Time(item.VideoTime)}}</span></div>
<div flex="dir:left" style="margin-top: 5px;"> <div flex="dir:left" style="margin-top: 5px;">
...@@ -178,6 +180,10 @@ ...@@ -178,6 +180,10 @@
<el-button size="small" type="primary" @click="pagesubmitForm('addpageMsg')">确 定</el-button> <el-button size="small" type="primary" @click="pagesubmitForm('addpageMsg')">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<video width="320" height="240" controls id="upvideo" style="display:none">
</video>
<img :src="testImg" style="width:120px;height:60px;border:1px solid red;" />
<canvas id='mycanvas' ></canvas>
</div> </div>
</template> </template>
<script> <script>
...@@ -243,7 +249,7 @@ ...@@ -243,7 +249,7 @@
checkList: [], checkList: [],
checkAllList: [], checkAllList: [],
checkAll: false, checkAll: false,
testImg: ""
} }
}, },
created() { created() {
...@@ -251,9 +257,33 @@ ...@@ -251,9 +257,33 @@
this.GetPageList(); this.GetPageList();
}, },
mounted() { mounted() {
this.findvideocover("http://192.168.2.214:8130/Upload/Video/20200901114120428.mp4")
}, },
methods: { methods: {
//获取视频封面
findvideocover(videoUrl) {
let _this = this;
this.$nextTick(() => {
let video = document.getElementById("upvideo");
let source = document.createElement("source");
source.src = videoUrl;
source.type = "video/mp4";
video.appendChild(source);
video.addEventListener("loadeddata", function() {
var canvas = document.createElement("canvas");
canvas.width = "320";
canvas.height = "320";
canvas
.getContext("2d")
.drawImage(video, 0, 0, canvas.width, canvas.width);
console.log("video",video);
var img = document.createElement("img");
let imgsrc = canvas.toDataURL("image/png");
_this.testImg=imgsrc
});
});
},
Time(value) { Time(value) {
var theTime = parseInt(value); // 秒 var theTime = parseInt(value); // 秒
var middle = 0; // 分 var middle = 0; // 分
......
...@@ -3,7 +3,7 @@ export default { ...@@ -3,7 +3,7 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.md5 = md5; Vue.prototype.md5 = md5;
//消息成功提示 //消息成功提示
Vue.prototype.Success = function(msg) { Vue.prototype.Success = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
}); });
}, },
//错误提示 //错误提示
Vue.prototype.Error = function(msg) { Vue.prototype.Error = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
}, },
//一般提示 //一般提示
Vue.prototype.Info = function(msg) { Vue.prototype.Info = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -28,7 +28,7 @@ export default { ...@@ -28,7 +28,7 @@ export default {
}); });
}, },
//警告提示 //警告提示
Vue.prototype.Warning = function(msg) { Vue.prototype.Warning = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
}); });
}, },
//Confirm //Confirm
Vue.prototype.Confirm = function(msg, callback) { Vue.prototype.Confirm = function (msg, callback) {
this.$confirm(msg, "提示", { this.$confirm(msg, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -51,21 +51,28 @@ export default { ...@@ -51,21 +51,28 @@ export default {
this.Info("已取消操作"); this.Info("已取消操作");
}); });
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let javaUrl = 'http://192.168.2.65:8018'; let javaUrl = 'http://192.168.2.65:8018';
domainUrl = "http://192.168.2.65"; domainUrl = "http://192.168.0.116:8200";
//domainUrl = "https://localhost:5001"; domainUrl = "https://localhost:5001";
let vtUploadUrl = "http://192.168.2.214:8120";
let vtViewUrl = "http://192.168.2.214:8130";
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('testmall.oytour') !== -1) { if (locationName.indexOf('testmall.oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com"; domainUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com"; javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "http://imgfile.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) { } else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com"; domainUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com"; javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "http://imgfile.oytour.com";
} }
var obj = { var obj = {
//主地址npm //主地址npm
...@@ -77,11 +84,15 @@ export default { ...@@ -77,11 +84,15 @@ export default {
ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com', ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com',
UploadFileUrl: domainUrl + '/api/File/LocalFileUploadImport', UploadFileUrl: domainUrl + '/api/File/LocalFileUploadImport',
UploadBlob: domainUrl + '/api/File/UploadBlob', UploadBlob: domainUrl + '/api/File/UploadBlob',
//文件上传自己服务器
VTUploadUrl: vtUploadUrl,
//文件预览自己服务器
VTViewUrl: vtUploadUrl
}; };
return obj; return obj;
}, },
//浏览器缓存 //浏览器缓存
Vue.prototype.getLocalStorage = function() { Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["mall_userInfo"]; var localStorageData = window.localStorage["mall_userInfo"];
if (localStorageData !== undefined && localStorageData != 'undefined') { if (localStorageData !== undefined && localStorageData != 'undefined') {
return JSON.parse(localStorageData); return JSON.parse(localStorageData);
...@@ -90,7 +101,7 @@ export default { ...@@ -90,7 +101,7 @@ export default {
} }
}, },
//验证只能输入2位小数【负数:isMinus传true】 //验证只能输入2位小数【负数:isMinus传true】
Vue.prototype.checkPrice = function(item, filed, isMinus) { Vue.prototype.checkPrice = function (item, filed, isMinus) {
var value = "" + item[filed]; //转字符串 var value = "" + item[filed]; //转字符串
var t = value.charAt(0); var t = value.charAt(0);
value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符 value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
...@@ -108,7 +119,7 @@ export default { ...@@ -108,7 +119,7 @@ export default {
item[filed] = value; item[filed] = value;
} }
//验证只能输入整数【负数:isMinus传true】 //验证只能输入整数【负数:isMinus传true】
Vue.prototype.checkInteger = function(item, filed, isMinus) { Vue.prototype.checkInteger = function (item, filed, isMinus) {
var value = "" + item[filed]; //转字符串 var value = "" + item[filed]; //转字符串
var t = value.charAt(0); var t = value.charAt(0);
value = value.replace(this.$commonUtils.Regex.isInteger, ""); value = value.replace(this.$commonUtils.Regex.isInteger, "");
...@@ -119,33 +130,55 @@ export default { ...@@ -119,33 +130,55 @@ export default {
item[filed] = value; item[filed] = value;
}, },
//是否是线上环境【发布时修改为true】 //是否是线上环境【发布时修改为true】
Vue.prototype.isOnline = function() { Vue.prototype.isOnline = function () {
return process.env.NODE_ENV !== 'development'; return process.env.NODE_ENV !== 'development';
}, },
//文件类型数组 //文件类型数组
Vue.prototype.FileType = function() { Vue.prototype.FileType = function () {
var fileTypeJson = { var fileTypeJson = {
//主地址npm //主地址npm
UserImg: "User", //用户相图片 UserImg: "User", //用户相图片
//常用提交数据URL //常用提交数据URL
GoodsImg: "Goods", //素材相关文件 GoodsImg: "Goods", //素材相关文件
SetImg: "Set", //用户相图片 SetImg: "Set", //用户相图片
Video: "Video", //视频
}; };
return fileTypeJson; return fileTypeJson;
}, },
//上传文件到本地服务器
Vue.prototype.UploadSelfFile = function (path, file, callback) {
var that = this;
var newPath = '/Upload/' + path + "/";
var formData = new FormData();
var uploadUrl = that.domainManager().VTUploadUrl + "/Upload?filePath=" + newPath;
formData.append("myfile", file);
that.$http.post(uploadUrl, formData, {})
.then(res => {
if (res && res.status == 200 && res.data && res.data.FilePath) {
var uploadResult = {
resultCode: 1,
FileName: file.name,
FileUrl: that.domainManager().VTViewUrl + res.data.FilePath
}
if (callback) {
callback(uploadResult);
}
}
}).catch(function (reason) {
console.log(reason)
});
},
//上传文件到云存储 //上传文件到云存储
Vue.prototype.UploadFileToTencent = function(path, fileObj, callback) { Vue.prototype.UploadFileToTencent = function (path, fileObj, callback) {
// debugger; // debugger;
console.log('filein...')
if (fileObj.type == "image/png" || fileObj.type == "image/jpeg") { if (fileObj.type == "image/png" || fileObj.type == "image/jpeg") {
let that = this let that = this
lrz(fileObj, { lrz(fileObj, {
width: 750, width: 750,
quality: 0.8 quality: 0.8
}) })
.then(function(rst) { .then(function (rst) {
//成功时执行 //成功时执行
console.log(rst)
var arr = rst.base64.split(','); var arr = rst.base64.split(',');
var mime = arr[0].match(/:(.*?);/)[1]; var mime = arr[0].match(/:(.*?);/)[1];
var bstr = atob(arr[1]); var bstr = atob(arr[1]);
...@@ -154,21 +187,18 @@ export default { ...@@ -154,21 +187,18 @@ export default {
while (n--) { while (n--) {
u8arr[n] = bstr.charCodeAt(n); u8arr[n] = bstr.charCodeAt(n);
} }
var newFile = new File([u8arr], fileObj.name, { type: mime }); var newFile = new File([u8arr], fileObj.name, {
debugger; type: mime
console.log(newFile); });
that.uploadStart(path, newFile, callback) that.uploadStart(path, newFile, callback)
}).catch(function(error) { }).catch(function (error) {
that.uploadStart(path, fileObj, callback) that.uploadStart(path, fileObj, callback)
}).always(function() { }).always(function () {
//不管成功或失败,都会执行 //不管成功或失败,都会执行
}) })
} }
}, },
Vue.prototype.uploadStart = function(path, fileObj, callback) { Vue.prototype.uploadStart = function (path, fileObj, callback) {
console.log(fileObj)
debugger;
//获取文件扩展名 //获取文件扩展名
var filename = fileObj.name; var filename = fileObj.name;
var index = filename.lastIndexOf("."); var index = filename.lastIndexOf(".");
...@@ -198,9 +228,8 @@ export default { ...@@ -198,9 +228,8 @@ export default {
Key: newFileName, //文件名 Key: newFileName, //文件名
StorageClass: 'STANDARD', StorageClass: 'STANDARD',
Body: fileObj, // 上传文件对象 Body: fileObj, // 上传文件对象
onProgress: function(progressData) {} onProgress: function (progressData) {}
}, function(err, data) { }, function (err, data) {
debugger;
if (data && data.statusCode == 200) { if (data && data.statusCode == 200) {
var uploadResult = { var uploadResult = {
resultCode: 1, resultCode: 1,
...@@ -217,14 +246,14 @@ export default { ...@@ -217,14 +246,14 @@ export default {
}); });
}, },
//公用跳转 //公用跳转
Vue.prototype.CommonJump = function(path, obj) { Vue.prototype.CommonJump = function (path, obj) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: obj query: obj
}); });
} }
//公用判断图片地址 判断是否包含http //公用判断图片地址 判断是否包含http
Vue.prototype.getIconLink = function(url) { Vue.prototype.getIconLink = function (url) {
let str = '' let str = ''
if (url && url != '') { if (url && url != '') {
if (url.indexOf('http') != -1) { if (url.indexOf('http') != -1) {
...@@ -236,7 +265,7 @@ export default { ...@@ -236,7 +265,7 @@ export default {
} }
} }
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function(cmd, msg, successCall, faildCall, isOnline) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
var apiurl = this.domainManager().DomainUrl + cmd; var apiurl = this.domainManager().DomainUrl + cmd;
var postData = this.GetPostData(cmd, msg, ""); var postData = this.GetPostData(cmd, msg, "");
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
...@@ -258,7 +287,7 @@ export default { ...@@ -258,7 +287,7 @@ export default {
}, faildCall) }, faildCall)
} }
//获取请求参数 //获取请求参数
Vue.prototype.GetPostData = function(cmd, msg, newCmd) { Vue.prototype.GetPostData = function (cmd, msg, newCmd) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -308,14 +337,15 @@ export default { ...@@ -308,14 +337,15 @@ export default {
MallBaseId: MallBaseId, MallBaseId: MallBaseId,
TenantId: TenantId, TenantId: TenantId,
EmpId: EmpId, EmpId: EmpId,
SmallShopsId: 0,
MiniAppId: "wxacd9f8cc3480d29e", MiniAppId: "wxacd9f8cc3480d29e",
OpenId: "ow_7I5ZQKhAB66yvOTGI35Xk-Kmg", OpenId: "ow_7I5cKHQJeQlNJOKoeERRhe6SA",
// UserId:19992, UserId: 21382,
} }
return postData return postData
}, },
//HTTP提交数据资产 //HTTP提交数据资产
Vue.prototype.assetsApipost = function(cmd, msg, successCall, faildCall, isOnline) { Vue.prototype.assetsApipost = function (cmd, msg, successCall, faildCall, isOnline) {
var apiurl = this.domainManager().DomainUrl + cmd; var apiurl = this.domainManager().DomainUrl + cmd;
var postData = this.GetAssetsPostData(cmd, msg, ""); var postData = this.GetAssetsPostData(cmd, msg, "");
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
...@@ -338,7 +368,7 @@ export default { ...@@ -338,7 +368,7 @@ export default {
} }
//获取请求参数 //获取请求参数
Vue.prototype.GetAssetsPostData = function(cmd, msg, newCmd) { Vue.prototype.GetAssetsPostData = function (cmd, msg, newCmd) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -405,7 +435,7 @@ export default { ...@@ -405,7 +435,7 @@ export default {
}, },
//文件下载 //文件下载
Vue.prototype.GetLocalFile = function(cmd, msg, fileName, newCmd, successCall) { Vue.prototype.GetLocalFile = function (cmd, msg, fileName, newCmd, successCall) {
var apiurl = this.domainManager().DomainUrl + cmd; var apiurl = this.domainManager().DomainUrl + cmd;
var postData = this.GetPostData(cmd, msg, newCmd); var postData = this.GetPostData(cmd, msg, newCmd);
this.$http.post(apiurl, postData, { this.$http.post(apiurl, postData, {
...@@ -421,11 +451,11 @@ export default { ...@@ -421,11 +451,11 @@ export default {
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
successCall(res); successCall(res);
}).catch(function(res) {}); }).catch(function (res) {});
}, },
//调用资产的接口 //调用资产的接口
Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment