Skip to content

G
gs1
Commit bd99d01f by 林家欣
Options

修改360兼容问题

parent edf76111
Showing with 58 additions and 21 deletions
babel.config.js
...@@ -16,5 +16,5 @@ module.exports = { ...@@ -16,5 +16,5 @@ module.exports = {
"styleLibraryName": "theme-chalk" "styleLibraryName": "theme-chalk"
} }
] ]
] ],
} }
public/index.html
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="zh-CN">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="referrer" content="never"> <meta name="referrer" content="never">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js" ></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js" ></script>
<!-- <link rel="shortcut icon" href="/favicon.ico"/> --> <!-- <link rel="shortcut icon" href="/favicon.ico"/> -->
<title>中国物品编码中心</title> <title>中国物品编码中心</title>
</head> </head>
......
src/axios/fetch.js
...@@ -30,16 +30,13 @@ function fetch(options) { ...@@ -30,16 +30,13 @@ function fetch(options) {
method: options.method, //请求方式 method: options.method, //请求方式
data: options.data, //传递数据, data: options.data, //传递数据,
transformRequest: [(data, headers) => { transformRequest: [(data, headers) => {
headers["Content-Type"] = "application/json" headers["Content-Type"] = "application/x-www-form-urlencoded"
if (options.headers) { if (options.headers) {
Object.assign(headers, options.headers) Object.assign(headers, options.headers)
} }
headers[REQUEST_HEADER_TOKEN] = window.vm.$store.state.user.token headers[REQUEST_HEADER_TOKEN] = window.vm.$store.state.user.token
return data return data
}], //请求前的数据处理 }], //请求前的数据处理
transformResponse: [(data /*, headers*/) => {
return data
}], //响应时的数据处理
responseType: options.resoponseType || "json", //响应数据类型 responseType: options.resoponseType || "json", //响应数据类型
headers: options.headers || { headers: options.headers || {
"X-Requested-With": "XMLHttpRequest" "X-Requested-With": "XMLHttpRequest"
...@@ -60,10 +57,12 @@ function fetch(options) { ...@@ -60,10 +57,12 @@ function fetch(options) {
} }
}) //响应数据的拦截 }) //响应数据的拦截
instance().then(res => { instance().then(res => {
// console.log(res, '响应数据的拦截'); console.log(res, '响应数据的拦截');
const resData = res.data || {} const resData = res.data;
const code = String(resData.code) const code = String(resData.code)
console.log(resData, ResponseCode.success, 'ResponseCode.success');
if (code === ResponseCode.success) { if (code === ResponseCode.success) {
console.log(resData, '响应数据的拦截2');
resolve(resData) resolve(resData)
} else if (checkResponseCodeTokenError(code)) { } else if (checkResponseCodeTokenError(code)) {
if (getToken()) { if (getToken()) {
......
src/main.js
...@@ -5,10 +5,10 @@ import router from "./router/index"; ...@@ -5,10 +5,10 @@ import router from "./router/index";
import store from "./vuex/store"; import store from "./vuex/store";
import $ from "jquery"; import $ from "jquery";
import "./assets/css/_reset.css"; import "./assets/css/_reset.css";
import "bootstrap/dist/css/bootstrap.min.css"; // import "bootstrap/dist/css/bootstrap.min.css";
// import "./assets/css/main.scss"; // import "./assets/css/main.scss";
import "./assets/css/layout.scss"; import "./assets/css/layout.scss";
import "bootstrap/dist/js/bootstrap.min.js"; // import "bootstrap/dist/js/bootstrap.min.js";
import "./plugins/element.js"; import "./plugins/element.js";
import "./plugins/qrcode.js"; import "./plugins/qrcode.js";
import "./assets/css/element-variables.scss"; import "./assets/css/element-variables.scss";
......
src/views/Home/index.vue
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<button class="wbsxtcy-btn" @click="wysqsptmHandelClick"> <button class="wbsxtcy-btn" @click="wysqsptmHandelClick">
我要申请商品条码 我要申请商品条码
</button> </button>
<div class="row ywdt-kj"> <div class="row ywdt-kj whbsxtcy-row">
<div <div
class="col-6" class="col-6"
v-for="(tmp, i) in whbsxtcy" v-for="(tmp, i) in whbsxtcy"
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<span>我是系统成员</span> <span>我是系统成员</span>
<span>（成员专区）</span> <span>（成员专区）</span>
</div> </div>
<div class="row ywdt-kj"> <div class="row ywdt-kj wsxtcy-row">
<div <div
class="col-6" class="col-6"
v-for="(tmp, i) in wsxtcy" v-for="(tmp, i) in wsxtcy"
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
<div class="ywdt-cate ywdt-cate-bj1"> <div class="ywdt-cate ywdt-cate-bj1">
<span>我是医疗企业</span> <span>我是医疗企业</span>
</div> </div>
<div class="row ywdt-kj"> <div class="row ywdt-kj wsylqy-row">
<div <div
class="col-6" class="col-6"
v-for="(tmp, i) in wsylqy" v-for="(tmp, i) in wsylqy"
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<div class="ywdt-cate ywdt-cate-bj2"> <div class="ywdt-cate ywdt-cate-bj2">
<span>跨境业务办理专区</span> <span>跨境业务办理专区</span>
</div> </div>
<div class="row ywdt-kj"> <div class="row ywdt-kj kjywblzq-row">
<div <div
class="col-6" class="col-6"
v-for="(tmp, i) in kjywblzq" v-for="(tmp, i) in kjywblzq"
...@@ -1764,13 +1764,13 @@ export default { ...@@ -1764,13 +1764,13 @@ export default {
} }
} }
.ywdt-kj { .ywdt-kj {
padding: 10px 0; // padding: 10px 0;
> div { > div {
margin: 10px 0; // margin: 10px 0;
text-align: center; text-align: center;
} }
.ywdt-tp { .ywdt-tp {
margin-bottom: 14px; // margin-bottom: 14px;
cursor: pointer; cursor: pointer;
height: 38px; height: 38px;
display: flex; display: flex;
...@@ -1787,7 +1787,7 @@ export default { ...@@ -1787,7 +1787,7 @@ export default {
} }
.wsxtcy { .wsxtcy {
.ywdt-tp { .ywdt-tp {
margin-bottom: 8px; // margin-bottom: 8px;
} }
} }
.wsylqy, .wsylqy,
...@@ -1800,11 +1800,47 @@ export default { ...@@ -1800,11 +1800,47 @@ export default {
margin: 0 auto; margin: 0 auto;
} }
} }
.whbsxtcy-row{
>div{
height: 128px;
}
.ywdt-tp{
height: 84px;
display: flex;
align-items: center;
}
}
.wsxtcy-row{
>div{
height: 106px;
}
.ywdt-tp{
height: 60px;
display: flex;
align-items: center;
}
}
.wsylqy-row{
height: 130px;
.ywdt-tp{
height: 70px;
display: flex;
align-items: center;
}
}
.kjywblzq-row{
height: 130px;
.ywdt-tp{
height: 70px;
display: flex;
align-items: center;
}
}
} }
.dzfw { .dzfw {
.row { .row {
> .dzfw-li { > .dzfw-li {
padding: 0 10px; // padding: 0 10px;
cursor: pointer; cursor: pointer;
@media screen and (min-width: 992px) { @media screen and (min-width: 992px) {
background: url("../../assets/image/home/line.png") no-repeat right background: url("../../assets/image/home/line.png") no-repeat right
...@@ -1821,7 +1857,7 @@ export default { ...@@ -1821,7 +1857,7 @@ export default {
.dzfw-border { .dzfw-border {
text-align: center; text-align: center;
// padding: 25px 0; // padding: 25px 0;
height: 134.8px; height: 143.3px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment