Skip to content

I
integral-mall
Commit 9fd8115b by damodmg
Options

更新

parent b19d4423
Showing with 34 additions and 8 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.801c74923cc0daaa205da306df02da6e.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.53022f4705e8412e9fc0.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.d5c53afbdf5419650810a99f50bd7c6d.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.39c0c67f82a3271f180c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.39c0c67f82a3271f180c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.53022f4705e8412e9fc0.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/importCoupon.vue
......@@ -75,10 +75,21 @@ export default {
/*eslint-disable*/
console.log(file);
console.log(file.type);
if (file.type !== isXlsx) {
this.$message.error('文件格式错误，请导入.xlsx格式的文件');
return false;
if(file.type) {
if (file.type !== isXlsx) {
this.$message.error('文件格式错误，请导入.xlsx格式的文件');
return false;
}
}else{ //兼容默写电脑获取file.type为空的情况
let fileName = file.name
let arr = fileName.split(".");
let fileType = arr[arr.length - 1];
if(fileType!=='xlsx') {
this.$message.error('文件格式错误，请导入.xlsx格式的文件');
return false;
}
}
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的文件');
return false;
......
src/views/goods/gift/info.vue
......@@ -1064,10 +1064,25 @@ export default {
this.$message.error('请上传小于2MB的图片');
return false;
}
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
/*eslint-disable*/
console.log(file);
console.log(file.type);
if (file.type) {
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
}
} else {
//兼容默写电脑获取file.type为空的情况
let fileName = file.name;
let arr = fileName.split('.');
let fileType = arr[arr.length - 1];
if (fileType !== 'jpeg' || fileType !== 'png' || fileType !== 'jpg' || fileType !== 'gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
}
}
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
......
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