develop
xiaozhiyong 10 months ago
parent 382d34d7bf
commit 5b95703f51
  1. 5
      src/subPackages/login/login/index.vue
  2. 24
      src/subPackages/site/details/index.vue
  3. 16
      src/utils/request.js

@ -207,11 +207,12 @@ export default {
}); });
}, },
callbackLogin(res) { callbackLogin(res) {
let { authTokenDTO, isCompanyAccount } = res.data; let { authTokenDTO } = res.data;
if (authTokenDTO.loginFlag) { if (authTokenDTO.loginFlag) {
uni.setStorageSync("Authorization", authTokenDTO.accessToken); uni.setStorageSync("Authorization", authTokenDTO.accessToken);
uni.setStorageSync("accountStatus", isCompanyAccount); // uni.setStorageSync("accountStatus", isCompanyAccount);
uni.setStorageSync("user", authTokenDTO.loginUser); uni.setStorageSync("user", authTokenDTO.loginUser);
// console.log()
uni.reLaunch({ uni.reLaunch({
url: "/pages/index/index", url: "/pages/index/index",
}); });

@ -153,7 +153,6 @@ export default {
}, },
data() { data() {
return { return {
discountInfo: {},
params: { params: {
sitePriceAmount: "", sitePriceAmount: "",
oilProductCode: "", oilProductCode: "",
@ -161,10 +160,12 @@ export default {
sitePrice: "", sitePrice: "",
oilSitePrice: "", oilSitePrice: "",
}, },
discountInfo: {},
siteInfo: {}, siteInfo: {},
handleInfo: { handleInfo: {
number: [], number: [],
spear: {}, spear: {},
currentSpear: [],
}, },
}; };
}, },
@ -455,26 +456,7 @@ export default {
font-weight: 500; font-weight: 500;
} }
} }
// .illustrate {
// min-height: 30vh;
// > .title {
// position: relative;
// padding: 30rpx 0;
// text-align: center;
// > uni-icons {
// position: absolute;
// top: 50%;
// right: 30rpx;
// transform: translateY(-50%);
// }
// }
// > .text {
// padding: 0 20rpx;
// text-align: center;
// font-size: 28rpx;
// color: #999;
// }
// }
.container { .container {
min-height: 100vh; min-height: 100vh;
background: #f6f6f6; background: #f6f6f6;

@ -15,10 +15,6 @@ const instance = axios.create({
timeout: 10000, timeout: 10000,
}); });
let token = "";
let unionId = "";
let openId = "";
instance.interceptors.request.use( instance.interceptors.request.use(
(config) => { (config) => {
if (!config.hideLoading) { if (!config.hideLoading) {
@ -27,15 +23,9 @@ instance.interceptors.request.use(
}); });
} }
if (!token) { const token = uni.getStorageSync("Authorization") || " ";
token = uni.getStorageSync("Authorization") || " "; const unionId = uni.getStorageSync("unionid");
} const openId = uni.getStorageSync("openid");
if (!unionId) {
unionId = uni.getStorageSync("unionid");
}
if (!openId) {
openId = uni.getStorageSync("openid");
}
config.headers["Authorization"] = token; config.headers["Authorization"] = token;
config.headers["imei"] = unionId; config.headers["imei"] = unionId;

Loading…
Cancel
Save