Browse Source

提交先

v4
蟑螂恶霸 2 weeks ago
parent
commit
8235350e07
  1. 4
      src/common/globalRouter.js
  2. 3
      src/config/env.js
  3. 6
      src/http/http.js
  4. 11
      src/views/Home.vue

4
src/common/globalRouter.js

@ -7,8 +7,8 @@ import {
let routes = [ let routes = [
{ {
path: "/", path: "/",
// redirect: "/home", redirect: "/home",
redirect: "/enforceHome", // redirect: "/enforceHome",
// redirect: "/login", // redirect: "/login",
name: "App", name: "App",
}, },

3
src/config/env.js

@ -2,7 +2,8 @@
// let baseUrl="http://139.186.135.156:86"; // let baseUrl="http://139.186.135.156:86";
// let baseUrl="http://10.132.108.1:85"; // let baseUrl="http://10.132.108.1:85";
//正式环境 //正式环境
let baseUrl = "http://jdm.szssfj.cn/jdmApi"; // // 开头:跟随当前页面协议,同时支持 http / https
let baseUrl = "//jdm.szssfj.cn/jdmApi";
//测试环境 //测试环境
// let baseUrl="http://jdm.szssfj.cn/jdmTestApi"; // let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
// let baseUrl="http://localhost:85"; // let baseUrl="http://localhost:85";

6
src/http/http.js

@ -16,7 +16,11 @@ http.interceptors.request.use(
if(!config.headers['Content-Type']){ if(!config.headers['Content-Type']){
config.headers['Content-Type'] = 'application/json' config.headers['Content-Type'] = 'application/json'
} }
config.headers['token'] = $globalStore.useCommon.token; // 未登录时不要传空 token,否则后端 JWT 会报 “expected 3 parts, but got 1”
const token = $globalStore.useCommon.token;
if (token) {
config.headers['token'] = token;
}
// config.headers['dataScopeId'] = $globalStore.useCommon.userId; // config.headers['dataScopeId'] = $globalStore.useCommon.userId;
return config return config

11
src/views/Home.vue

@ -152,7 +152,7 @@
onMounted(() => { onMounted(() => {
// console.log(useCommon.phonenumber) // console.log(useCommon.phonenumber)
// useCommon.SET_USER_PHONENUMBER(success.data.phonenumber); // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
// new Vconsolefrom(); new Vconsolefrom();
// const access_key = '6374106c5eb449a4ad6c2430f30796e6'; // const access_key = '6374106c5eb449a4ad6c2430f30796e6';
// const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f'; // const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
@ -206,11 +206,11 @@
console.log("鉴权", res); console.log("鉴权", res);
}).catch((err) => { }).catch((err) => {
// 失败 // 失败:HTTPS 下深i企 SDK 鉴权失败时不要再拿空 token 去打受保护接口
// console.log(err)
console.log("鉴权", err); console.log("鉴权", err);
// todo 临时工 if (useCommon.token && useCommon.enterpriseNumber && useCommon.phonenumber) {
getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString()); getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
}
}); });
w6s.ready(() => { w6s.ready(() => {
@ -224,7 +224,8 @@
// todo 测试时指定账号去2.0版本 start. // todo 测试时指定账号去2.0版本 start.
if((success.data.area || "").includes("光明区") || (success.data.area || "").includes("宝安区") || success.data.enterpriseNumber == '91440300769156389U'){ if((success.data.area || "").includes("光明区") || (success.data.area || "").includes("宝安区") || success.data.enterpriseNumber == '91440300769156389U'){
window.location.href="http://jdm.szssfj.cn/efcode20-ent-app/enterprise/enterpriseHome"; // 跟随当前协议,避免 https 打开后被硬跳到 http
window.location.href = window.location.protocol + "//jdm.szssfj.cn/efcode20-ent-app/enterprise/enterpriseHome";
return; return;
} }
// todo 测试时指定账号去2.0版本 end. // todo 测试时指定账号去2.0版本 end.

Loading…
Cancel
Save