Skip to content

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

dist冲突，提交

上级 7b72c61d fbeb7628
显示空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 18 行删除
dist.zip
浏览文件 @ 93be27b4
No preview for this file type
dist/index.html
浏览文件 @ 93be27b4
......@@ -181,7 +181,11 @@
font-size: 13px;
color: #FFF;
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,a=n[0],d=n[1],o=n[2],h=0,i=[];h<a.length;h++)u=a[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 f.push.apply(f,o||[]),c()}function c(){for(var e,n=0;n<f.length;n++){for(var c=f[n],t=!0,u=1;u<c.length;u++){var a=c[u];0!==r[a]&&(t=!1)}t&&(f.splice(n--,1),e=d(d.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function a(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-1e735e58":"ec23e7c9","chunk-2bb94dd1":"59879535","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-8c4aad80":"489f4d36","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"0fe88351","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-3fa655f3":"c016b9eb","chunk-25c3b3a2":"42186f8b","chunk-5f18f729":"565ed286","chunk-6c237b40":"54fd57df","chunk-727a03af":"846b7e08","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-c655b3a8":"3995a87d","chunk-f18f73fa":"4162e24b"}[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-1e735e58":1,"chunk-2bb94dd1":1,"chunk-8c4aad80":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-3fa655f3":1,"chunk-25c3b3a2":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-792fc926":1,"chunk-c655b3a8":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-1e735e58":"854b22f7","chunk-2bb94dd1":"08f68e23","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-8c4aad80":"7cb6d25f","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-3fa655f3":"0276f1eb","chunk-25c3b3a2":"55ffd948","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-c655b3a8":"75799628","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,f=document.getElementsByTagName("link"),a=0;a<f.length;a++){var o=f[a],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(a=0;a<i.length;a++){o=i[a],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,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),c(f)},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 f=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,d.nc&&h.setAttribute("nonce",d.nc),h.src=a(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,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,c[1](f)}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.d7641ed0.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,a=n[0],d=n[1],o=n[2],h=0,i=[];h<a.length;h++)u=a[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 f.push.apply(f,o||[]),c()}function c(){for(var e,n=0;n<f.length;n++){for(var c=f[n],t=!0,u=1;u<c.length;u++){var a=c[u];0!==r[a]&&(t=!1)}t&&(f.splice(n--,1),e=d(d.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},f=[];function a(e){return d.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"0189bbe0","chunk-1e735e58":"ec23e7c9","chunk-2bb94dd1":"59879535","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-dcbd9598":"e08d12d9","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"a6625ee5","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-3fa655f3":"c016b9eb","chunk-25c3b3a2":"42186f8b","chunk-5f18f729":"565ed286","chunk-6c237b40":"54fd57df","chunk-727a03af":"846b7e08","chunk-792fc926":"e9e04949","chunk-7c2f4fe6":"33c37f8e","chunk-c655b3a8":"3995a87d","chunk-f18f73fa":"4162e24b"}[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-1e735e58":1,"chunk-2bb94dd1":1,"chunk-dcbd9598":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-3fa655f3":1,"chunk-25c3b3a2":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-727a03af":1,"chunk-792fc926":1,"chunk-c655b3a8":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-1e735e58":"854b22f7","chunk-2bb94dd1":"08f68e23","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-dcbd9598":"2fc0dad0","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-3fa655f3":"0276f1eb","chunk-25c3b3a2":"55ffd948","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-727a03af":"06132cc6","chunk-792fc926":"5818f70b","chunk-7c2f4fe6":"31d6cfe0","chunk-c655b3a8":"75799628","chunk-f18f73fa":"0615606c"}[e]+".css",r=d.p+t,f=document.getElementsByTagName("link"),a=0;a<f.length;a++){var o=f[a],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===r))return n()}var i=document.getElementsByTagName("style");for(a=0;a<i.length;a++){o=i[a],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,f=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");f.request=t,delete u[e],k.parentNode.removeChild(k),c(f)},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 f=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=f);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,d.nc&&h.setAttribute("nonce",d.nc),h.src=a(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,f=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");f.type=t,f.request=u,c[1](f)}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.88ca490a.js></script></body><script>window.onload = function() {
>>>>>>> master_fix_1025
var op = 'open'
var ssa = window.location.host
var xhttp = new XMLHttpRequest();
......@@ -203,8 +207,14 @@
}
}
};
<<<<<<< HEAD
// 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", 'http://192.168.26.179:6601/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", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
>>>>>>> master_fix_1025
xhttp.send();
}</script></html>
\ No newline at end of file
dist/static/css/chunk-8c4aad80.7cb6d25f.css
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-dcbd9598.2fc0dad0.css 0 → 100644
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.88ca490a.js 0 → 100644
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-dcbd9598.e08d12d9.js 0 → 100644
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
浏览文件 @ 93be27b4
......@@ -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", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
// xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send();
}
</script>
......
src/api/webSite.js
浏览文件 @ 93be27b4
......@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取渠道id
export function indexInfo(params) {
return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
// url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get',
params
......@@ -13,8 +13,8 @@ export function indexInfo(params) {
// 获取所有域名
export function getdomain(params) {
return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
// url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get',
params
......@@ -23,8 +23,8 @@ export function getdomain(params) {
// 获取官网设置接口
export function webSite(params) {
return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
// url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get',
params
......@@ -34,8 +34,8 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) {
return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
// url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get',
params
......@@ -44,8 +44,8 @@ export function getallCloudList(params) {
//获取sso域名
export function getssoUrl(data) {
return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/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: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get',
params: data
......
src/views/entry/fillBrandInf.vue
浏览文件 @ 93be27b4
......@@ -375,7 +375,7 @@
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
upLoadImg(data).then((res) => {
if (res.code === 1){
if (res.code == 1){
this.factoryImgFileList.push({'url':res.data.image_url});
this.$message({type:'success',message:'上传成功'});
} else {
......@@ -639,7 +639,7 @@
});
}else {
upBrands(toArrBrandForm).then(res => {
if(res.code === 1) {
if(res.code == 1) {
this.$router.push("/fillShopInf");
}else {
this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
......
src/views/entry/fillMainInf.vue
浏览文件 @ 93be27b4
......@@ -523,7 +523,7 @@
this.$refs[form].validate((valid) => {
if (valid) {
addMain(this.mainForm).then(res => {
if(res == 1) {
if(res.code == 1) {
this.$router.push("/fillBrandInf");
}else {
this.$message({type:'error',message:res.message ? res.message : '操作失败'});
......
src/views/entry/fillShopInf.vue
浏览文件 @ 93be27b4
......@@ -328,7 +328,7 @@
this.Base64img = result[1];
let data = {"img_data":this.Base64img};
upLoadImg(data).then((res) => {
if(res.code === 1){
if(res.code == 1){
this.businessImgFileList.push({'url':res.data.image_url});
this.$message({type:'success',message:'上传成功'});
this.$refs.storeForm.clearValidate('business_auth');
......@@ -418,7 +418,7 @@
this.$refs[formName].validate((valid) => {
if(valid) {
addShopInf(this.storeForm).then(res => {
if(res.code === 1){
if(res.code == 1){
this.$router.push("/reviewing");
}else {
this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论