Commit 9e219942 authored by 陈宗胤(贵阳日报)'s avatar 陈宗胤(贵阳日报)

冲突

parents 0d809bb4 0b3729fc
import instance from "@/utils/request"; import instance from "@/utils/request";
// 测试登录 // 测试登录
export const testLogin = params => instance.post("/company/sms/login", params); export const testLogin = params => instance.post("/user/appUser/smsLogin", params);
export const getSmsCode = params => instance.postForm("/company/user/getSmsCode", params); export const getSmsCode = params => instance.postForm("/company/user/getSmsCode", params);
// 新华登录 // 新华登录
export const xinhuaMpLogin = params => instance.post("/company/user/xinhua/mpLogin", params); export const xinhuaMpLogin = params => instance.post("/user/appUser/xinhua/mpLogin", params);
// B端-获取登录用户 // B端-获取登录用户
export const getLoginUserApi = params => instance.post("/company/user/getLoginUser", params); export const getLoginUserApi = params => instance.post("/company/user/getLoginUser", params);
......
...@@ -23,7 +23,7 @@ const login = () => { ...@@ -23,7 +23,7 @@ const login = () => {
xma.xh.getUserProfile({ xma.xh.getUserProfile({
range: ["ACCOUNT", "MOBILE"], range: ["ACCOUNT", "MOBILE"],
success(info) { success(info) {
xinhuaMpLogin({ phone: info.data.uMobile }) xinhuaMpLogin({ encryptedData: info.data.uMobile,userType:'business' })
.then(data => { .then(data => {
res.value = data; res.value = data;
}) })
......
...@@ -20,7 +20,7 @@ const login = async () => { ...@@ -20,7 +20,7 @@ const login = async () => {
code: "000000" code: "000000"
}); });
if (loginRes.code === 200) { if (loginRes.code === 200) {
setToken(loginRes.data); setToken(loginRes.data.token);
const userInfoRes = await getLoginUserApi(); const userInfoRes = await getLoginUserApi();
// 已经判断是否注册过企业 // 已经判断是否注册过企业
if (userInfoRes.data?.companyId) { if (userInfoRes.data?.companyId) {
......
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<!-- 全职职位列表 --> <!-- 全职职位列表 -->
<view class="content"> <view class="content">
<view class="position-content"> <view class="position-content">
<view class="item" v-for="(v, i) in positionListData" :key="v"> <view class="item" v-for="(v) in positionListData" :key="v">
<postion-card1 :data="v"></postion-card1> <postion-card1 :data="v"></postion-card1>
</view> </view>
</view> </view>
......
import axios from "axios"; import axios from "axios";
import { getToken } from "@/utils/token"; import { getToken } from "@/utils/token";
const baseURL = "https://lygsh-api.wjzpgz.com/"; const baseURL = "http://192.168.11.158:8080";
// 创建一个 axios 实例 // 创建一个 axios 实例
const instance = axios.create({ const instance = axios.create({
baseURL, // 设置基础 URL baseURL, // 设置基础 URL
...@@ -23,7 +23,7 @@ instance.interceptors.request.use( ...@@ -23,7 +23,7 @@ instance.interceptors.request.use(
// "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTU4NTExMDY1NSIsInVzZXJ0eXBlIjoiYnVzaW5lc3MiLCJleHAiOjE3MjQzNzcwOTcsImNyZWF0ZWQiOjE3MjMwODEwOTc5MTcsImF1dGhvcml0aWVzIjpbeyJhdXRob3JpdHkiOiJCVVNJTkVTUyJ9XX0.pIxkAOBlIjc1WwjUR69hok0-k8me21FbtjBiC4amxZxewwEZCUi2yvlNpCyg-bGSkx4Vx-LaOBvhj_k32jN52g"; // "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxNTU4NTExMDY1NSIsInVzZXJ0eXBlIjoiYnVzaW5lc3MiLCJleHAiOjE3MjQzNzcwOTcsImNyZWF0ZWQiOjE3MjMwODEwOTc5MTcsImF1dGhvcml0aWVzIjpbeyJhdXRob3JpdHkiOiJCVVNJTkVTUyJ9XX0.pIxkAOBlIjc1WwjUR69hok0-k8me21FbtjBiC4amxZxewwEZCUi2yvlNpCyg-bGSkx4Vx-LaOBvhj_k32jN52g";
const token = getToken(); const token = getToken();
if (token) { if (token) {
config.headers.Authorization = `Bearer ` + token; config.headers['User-Token'] = token;
} }
return config; return config;
}, },
......
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