提交 c048ecc6 authored 作者: 王天霸's avatar 王天霸

Merge branch 'oem-51' of http://120.27.146.32:8888/wangfulong/shop-new into oem-51

# Conflicts:
#	dist/index.html
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -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()
}
};
},
......@@ -189,7 +189,7 @@ export default {
}
}
};
</script>
</script>
<style>
.editor {
......@@ -271,4 +271,4 @@ export default {
content: "等宽字体";
}
</style>
\ No newline at end of file
</style>
......@@ -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
......
......@@ -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;
......
......@@ -658,7 +658,9 @@
</script>
<style lang="scss" type="text/stylus" scoped>
.fill-brand-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
......@@ -797,6 +797,7 @@
<style lang="scss" type="text/stylus" scoped>
.fill-store-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
......@@ -565,6 +565,7 @@
<style lang="scss" type="text/stylus" scoped>
.fill-store-inf {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
......@@ -81,6 +81,7 @@
<style lang="scss" type="text/stylus" scoped>
.entryDetails {
font-size : 16px;
width: 100%;
height: 100%;
overflow-x: hidden;
......
......@@ -79,6 +79,7 @@
<style lang="scss" type="text/stylus" scoped>
.to-review {
font-size : 16px;
width: 100%;
height: 100%;
overflow: hidden;
......
......@@ -65,6 +65,7 @@ html{
font-size: 12px !important;
}
.to-review {
font-size : 16px;
width: 100%;
height: 100%;
overflow: hidden;
......
......@@ -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 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论