Skip to content

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

Merge branch 'del-bearer' into test 

# Conflicts:
#	dist/index.html
#	dist/static/css/chunk-1d113f47.71e93061.css
#	dist/static/css/chunk-5c8fee3e.62a5c943.css
#	dist/static/css/chunk-8defeec4.2da2e661.css
#	dist/static/js/app.ac275d5a.js
#	dist/static/js/chunk-5c8fee3e.270ae157.js
上级 8ac4a3da 4f1b9170
显示空白字符变更
内嵌 并排
正在显示 包含 59 行增加 和 7 行删除
dist.zip
浏览文件 @ 1b0c2b32
No preview for this file type
dist/index.html
浏览文件 @ 1b0c2b32
......@@ -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.8c274c95.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.e19103bf.js></script><script src=/static/js/chunk-libs.afedb25b.js></script><script>(function(e){function n(n){for(var t,u,a=n[0],f=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 f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);k&&k(n);while(i.length)i.shift()();return d.push.apply(d,o||[]),c()}function c(){for(var e,n=0;n<d.length;n++){for(var c=d[n],t=!0,u=1;u<c.length;u++){var a=c[u];0!==r[a]&&(t=!1)}t&&(d.splice(n--,1),e=f(f.s=c[0]))}return e}var t={},u={runtime:0},r={runtime:0},d=[];function a(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-0a90d205":"ed4c9710","chunk-1b9ca1bf":"fa1e66dc","chunk-2810acda":"80f44c16","chunk-2d0c7ece":"45001674","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"d0af0990","chunk-2d0e28b6":"1306f738","chunk-47c51416":"42d1d71b","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-1d113f47":"66539c46","chunk-b0d57d44":"a672684b","chunk-2d0d67a2":"2faff61e","chunk-779f4447":"d66be21c","chunk-2d0f012d":"c5cdd7ec","chunk-2d22db58":"15b71c1c","chunk-30c771e6":"59ddde5c","chunk-41dc9244":"535abbab","chunk-07e45201":"4a036617","chunk-5168c511":"99d5aecf","chunk-5be5b3e2":"ed33c35c","chunk-5f18f729":"91b8ccb6","chunk-6c237b40":"c1d15112","chunk-7c2f4fe6":"e0382123","chunk-f18f73fa":"0e982fdb","chunk-fbeba9ea":"28a19b15"}[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-0a90d205":1,"chunk-1b9ca1bf":1,"chunk-2810acda":1,"chunk-1d113f47":1,"chunk-b0d57d44":1,"chunk-30c771e6":1,"chunk-41dc9244":1,"chunk-07e45201":1,"chunk-5168c511":1,"chunk-5be5b3e2":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-f18f73fa":1,"chunk-fbeba9ea":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-1b9ca1bf":"e539ec29","chunk-2810acda":"6485bf58","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-47c51416":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-1d113f47":"71e93061","chunk-b0d57d44":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-779f4447":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2d22db58":"31d6cfe0","chunk-30c771e6":"6ab5ebe0","chunk-41dc9244":"d0adca96","chunk-07e45201":"2123e5ba","chunk-5168c511":"d3829422","chunk-5be5b3e2":"1d48f9b5","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-7c2f4fe6":"31d6cfe0","chunk-f18f73fa":"0615606c","chunk-fbeba9ea":"a3da7543"}[e]+".css",r=f.p+t,d=document.getElementsByTagName("link"),a=0;a<d.length;a++){var o=d[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,d=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");d.request=t,delete u[e],k.parentNode.removeChild(k),c(d)},k.href=r;var b=document.getElementsByTagName("head")[0];b.appendChild(k)})).then((function(){u[e]=0})));var t=r[e];if(0!==t)if(t)n.push(t[2]);else{var d=new Promise((function(n,c){t=r[e]=[n,c]}));n.push(t[2]=d);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,f.nc&&h.setAttribute("nonce",f.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,d=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");d.type=t,d.request=u,c[1](d)}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.a74a33e0.js></script></body><script>window.onload = function() {
=======
}</style><link href=/static/css/chunk-libs.144811ca.css rel=stylesheet><link href=/static/css/app.018ae2b6.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,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-0a90d205":"0189bbe0","chunk-2810acda":"eb60835a","chunk-2d0c7ece":"6e0c231b","chunk-2d0c84d3":"cdf8b2d0","chunk-0b4a9e9a":"82347d9f","chunk-2d0e28b6":"b5c279ef","chunk-54b56470":"f476669a","chunk-2d0d6345":"e4d18775","chunk-2d0e2366":"13651a23","chunk-5c8fee3e":"270ae157","chunk-b0d57d44":"7843fcc1","chunk-2d0d67a2":"2a791f8c","chunk-779f4447":"d38b8e9c","chunk-2d0f012d":"c5cdd7ec","chunk-2d22db58":"4991ac92","chunk-30c771e6":"dbb74e24","chunk-41dc9244":"f15022e4","chunk-5168c511":"90581123","chunk-07e45201":"d5aafa30","chunk-5be5b3e2":"1bcac1ef","chunk-5f18f729":"565ed286","chunk-6c237b40":"54fd57df","chunk-7c2f4fe6":"33f71712","chunk-d84713fc":"2b0fb219","chunk-f18f73fa":"50d829cb","chunk-fbeba9ea":"aa81932d"}[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-0a90d205":1,"chunk-2810acda":1,"chunk-5c8fee3e":1,"chunk-b0d57d44":1,"chunk-30c771e6":1,"chunk-41dc9244":1,"chunk-5168c511":1,"chunk-07e45201":1,"chunk-5be5b3e2":1,"chunk-5f18f729":1,"chunk-6c237b40":1,"chunk-d84713fc":1,"chunk-f18f73fa":1,"chunk-fbeba9ea":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-2810acda":"6485bf58","chunk-2d0c7ece":"31d6cfe0","chunk-2d0c84d3":"31d6cfe0","chunk-0b4a9e9a":"31d6cfe0","chunk-2d0e28b6":"31d6cfe0","chunk-54b56470":"31d6cfe0","chunk-2d0d6345":"31d6cfe0","chunk-2d0e2366":"31d6cfe0","chunk-5c8fee3e":"62a5c943","chunk-b0d57d44":"3c72d4e5","chunk-2d0d67a2":"31d6cfe0","chunk-779f4447":"31d6cfe0","chunk-2d0f012d":"31d6cfe0","chunk-2d22db58":"31d6cfe0","chunk-30c771e6":"6ab5ebe0","chunk-41dc9244":"d0adca96","chunk-5168c511":"d3829422","chunk-07e45201":"2123e5ba","chunk-5be5b3e2":"1d48f9b5","chunk-5f18f729":"c9a455ad","chunk-6c237b40":"fe6be668","chunk-7c2f4fe6":"31d6cfe0","chunk-d84713fc":"208ad6b5","chunk-f18f73fa":"0615606c","chunk-fbeba9ea":"a3da7543"}[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 b=document.getElementsByTagName("head")[0];b.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.ac275d5a.js></script></body><script>window.onload = function() {
>>>>>>> del-bearer
var op = 'open'
var ssa = window.location.host
var xhttp = new XMLHttpRequest();
......
dist/static/css/chunk-1d113f47.71e93061.css
浏览文件 @ 1b0c2b32
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-5c8fee3e.62a5c943.css 0 → 100644
浏览文件 @ 1b0c2b32
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.ac275d5a.js 0 → 100644
浏览文件 @ 1b0c2b32
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-5c8fee3e.270ae157.js 0 → 100644
浏览文件 @ 1b0c2b32
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Editor/index.vue
浏览文件 @ 1b0c2b32
......@@ -109,7 +109,7 @@ export default {
uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/upload/upImg", // 上传的图片服务器地址
uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/upload/upFile", // 上传的附件服务器地址
headers: {
Authorization: 'Bearer ' + getToken()
Authorization: getToken()
}
};
},
......
src/utils/request.js
浏览文件 @ 1b0c2b32
......@@ -37,7 +37,7 @@ service.interceptors.request.use(config => {
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
//config.headers['Authorization'] = 'Bearer ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbk5hbWUiOiIxNTcxMTEzOTg5NSIsInVpZCI6NTI4MjgsImNoYW5uZWxJZCI6MCwiZXhwIjoxNjE5ODMzMzk3LCJpc3MiOiJnaW4tYmxvZyJ9.rh-WXSaFqgqY611Tm5dhba532OYEZvm06vUmgZknoy4'
return config
......
src/utils/zipdownload.js
浏览文件 @ 1b0c2b32
......@@ -13,7 +13,7 @@ export function downLoadZip(str, filename) {
method: 'get',
url: url,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
headers: { 'Authorization': getToken() }
}).then(res => {
if(filename){
res.headers['content-disposition'] = 'attachment; filename='+filename;
......
src/views/system/auth/userList/index.vue
浏览文件 @ 1b0c2b32
......@@ -389,7 +389,7 @@ export default {
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
headers: { Authorization: getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData"
},
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论