合并冲突

.gitignore

@@ -12,6 +12,8 @@ node_modules
 dist
 build
 *.local
+yarn.lock
+package-lock.json
 
 # Editor directories and files
 .idea

package.json

@@ -26,6 +26,7 @@
         "dayjs": "^1.11.12",
         "lodash": "^4.17.21",
         "pinia": "2.0.36",
+        "vconsole": "^3.15.1",
         "vue": "^3.3.11",
         "vue-i18n": "^9.1.9",
         "wot-design-uni": "^1.3.12"

src/api/user.js

 import instance from "@/utils/request";
 
 // 测试登录
-export const testLogin = params => instance.post("/personal/sms/login", params);
+export const testLogin = params => instance.post("/user/appUser/smsLogin", params);
 export const getSmsCode = params => instance.postForm("/personal/user/getSmsCode", params);
 // 新华登录
-export const xinhuaMpLogin = params => instance.post("/personal/xinhua/mpLogin", params);
-
+export const xinhuaMpLogin = params => instance.post("/user/appUser/xinhua/mpLogin", params);
 // 获取用户简历
 export const getUserResumeApi = () => instance.post("/personal/user/resume/get");
 // 获取等用户信息

src/main.ts

@@ -2,11 +2,13 @@ import { createSSRApp } from "vue";
 import App from "./App.vue";
 import store from "./store";
 import NavBar from "@/components/navBar/index.vue";
+import Vconsole from "vconsole";
 
 export function createApp() {
     const app = createSSRApp(App);
     app.component("NavBar", NavBar);
     app.use(store);
+    app.use(vConsole);
     return {
         app
     };

src/pages/login/index.vue

@@ -18,14 +18,17 @@
 <script setup>
 import NavBar from "@/components/navBar/index.vue";
 import { xinhuaMpLogin } from "@/api/user.js";
+import { setToken } from "@/utils/token";
 const res = ref("");
 const login = () => {
     xma.xh.getUserProfile({
         range: ["ACCOUNT", "MOBILE"],
         success(info) {
-            xinhuaMpLogin({ phone: info.data.uMobile })
+           
+            xinhuaMpLogin({ encryptedData: info.data.uMobile,userType:'consumer' })
                 .then(data => {
                     res.value = data;
+                    setToken(data.token);
                 })
                 .catch(err => {
                     res.value = err;

src/pages/login/test.vue

@@ -20,7 +20,7 @@ const login = async () => {
     }).then(res => {
         console.log(res);
         if (res.code === 200) {
-            setToken(res.data);
+            setToken(loginRes.data.token);
             uni.switchTab({
                 url: "/pages/user/index"
             });

src/utils/request.js

@@ -20,8 +20,7 @@ instance.interceptors.request.use(
         //   config.headers.Authorization = `Bearer ${token}`;
         // }·
         const token = getToken();
-
-        config.headers.Authorization = `Bearer ` + token;
+        config.headers['User-Token'] = token;
         return config;
     },
     error => {