Skip to content

S
shop-new
提交 1ad8a812 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

Merge branch 'master_edit_goods_30_2204' into test 

# Conflicts:
#	dist/index.html
上级 e2c85b4b e79bc1ab
显示空白字符变更
内嵌 并排
正在显示 包含 61 行增加 和 15 行删除
dist.zip
浏览文件 @ 1ad8a812
No preview for this file type
dist/index.html
浏览文件 @ 1ad8a812
...@@ -181,7 +181,11 @@ ...@@ -181,7 +181,11 @@
font-size: 13px; font-size: 13px;
color: #FFF; color: #FFF;
opacity: 0.5; opacity: 0.5;
<<<<<<< HEAD
}</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.62dc0ccb.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.c1dc07ee.js></script><script src=/static/js/chunk-libs.50d3d7f1.js></script><script>(function(e){function n(n){for(var t,u,f=n[0],d=n[1],o=n[2],h=0,i=[];h<f.length;h++)u=f[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[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 f=c[u];0!==r[f]&&(t=!1)}t&&(a.splice(n--,1),e=d(d.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-602302a4":"c928c846","chunk-b0d57d44":"7843fcc1","chunk-2d0d67a2":"2a791f8c","chunk-779f4447":"34632000","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-25c3b3a2":"42186f8b","chunk-5e8a801a":"6583c205","chunk-5f18f729":"565ed286","chunk-6b92f9cd":"03796aea","chunk-6c237b40":"54fd57df","chunk-727a03af":"846b7e08","chunk-78e7b944":"abc3f175","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-d563c6a8":"6cb5ae95","chunk-f18f73fa":"87143ed9"}[e]+".js"}function d(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,d),c.l=!0,c.exports}d.e=function(e){var n=[],c={"chunk-0a90d205":1,"chunk-602302a4":1,"chunk-b0d57d44":1,"chunk-2f2393fa":1,"chunk-25c3b3a2":1,"chunk-5e8a801a":1,"chunk-5f18f729":1,"chunk-6b92f9cd":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-78e7b944":1,"chunk-792fc926":1,"chunk-d563c6a8":1,"chunk-f18f73fa":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-0a90d205":"9183fc08","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-602302a4":"e6549bbe","chunk-b0d57d44":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-779f4447":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-25c3b3a2":"55ffd948","chunk-5e8a801a":"a8bf16e8","chunk-5f18f729":"c9a455ad","chunk-6b92f9cd":"35744973","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-78e7b944":"ef8037a3","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-d563c6a8":"77012854","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var o=a[f],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(f=0;f<i.length;f++){o=i[f],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,d.nc&&h.setAttribute("nonce",d.nc),h.src=f(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)},d.m=e,d.c=t,d.d=function(e,n,c){d.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,n){if(1&n&&(e=d(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(d.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)d.d(c,t,function(n){return e[n]}.bind(null,t));return c},d.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return d.d(n,"a",n),n},d.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},d.p="/",d.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.61048e91.js></script></body><script>window.onload = function() { }</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.62dc0ccb.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.c1dc07ee.js></script><script src=/static/js/chunk-libs.50d3d7f1.js></script><script>(function(e){function n(n){for(var t,u,f=n[0],d=n[1],o=n[2],h=0,i=[];h<f.length;h++)u=f[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[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 f=c[u];0!==r[f]&&(t=!1)}t&&(a.splice(n--,1),e=d(d.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-602302a4":"c928c846","chunk-b0d57d44":"7843fcc1","chunk-2d0d67a2":"2a791f8c","chunk-779f4447":"34632000","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-25c3b3a2":"42186f8b","chunk-5e8a801a":"6583c205","chunk-5f18f729":"565ed286","chunk-6b92f9cd":"03796aea","chunk-6c237b40":"54fd57df","chunk-727a03af":"846b7e08","chunk-78e7b944":"abc3f175","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-d563c6a8":"6cb5ae95","chunk-f18f73fa":"87143ed9"}[e]+".js"}function d(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,d),c.l=!0,c.exports}d.e=function(e){var n=[],c={"chunk-0a90d205":1,"chunk-602302a4":1,"chunk-b0d57d44":1,"chunk-2f2393fa":1,"chunk-25c3b3a2":1,"chunk-5e8a801a":1,"chunk-5f18f729":1,"chunk-6b92f9cd":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-78e7b944":1,"chunk-792fc926":1,"chunk-d563c6a8":1,"chunk-f18f73fa":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-0a90d205":"9183fc08","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-602302a4":"e6549bbe","chunk-b0d57d44":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-779f4447":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-25c3b3a2":"55ffd948","chunk-5e8a801a":"a8bf16e8","chunk-5f18f729":"c9a455ad","chunk-6b92f9cd":"35744973","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-78e7b944":"ef8037a3","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-d563c6a8":"77012854","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var o=a[f],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(f=0;f<i.length;f++){o=i[f],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,d.nc&&h.setAttribute("nonce",d.nc),h.src=f(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)},d.m=e,d.c=t,d.d=function(e,n,c){d.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,n){if(1&n&&(e=d(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(d.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)d.d(c,t,function(n){return e[n]}.bind(null,t));return c},d.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return d.d(n,"a",n),n},d.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},d.p="/",d.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.61048e91.js></script></body><script>window.onload = function() {
=======
}</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.62dc0ccb.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.c1dc07ee.js></script><script src=/static/js/chunk-libs.50d3d7f1.js></script><script>(function(e){function n(n){for(var t,u,f=n[0],d=n[1],o=n[2],h=0,i=[];h<f.length;h++)u=f[h],r[u]&&i.push(r[u][0]),r[u]=0;for(t in d)Object.prototype.hasOwnProperty.call(d,t)&&(e[t]=d[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 f=c[u];0!==r[f]&&(t=!1)}t&&(a.splice(n--,1),e=d(d.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},a=[];function f(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-602302a4":"f51df48d","chunk-b0d57d44":"7843fcc1","chunk-2d0d67a2":"2a791f8c","chunk-779f4447":"d38b8e9c","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-25c3b3a2":"42186f8b","chunk-5e8a801a":"6583c205","chunk-5f18f729":"565ed286","chunk-6b92f9cd":"03796aea","chunk-6c237b40":"54fd57df","chunk-727a03af":"846b7e08","chunk-78e7b944":"abc3f175","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-d563c6a8":"6cb5ae95","chunk-f18f73fa":"87143ed9"}[e]+".js"}function d(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,d),c.l=!0,c.exports}d.e=function(e){var n=[],c={"chunk-0a90d205":1,"chunk-602302a4":1,"chunk-b0d57d44":1,"chunk-2f2393fa":1,"chunk-25c3b3a2":1,"chunk-5e8a801a":1,"chunk-5f18f729":1,"chunk-6b92f9cd":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-78e7b944":1,"chunk-792fc926":1,"chunk-d563c6a8":1,"chunk-f18f73fa":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-0a90d205":"9183fc08","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-602302a4":"e6549bbe","chunk-b0d57d44":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-779f4447":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-25c3b3a2":"55ffd948","chunk-5e8a801a":"a8bf16e8","chunk-5f18f729":"c9a455ad","chunk-6b92f9cd":"35744973","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-78e7b944":"ef8037a3","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-d563c6a8":"77012854","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,a=document.getElementsByTagName("link"),f=0;f<a.length;f++){var o=a[f],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(f=0;f<i.length;f++){o=i[f],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,d.nc&&h.setAttribute("nonce",d.nc),h.src=f(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)},d.m=e,d.c=t,d.d=function(e,n,c){d.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},d.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.t=function(e,n){if(1&n&&(e=d(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(d.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)d.d(c,t,function(n){return e[n]}.bind(null,t));return c},d.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return d.d(n,"a",n),n},d.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},d.p="/",d.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.e2582751.js></script></body><script>window.onload = function() {
>>>>>>> master_edit_goods_30_2204
var op = 'open' var op = 'open'
var ssa = window.location.host var ssa = window.location.host
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
...@@ -205,6 +209,10 @@ ...@@ -205,6 +209,10 @@
}; };
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境 // xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发 // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
<<<<<<< HEAD
xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境 xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
=======
// xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
>>>>>>> master_edit_goods_30_2204
xhttp.send(); xhttp.send();
}</script></html> }</script></html>
\ No newline at end of file
dist/static/js/app.e2582751.js 0 → 100644
浏览文件 @ 1ad8a812
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-602302a4.f51df48d.js 0 → 100644
浏览文件 @ 1ad8a812
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-779f4447.d38b8e9c.js 0 → 100644
浏览文件 @ 1ad8a812
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-779f4447"],{"1e8b":function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[s("el-form-item",{attrs:{label:"用户昵称",prop:"user_nickname"}},[s("el-input",{model:{value:e.user.user_nickname,callback:function(t){e.$set(e.user,"user_nickname",t)},expression:"user.user_nickname"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"手机号码",prop:"mobile"}},[s("el-input",{attrs:{maxlength:"11"},model:{value:e.user.mobile,callback:function(t){e.$set(e.user,"mobile",t)},expression:"user.mobile"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"邮箱",prop:"user_email"}},[s("el-input",{attrs:{maxlength:"50"},model:{value:e.user.user_email,callback:function(t){e.$set(e.user,"user_email",t)},expression:"user.user_email"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"性别"}},[s("el-radio-group",{model:{value:e.user.sex,callback:function(t){e.$set(e.user,"sex",t)},expression:"user.sex"}},[s("el-radio",{attrs:{label:0}},[e._v("保密")]),e._v(" "),s("el-radio",{attrs:{label:1}},[e._v("男")]),e._v(" "),s("el-radio",{attrs:{label:2}},[e._v("女")])],1)],1),e._v(" "),s("el-form-item",[s("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),s("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=s("c0c7"),o={props:{user:{type:Object}},data:function(){return{rules:{user_nickname:[{required:!0,message:"用户昵称不能为空",trigger:"blur"}],user_email:[{required:!0,message:"邮箱地址不能为空",trigger:"blur"},{type:"email",message:"'请输入正确的邮箱地址",trigger:["blur","change"]}],mobile:[{required:!0,message:"手机号码不能为空",trigger:"blur"},{pattern:/^1[3|4|5|6|7|8|9][0-9]\d{8}$/,message:"请输入正确的手机号码",trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["m"])(e.user).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},l=o,n=s("2877"),u=Object(n["a"])(l,r,a,!1,null,null,null);t["default"]=u.exports},"4c1b":function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{staticClass:"app-container"},[s("el-row",{attrs:{gutter:20}},[s("el-col",{attrs:{span:6,xs:24}},[s("el-card",{staticClass:"box-card"},[s("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[s("span",[e._v("个人信息")])]),e._v(" "),s("div",[s("div",{staticClass:"text-center"},[s("userAvatar",{attrs:{user:e.user}})],1),e._v(" "),s("ul",{staticClass:"list-group list-group-striped"},[s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"user"}}),e._v("用户名称\n "),s("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_name))])],1),e._v(" "),s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"phone"}}),e._v("手机号码\n "),s("div",{staticClass:"pull-right"},[e._v(e._s(e.user.mobile))])],1),e._v(" "),s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"email"}}),e._v("用户邮箱\n "),s("div",{staticClass:"pull-right"},[e._v(e._s(e.user.user_email))])],1),e._v(" "),s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"tree"}}),e._v("所属部门\n "),e.user.dept_info?s("div",{staticClass:"pull-right"},[e._v(e._s(e.user.dept_info.deptName)+" / "+e._s(e.postGroup))]):e._e()],1),e._v(" "),s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"peoples"}}),e._v("所属角色\n "),s("div",{staticClass:"pull-right"},[e._v(e._s(e.roleGroup))])],1),e._v(" "),s("li",{staticClass:"list-group-item"},[s("svg-icon",{attrs:{"icon-class":"date"}}),e._v("创建日期\n "),s("div",{staticClass:"pull-right"},[e._v(e._s(e.parseTime(e.user.create_time)))])],1)])])])],1),e._v(" "),s("el-col",{attrs:{span:18,xs:24}},[s("el-card",[s("div",{staticClass:"clearfix",attrs:{slot:"header"},slot:"header"},[s("span",[e._v("基本资料")])]),e._v(" "),s("el-tabs",{model:{value:e.activeTab,callback:function(t){e.activeTab=t},expression:"activeTab"}},[s("el-tab-pane",{attrs:{label:"基本资料",name:"userinfo"}},[s("userInfo",{attrs:{user:e.user}})],1),e._v(" "),s("el-tab-pane",{attrs:{label:"修改密码",name:"resetPwd"}},[s("resetPwd",{attrs:{user:e.user}})],1)],1)],1)],1)],1)],1)},a=[],i=(s("7f7f"),s("9429")),o=s("1e8b"),l=s("ee46"),n=s("c0c7"),u={name:"Profile",components:{userAvatar:i["default"],userInfo:o["default"],resetPwd:l["default"]},data:function(){return{user:{},activeTab:"userinfo"}},created:function(){this.getUser()},computed:{postGroup:function(){return Array.isArray(this.user.posts)?this.user.posts.reduce((function(e,t,s,r){return e+t.post_name+" "}),""):""},roleGroup:function(){return Array.isArray(this.user.roles)?this.user.roles.reduce((function(e,t,s,r){return e+t.name+" "}),""):""}},methods:{getUser:function(){var e=this;Object(n["h"])().then((function(t){e.user=t.data}))}}},c=u,p=s("2877"),d=Object(p["a"])(c,r,a,!1,null,null,null);t["default"]=d.exports},9429:function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",[s("img",{staticClass:"img-circle img-lg",attrs:{src:e.options.img,title:"点击上传头像"},on:{click:function(t){return e.editCropper()}}}),e._v(" "),s("el-dialog",{attrs:{title:e.title,visible:e.open,width:"800px","append-to-body":""},on:{"update:visible":function(t){e.open=t}}},[s("el-row",[s("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[s("vue-cropper",{ref:"cropper",attrs:{img:e.options.img,info:!0,autoCrop:e.options.autoCrop,autoCropWidth:e.options.autoCropWidth,autoCropHeight:e.options.autoCropHeight,fixedBox:e.options.fixedBox},on:{realTime:e.realTime}})],1),e._v(" "),s("el-col",{style:{height:"350px"},attrs:{xs:24,md:12}},[s("div",{staticClass:"avatar-upload-preview"},[s("img",{style:e.previews.img,attrs:{src:e.previews.url}})])])],1),e._v(" "),s("br"),e._v(" "),s("el-row",[s("el-col",{attrs:{lg:2,md:2}},[s("el-upload",{attrs:{action:"#","http-request":e.requestUpload,"show-file-list":!1,"before-upload":e.beforeUpload}},[s("el-button",{attrs:{size:"small"}},[e._v("\n 上传\n "),s("i",{staticClass:"el-icon-upload el-icon--right"})])],1)],1),e._v(" "),s("el-col",{attrs:{lg:{span:1,offset:2},md:2}},[s("el-button",{attrs:{icon:"el-icon-plus",size:"small"},on:{click:function(t){return e.changeScale(1)}}})],1),e._v(" "),s("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[s("el-button",{attrs:{icon:"el-icon-minus",size:"small"},on:{click:function(t){return e.changeScale(-1)}}})],1),e._v(" "),s("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[s("el-button",{attrs:{icon:"el-icon-refresh-left",size:"small"},on:{click:function(t){return e.rotateLeft()}}})],1),e._v(" "),s("el-col",{attrs:{lg:{span:1,offset:1},md:2}},[s("el-button",{attrs:{icon:"el-icon-refresh-right",size:"small"},on:{click:function(t){return e.rotateRight()}}})],1),e._v(" "),s("el-col",{attrs:{lg:{span:2,offset:6},md:2}},[s("el-button",{attrs:{type:"primary",size:"small"},on:{click:function(t){return e.uploadImg()}}},[e._v("提 交")])],1)],1)],1)],1)},a=[],i=s("ade3"),o=s("4360"),l=s("7e79"),n=s("c0c7"),u={components:{VueCropper:l["VueCropper"]},props:{user:{type:Object}},data:function(){var e;return{open:!1,title:"修改头像",options:(e={img:o["a"].getters.avatar},Object(i["a"])(e,"img",""),Object(i["a"])(e,"autoCrop",!0),Object(i["a"])(e,"autoCropWidth",200),Object(i["a"])(e,"autoCropHeight",200),Object(i["a"])(e,"fixedBox",!0),e),previews:{}}},methods:{editCropper:function(){this.open=!0},requestUpload:function(){},rotateLeft:function(){this.$refs.cropper.rotateLeft()},rotateRight:function(){this.$refs.cropper.rotateRight()},changeScale:function(e){e=e||1,this.$refs.cropper.changeScale(e)},beforeUpload:function(e){var t=this;if(-1==e.type.indexOf("image/"))this.msgError("文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。");else{var s=new FileReader;s.readAsDataURL(e),s.onload=function(){t.options.img=s.result}}},uploadImg:function(){var e=this;this.$refs.cropper.getCropBlob((function(t){var s=t.type,r={"image/jpeg":"jpeg","image/png":"png"},a="temp.jpg";r[s]&&(a="temp."+r[s]);var i=new FormData;i.append("avatarfile",t,a),Object(n["o"])(i).then((function(t){0===t.code?(e.open=!1,e.options.img="/api/v1/"+t.data.fileInfo.fileUrl,e.msgSuccess("修改成功")):e.msgError(t.msg),e.$refs.cropper.clearCrop()}))}))},realTime:function(e){this.previews=e},setAvatarBase64:function(e,t){var s=this,r=new Image;r.src=e+"?v="+Math.random(),r.crossOrigin="*",r.onload=function(){var e=s.transBase64FromImage(r);t&&t(e)}},transBase64FromImage:function(e){var t=document.createElement("canvas");t.width=e.width,t.height=e.height;var s=t.getContext("2d");return s.drawImage(e,0,0,e.width,e.height),t.toDataURL("image/png")}},watch:{user:function(e){var t=this;e.avatar&&this.setAvatarBase64("/api/v1/"+e.avatar,(function(e){t.options.img=e}))}}},c=u,p=s("2877"),d=Object(p["a"])(c,r,a,!1,null,null,null);t["default"]=d.exports},ee46:function(e,t,s){"use strict";s.r(t);var r=function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("el-form",{ref:"form",attrs:{model:e.user,rules:e.rules,"label-width":"80px"}},[s("el-form-item",{attrs:{label:"旧密码",prop:"oldPassword"}},[s("el-input",{attrs:{placeholder:"请输入旧密码",type:"password"},model:{value:e.user.oldPassword,callback:function(t){e.$set(e.user,"oldPassword",t)},expression:"user.oldPassword"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"新密码",prop:"newPassword"}},[s("el-input",{attrs:{placeholder:"请输入新密码",type:"password"},model:{value:e.user.newPassword,callback:function(t){e.$set(e.user,"newPassword",t)},expression:"user.newPassword"}})],1),e._v(" "),s("el-form-item",{attrs:{label:"确认密码",prop:"confirmPassword"}},[s("el-input",{attrs:{placeholder:"请确认密码",type:"password"},model:{value:e.user.confirmPassword,callback:function(t){e.$set(e.user,"confirmPassword",t)},expression:"user.confirmPassword"}})],1),e._v(" "),s("el-form-item",[s("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.submit}},[e._v("保存")]),e._v(" "),s("el-button",{attrs:{type:"danger",size:"mini"},on:{click:e.close}},[e._v("关闭")])],1)],1)},a=[],i=s("c0c7"),o={data:function(){var e=this,t=function(t,s,r){e.user.newPassword!==s?r(new Error("两次输入的密码不一致")):r()};return{test:"1test",user:{oldPassword:void 0,newPassword:void 0,confirmPassword:void 0},rules:{oldPassword:[{required:!0,message:"旧密码不能为空",trigger:"blur"}],newPassword:[{required:!0,message:"新密码不能为空",trigger:"blur"},{min:6,max:20,message:"长度在 6 到 20 个字符",trigger:"blur"}],confirmPassword:[{required:!0,message:"确认密码不能为空",trigger:"blur"},{required:!0,validator:t,trigger:"blur"}]}}},methods:{submit:function(){var e=this;this.$refs["form"].validate((function(t){t&&Object(i["n"])(e.user.oldPassword,e.user.newPassword).then((function(t){0===t.code?e.msgSuccess("修改成功"):e.msgError(t.msg)}))}))},close:function(){this.$store.dispatch("tagsView/delView",this.$route),this.$router.push({path:"/index"})}}},l=o,n=s("2877"),u=Object(n["a"])(l,r,a,!1,null,null,null);t["default"]=u.exports}}]);
\ No newline at end of file
public/index.html
浏览文件 @ 1ad8a812
...@@ -227,9 +227,9 @@ ...@@ -227,9 +227,9 @@
} }
} }
}; };
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境 xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发 // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境 // xhttp.open("GET", '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send(); xhttp.send();
} }
</script> </script>
......
src/api/webSite.js
浏览文件 @ 1ad8a812
...@@ -3,8 +3,8 @@ import request from '@/utils/request' ...@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取渠道id // 获取渠道id
export function indexInfo(params) { export function indexInfo(params) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel', url: '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel', // url: '//192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel', // url: '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get', method: 'get',
params params
...@@ -13,8 +13,8 @@ export function indexInfo(params) { ...@@ -13,8 +13,8 @@ export function indexInfo(params) {
// 获取所有域名 // 获取所有域名
export function getdomain(params) { export function getdomain(params) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/channel/domainFront', url: '//sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: '//192.168.26.179:6601/api/v1/oem/channel/domainFront', // url: '//192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: '//newsys.jxhh.com/api/v1/oem/channel/domainFront', // url: '//newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get', method: 'get',
params params
...@@ -23,8 +23,8 @@ export function getdomain(params) { ...@@ -23,8 +23,8 @@ export function getdomain(params) {
// 获取官网设置接口 // 获取官网设置接口
export function webSite(params) { export function webSite(params) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/common/counsel', url: '//sysapi.jxhh.com/api/v1/oem/common/counsel',
url: '//192.168.26.179:6601/api/v1/oem/common/counsel', // url: '//192.168.26.179:6601/api/v1/oem/common/counsel',
// url: '//newsys.jxhh.com/api/v1/oem/common/counsel', // url: '//newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get', method: 'get',
params params
...@@ -34,8 +34,8 @@ export function webSite(params) { ...@@ -34,8 +34,8 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) { export function getallCloudList(params) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/front/CloudList', url: '//sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: '//192.168.26.179:6601/api/v1/oem/front/CloudList', // url: '//192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: '//newsys.jxhh.com/api/v1/oem/front/CloudList', // url: '//newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get', method: 'get',
params params
...@@ -44,8 +44,8 @@ export function getallCloudList(params) { ...@@ -44,8 +44,8 @@ export function getallCloudList(params) {
//获取sso域名 //获取sso域名
export function getssoUrl(data) { export function getssoUrl(data) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel', url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel', // url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: '//newsys.jxhh.com/api/v1/oem/webSite/ssoChannel', // url: '//newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get', method: 'get',
params: data params: data
......
src/views/entry/newyuncang.vue
浏览文件 @ 1ad8a812
...@@ -644,7 +644,11 @@ ...@@ -644,7 +644,11 @@
// 获取渠道id // 获取渠道id
getIndexInfo() { getIndexInfo() {
let op = 'open' let op = 'open'
let ssa = window.location.host if(window.location.hostname=='localhost'){
var ssa = 'www.stbz.net'
}else{
var ssa = window.location.host
}
const data = { const data = {
// domain: 'newsys.jxhh.com', // domain: 'newsys.jxhh.com',
domain: ssa, domain: ssa,
......
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 1ad8a812
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<el-form-item label='商品标题：' prop="goods_name"> <el-form-item label='商品标题：' prop="goods_name">
<el-input v-model="goodsInfoForm.goods_name" placeholder="请输入商品标题" style="width:420px;"></el-input> <el-input v-model="goodsInfoForm.goods_name" placeholder="请输入商品标题" style="width:420px;"></el-input>
<span class="tip-span ml20">商品名称限制在30字以内，不要填写与商品无关的词</span> <span class="tip-span ml20">商品名称限制在50字以内，不要填写与商品无关的词</span>
</el-form-item> </el-form-item>
<el-form-item label='商品关键词：' prop="goods_des"> <el-form-item label='商品关键词：' prop="goods_des">
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
categoryStr: [{required: true, message: '商品分类不能为空', trigger: 'blur'}], categoryStr: [{required: true, message: '商品分类不能为空', trigger: 'blur'}],
goods_name: [ goods_name: [
{required: true, message: '请输入商品名称', trigger: 'blur'}, {required: true, message: '请输入商品名称', trigger: 'blur'},
{min: 3, max: 30, message: '商品标题限制在3字符以上，30个字符以下', trigger: 'blur'} {min: 3, max: 50, message: '商品标题限制在3字符以上，50个字符以下', trigger: 'blur'}
], ],
// goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}], // goods_des: [{required: true, validator: goodsDecCheck, trigger: 'blur'}],
// producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}], // producing_area:[{required: true, message: '请选择商品产地', trigger: 'change'}],
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论