Skip to content

S
shop-new
提交 80354c13 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '上传图片修改' into test

上级 d27ec43f 75b06ba7
隐藏空白字符变更
内嵌 并排
正在显示 包含 10 行增加 和 10 行删除
dist/index.html
浏览文件 @ 80354c13
......@@ -181,7 +181,7 @@
font-size: 13px;
color: #FFF;
opacity: 0.5;
}</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.93bca109.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.ede1d689.js></script><script src=/static/js/chunk-libs.fa449f45.js></script><script>(function(e){function n(n){for(var t,u,d=n[0],f=n[1],o=n[2],h=0,i=[];h<d.length;h++)u=d[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);k&&k(n);while(i.length)i.shift()();return a.push.apply(a,o||[]),c()}function c(){for(var e,n=0;n<a.length;n++){for(var c=a[n],t=!0,u=1;u<c.length;u++){var d=c[u];0!==r[d]&&(t=!1)}t&&(a.splice(n--,1),e=f(f.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-000b7a4b":"d249cc0c","chunk-0ac82bf3":"1b2ed928","chunk-09052950":"078d226d","chunk-19f84996":"f8b27e68","chunk-1a9115a8":"3a1ef9d8","chunk-22ba4f52":"522ad2f9","chunk-2a78bde0":"88b1e39d","chunk-2d0c741e":"9a348a52","chunk-8e67e28e":"608a790d","chunk-2d0c7ece":"db6ae5e9","chunk-2d0cbf05":"598ccefa","chunk-08486bce":"da48a868","chunk-2d0d67a2":"4507fc81","chunk-2d0f012d":"7a9a98ab","chunk-2d226555":"e093ec60","chunk-4d6e1492":"9ee2e6ee","chunk-0b4a9e9a":"147e2fd8","chunk-2d0e28b6":"2021fa96","chunk-2d22db58":"ad9d664c","chunk-57872cf8":"f6c84669","chunk-5a72892d":"9a50f4fe","chunk-6edc8597":"a9355d9a","chunk-7c2f4fe6":"db0dbf80","chunk-d2bffd5a":"ccf3d5eb","chunk-fa6b139a":"f2ff2d0d"}[e]+".js"}function f(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c={"chunk-000b7a4b":1,"chunk-09052950":1,"chunk-19f84996":1,"chunk-1a9115a8":1,"chunk-22ba4f52":1,"chunk-2a78bde0":1,"chunk-8e67e28e":1,"chunk-4d6e1492":1,"chunk-57872cf8":1,"chunk-5a72892d":1,"chunk-6edc8597":1,"chunk-d2bffd5a":1,"chunk-fa6b139a":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-000b7a4b":"1de74879","chunk-0ac82bf3":"31d6cfe0","chunk-09052950":"adec8750","chunk-19f84996":"268e71da","chunk-1a9115a8":"0e4618dd","chunk-22ba4f52":"c97a649f","chunk-2a78bde0":"752ae0d2","chunk-2d0c741e":"31d6cfe0","chunk-8e67e28e":"3c72d4e5","chunk-2d0c7ece":"31d6cfe0","chunk-2d0cbf05":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0d67a2":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2d226555":"31d6cfe0","chunk-4d6e1492":"e95756df","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-2d22db58":"31d6cfe0","chunk-57872cf8":"9183fc08","chunk-5a72892d":"c379e330","chunk-6edc8597":"70c612a3","chunk-7c2f4fe6":"31d6cfe0","chunk-d2bffd5a":"b3923dfc","chunk-fa6b139a":"fe6be668"}[e]+".css",r=f.p+t,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var o=a[d],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){o=i[d],h=o.getAttribute("data-href");if(h===t||h===r)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||r,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.request=t,delete u[e],k.parentNode.removeChild(k),c(a)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=a);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,f.nc&&h.setAttribute("nonce",f.nc),h.src=d(e),o=function(n){h.onerror=h.onload=null,clearTimeout(i);var c=r[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");a.type=t,a.request=u,c[1](a)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},f.m=e,f.c=t,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)f.d(c,t,function(n){return e[n]}.bind(null,t));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="/",f.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=n,o=o.slice();for(var i=0;i<o.length;i++)n(o[i]);var k=h;c()})([]);</script><script src=/static/js/app.340144db.js></script></body><script>// window.onload = function() {
}</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.93bca109.css rel=stylesheet></head><body><div id=app><div id=loader-wrapper><div id=loader></div><div class="loader-section section-left"></div><div class="loader-section section-right"></div><div class=load_title>正在加载系统资源，请耐心等待</div></div></div><script src=/static/js/chunk-elementUI.ede1d689.js></script><script src=/static/js/chunk-libs.fa449f45.js></script><script>(function(e){function n(n){for(var t,u,d=n[0],f=n[1],o=n[2],h=0,i=[];h<d.length;h++)u=d[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);k&&k(n);while(i.length)i.shift()();return a.push.apply(a,o||[]),c()}function c(){for(var e,n=0;n<a.length;n++){for(var c=a[n],t=!0,u=1;u<c.length;u++){var d=c[u];0!==r[d]&&(t=!1)}t&&(a.splice(n--,1),e=f(f.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-000b7a4b":"d249cc0c","chunk-0ac82bf3":"1b2ed928","chunk-09052950":"078d226d","chunk-19f84996":"f8b27e68","chunk-1a9115a8":"3a1ef9d8","chunk-22ba4f52":"522ad2f9","chunk-2a78bde0":"88b1e39d","chunk-2d0c741e":"9a348a52","chunk-8e67e28e":"608a790d","chunk-2d0c7ece":"db6ae5e9","chunk-2d0cbf05":"598ccefa","chunk-08486bce":"da48a868","chunk-2d0d67a2":"4507fc81","chunk-2d0f012d":"7a9a98ab","chunk-2d226555":"e093ec60","chunk-69b11dc2":"5d6060fe","chunk-0b4a9e9a":"147e2fd8","chunk-2d0e28b6":"2021fa96","chunk-2d22db58":"ad9d664c","chunk-57872cf8":"f6c84669","chunk-5a72892d":"9a50f4fe","chunk-6edc8597":"a9355d9a","chunk-7c2f4fe6":"db0dbf80","chunk-d2bffd5a":"ccf3d5eb","chunk-fa6b139a":"f2ff2d0d"}[e]+".js"}function f(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c={"chunk-000b7a4b":1,"chunk-09052950":1,"chunk-19f84996":1,"chunk-1a9115a8":1,"chunk-22ba4f52":1,"chunk-2a78bde0":1,"chunk-8e67e28e":1,"chunk-69b11dc2":1,"chunk-57872cf8":1,"chunk-5a72892d":1,"chunk-6edc8597":1,"chunk-d2bffd5a":1,"chunk-fa6b139a":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-000b7a4b":"1de74879","chunk-0ac82bf3":"31d6cfe0","chunk-09052950":"adec8750","chunk-19f84996":"268e71da","chunk-1a9115a8":"0e4618dd","chunk-22ba4f52":"c97a649f","chunk-2a78bde0":"752ae0d2","chunk-2d0c741e":"31d6cfe0","chunk-8e67e28e":"3c72d4e5","chunk-2d0c7ece":"31d6cfe0","chunk-2d0cbf05":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0d67a2":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2d226555":"31d6cfe0","chunk-69b11dc2":"6093b689","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-2d22db58":"31d6cfe0","chunk-57872cf8":"9183fc08","chunk-5a72892d":"c379e330","chunk-6edc8597":"70c612a3","chunk-7c2f4fe6":"31d6cfe0","chunk-d2bffd5a":"b3923dfc","chunk-fa6b139a":"fe6be668"}[e]+".css",r=f.p+t,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var o=a[d],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){o=i[d],h=o.getAttribute("data-href");if(h===t||h===r)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||r,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.request=t,delete u[e],k.parentNode.removeChild(k),c(a)},k.href=r;var l=document.getElementsByTagName("head")[0];l.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=a);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,f.nc&&h.setAttribute("nonce",f.nc),h.src=d(e),o=function(n){h.onerror=h.onload=null,clearTimeout(i);var c=r[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");a.type=t,a.request=u,c[1](a)}r[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},f.m=e,f.c=t,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)f.d(c,t,function(n){return e[n]}.bind(null,t));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="/",f.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=n,o=o.slice();for(var i=0;i<o.length;i++)n(o[i]);var k=h;c()})([]);</script><script src=/static/js/app.59f3a1db.js></script></body><script>// window.onload = function() {
// var op = 'open'
// var ssa = window.location.host
// var xhttp = new XMLHttpRequest();
......
dist/static/css/chunk-4d6e1492.e95756df.css → dist/static/css/chunk-69b11dc2.6093b689.css
浏览文件 @ 80354c13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.340144db.js → dist/static/js/app.59f3a1db.js
浏览文件 @ 80354c13
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-4d6e1492.9ee2e6ee.js → dist/static/js/chunk-69b11dc2.5d6060fe.js
浏览文件 @ 80354c13
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 80354c13
......@@ -71,8 +71,8 @@
<el-form-item label="商品图片：" prop="imgs">
<span class="tip-span" style="display: block;line-height: 34px;">
<i style="margin: 10px;">{{ goodsImgFileList.length }} / 7</i>
商品图片最多上传7张，默认第一张为主图
<span style="margin-left: 10px;">主图要求为白底，建议尺寸要求为800*800px，拖拽图片可进行排序</span>
商品图片最多上传7张，默认第一张为主图
<span style="margin-left: 20px;">主图要求为白底，建议尺寸要求为800*800px，拖拽图片可进行排序</span>
</span>
<draggable :list="goodsImgFileList" group="article" class="dragArea" @end="handchange($event)">
<div v-for="(element,index) in goodsImgFileList" :key="index" class="list-complete-item"
......@@ -791,7 +791,7 @@
// 图片是否是正方形 宽高比为 1
file.width = img.width;
file.height = img.height;
let valid = (img.width === 800) && (img.height === 800);
let valid = (img.width >= 800) && (img.height >= 800);
valid ? resolve() : reject();
}
img.src = _URL.createObjectURL(file);
......@@ -799,7 +799,7 @@
return file;
}, () => {
this.$message({
message: '商品图片尺寸必须为800 * 800像素，请重新选择!',
message: '商品图片尺寸为800 * 800px及以上，请重新选择! !',
type: 'warning'
});
return Promise.reject();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论