From 61694fc119821f293b152622813a6f77dbc6a222 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 9 May 2024 14:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development          |  4 ++--
 src/api/user.js           |  2 +-
 src/layout/myHeader.vue   | 18 ++++----------
 src/utils/axios.js        |  2 +-
 src/views/login/index.vue | 49 ++++++++++++---------------------------
 vite.config.ts            |  2 +-
 6 files changed, 24 insertions(+), 53 deletions(-)

diff --git a/.env.development b/.env.development
index 8dd7aef..d3fe22d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 VITE_NOW_TYPE = 'dist'
 
-# VITE_BASE_URL = 'http://192.168.1.7:8324'
-VITE_BASE_URL = 'https://crmeb-test.shop.lihaink.cn'
\ No newline at end of file
+VITE_BASE_URL = 'http://192.168.1.10:8546'
+# VITE_BASE_URL = 'https://erp.lihaink.cn'
\ No newline at end of file
diff --git a/src/api/user.js b/src/api/user.js
index 4197980..8a0de44 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -10,7 +10,7 @@ export function captchaApi() {
   * @description 登录
   */
 export function login(data) {
-  return request.post(`auth/login`, data)
+  return request.post(`/login/account`, data)
 }
 
 /**
diff --git a/src/layout/myHeader.vue b/src/layout/myHeader.vue
index 255f10a..54680c0 100644
--- a/src/layout/myHeader.vue
+++ b/src/layout/myHeader.vue
@@ -8,15 +8,7 @@ import { useRouter } from 'vue-router'
 const userStore = useUserStore();
 
 const merInfo = ref({});
-merInfo.value = userStore.userInfo.mer_info;
-const service = ref({});
-service.value = userStore.userInfo.service;
-
-const getInfo = () => {
-  info().then((res) => {
-    merInfo.value = res.data;
-  });
-};
+merInfo.value = userStore.userInfo;
 
 const router = useRouter();
 const onLogout = () => {
@@ -32,7 +24,6 @@ const onLogout = () => {
     });
 }
 
-// getInfo();
 </script>
 
 <template>
@@ -48,13 +39,12 @@ const onLogout = () => {
     <div class="card-body">
       <el-dropdown trigger="hover">
         <div class="el-dropdown-link">
-          <el-avatar :src="service.avatar" icon="user-filled"/>
+          <el-avatar :src="merInfo.avatar" icon="user-filled"/>
           <div class="info">
             <div>
-              {{ service.nickname }}
-              <span style="margin-left: 0.3rem;">({{ merInfo.company_name || merInfo.mer_name }})</span>
+              {{ merInfo.nickname }}
             </div>
-            <div>{{ userStore.userInfo.account }}</div>
+            <div>{{ merInfo.account }}</div>
           </div>
           <el-icon class="el-icon--right">
             <arrow-down />
diff --git a/src/utils/axios.js b/src/utils/axios.js
index a62254d..cbf0259 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -16,7 +16,7 @@ request.interceptors.request.use(
         // 在发送请求之前做些什么，例如添加token、修改请求头等
         const token = localStorage.getItem('Token');
         if (token) {
-            config.headers['X-Token'] = 'Bearer ' + token;
+            config.headers['token'] = token;
         }
 
         return config;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5c7b274..0ece5d8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -12,26 +12,12 @@ const accRef = ref(null);
 const pwdRef = ref(null);
 
 const formLogin = ref({
-  account: "",
-  password: "",
-  key: "",
-  captchaVerification: "",
-  code: "",
+  account: "xiao123",
+  password: "123456",
+  terminal: 3,
+  scene: 1,
 });
 
-const getCaptchaApi = () => {
-  captchaApi()
-    .then((res) => {
-      formLogin.value.key = res.data.key;
-    })
-    .catch((err) => {
-      ElMessage({
-        message: err.message,
-        type: "error",
-      });
-    });
-};
-
 const onLogin = () => {
   if (!formLogin.value.account)
     return ElMessage({
@@ -46,27 +32,16 @@ const onLogin = () => {
   login(formLogin.value)
     .then((res) => {
       console.log(res);
-      if(res.data){
+      if (res.data?.token) {
         userStore.setToken(res.data.token);
-        info().then(({data}) => {
-          if(!data.service){
-            return ElMessage({
-              message: "请联系管理员开通服务",
-              type: "error",
-            })
-          }
-          userStore.setUserInfo(data);
-          router.push("/");
-        });
+        userStore.setUserInfo(res.data);
+        router.push("/");
       }
     })
-    .catch((err) => {
-      
-    });
+    .catch((err) => {});
 };
 
 onMounted(() => {
-  // getCaptchaApi();
 });
 </script>
 
@@ -76,7 +51,13 @@ onMounted(() => {
       <div class="title">里海收银系统 - 登录</div>
       <el-form>
         <el-form-item>
-          <el-input ref="accRef" v-model="formLogin.account" placeholder="请输入账号" :autofocus="true" @keydown.enter="pwdRef.focus()">
+          <el-input
+            ref="accRef"
+            v-model="formLogin.account"
+            placeholder="请输入账号"
+            :autofocus="true"
+            @keydown.enter="pwdRef.focus()"
+          >
             <template #prefix>
               <el-icon><User /></el-icon>
             </template>
diff --git a/vite.config.ts b/vite.config.ts
index 0d0d583..c8513a5 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,7 +9,7 @@ export default ({ mode }) => defineConfig({
     outDir: loadEnv(mode, process.cwd()).VITE_NOW_TYPE
   },
   server: {
-    port: '5175',
+    port: '5178',
     host: '0.0.0.0',
   },
   resolve: {