Skip to content

S
shop-new
提交 828d877c authored 作者: 郑伟娜's avatar 郑伟娜
浏览文件
操作

Merge branch 'oem3.2' into test 

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-423475c9.aa1f1b5b.css
#	dist/static/css/chunk-ad7b25a2.f5a2a79b.css
#	dist/static/css/chunk-dcbd9598.2fc0dad0.css
#	dist/static/js/app.35a05b52.js
#	dist/static/js/chunk-423475c9.3ca5e64c.js
#	dist/static/js/chunk-ad7b25a2.72e154ee.js
#	dist/static/js/chunk-dcbd9598.e08d12d9.js
上级 98c27ad0 af189fd9
显示空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 1 行删除
dist.zip
浏览文件 @ 828d877c
No preview for this file type
dist/index.html
浏览文件 @ 828d877c
......@@ -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-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-423475c9":"3ca5e64c","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"0fe88351","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-25c3b3a2":"42186f8b","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":"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-423475c9":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-25c3b3a2":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-1e735e58":"854b22f7","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-423475c9":"aa1f1b5b","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-25c3b3a2":"55ffd948","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,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.d21bffc6.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-1e735e58":"ec23e7c9","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-ad7b25a2":"72e154ee","chunk-68d5bf9e":"05315b0a","chunk-2d0d67a2":"2a791f8c","chunk-08486bce":"a6625ee5","chunk-2d0f012d":"c5cdd7ec","chunk-2f2393fa":"ea5c9cee","chunk-25c3b3a2":"42186f8b","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":"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-ad7b25a2":1,"chunk-68d5bf9e":1,"chunk-2f2393fa":1,"chunk-25c3b3a2":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-1e735e58":"854b22f7","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-ad7b25a2":"f5a2a79b","chunk-68d5bf9e":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-08486bce":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2f2393fa":"ca8aeaeb","chunk-25c3b3a2":"55ffd948","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.35a05b52.js></script></body><script>window.onload = function() {
>>>>>>> oem3.2
var op = 'open'
var ssa = window.location.host
var xhttp = new XMLHttpRequest();
......
dist/static/css/chunk-ad7b25a2.f5a2a79b.css 0 → 100644
浏览文件 @ 828d877c
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.35a05b52.js 0 → 100644
浏览文件 @ 828d877c
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-423475c9.3ca5e64c.js
浏览文件 @ 828d877c
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-ad7b25a2.72e154ee.js 0 → 100644
浏览文件 @ 828d877c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/system/user.js
浏览文件 @ 828d877c
......@@ -136,3 +136,11 @@ export function importTemplate() {
method: 'get'
})
}
export function getBaseSettingTitle(params) {
return request({
url: '/system/oem/getBaseSettingTitle',
method: 'get',
params
})
}
src/permission.js
浏览文件 @ 828d877c
......@@ -4,6 +4,9 @@ import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import getPageTitle from '@/utils/get-page-title'
getPageTitle()
NProgress.configure({ showSpinner: false })
......
src/utils/get-page-title.js 0 → 100644
浏览文件 @ 828d877c
import defaultSettings from '@/settings'
import { getBaseSettingTitle } from '@/api/system/user'
const title = defaultSettings.title || '胜天半子'
export default function getPageTitle() {
getBaseSettingTitle({ type: 'SHOP' }).then(res => {
if (res.code == 1) {
document.title = res.data
}
})
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论