放开登录

src/api/user.ts

@@ -3,7 +3,8 @@ import request from '@/utils/request'
 
 // 登录
 export function login(params: Record<string, any>) {
-    return request.post({ url: '/system/login', params: { ...params, terminal: config.terminal } })
+    // return request.post({ url: '/membership/queryMemberUser', params }, { urlPrefix: '/elab-marketing-content' })
+    return request.post({ url: '/login/captchaLogin', params: { ...params, terminal: config.terminal } },{ urlPrefix: '/elab-marketing-analyse' })
 }
 
 // 登录

src/permission.ts

@@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => {
                 // 没有有效路由跳转到403页面
                 if (!routeName) {
                     clearAuthInfo()
-                    next(PageEnum.ERROR_403)
+                    next(PageEnum.LOGIN)
                     return
                 }
                 tabsStore.setRouteName(routeName!)
@@ -81,8 +81,8 @@ router.beforeEach(async (to, from, next) => {
         }
     } else {
         console.warn("***userStore-没有token***")
-        next(PageEnum.ERROR_403)
-        // next({ path: loginPath, query: { redirect: to.fullPath } })
+        // next(PageEnum.ERROR_403)
+        next({ path: loginPath, query: { redirect: to.fullPath } })
     }
 })
 

src/stores/modules/user.ts

@@ -43,18 +43,21 @@ const useUserStore = defineStore({
             this.perms = []
         },
         login(playload: any) {
-            const { account, password, code, uuid } = playload
+            const { mobile, passWord, code, uuid } = playload
             return new Promise((resolve, reject) => {
                 login({
-                    username: account,
-                    password,
+                    mobile: mobile,
+                    passWord,
                     code,
                     uuid
                 })
                     .then((data) => {
-                        this.token = data.token
-                        cache.set(TOKEN_KEY, data.token)
-                        resolve(data)
+                        this.token = data.single.token
+                        cache.set(TOKEN_KEY, data.single.token)
+                        window.localStorage.setItem("like_admin_token",data.single.token)
+                        window.localStorage.setItem("like_admin_brandId",data.single.brandId)
+                        window.localStorage.setItem("like_admin_userId",data.single.dataUserId)
+                        resolve(data.single)
                     })
                     .catch((error) => {
                         reject(error)

src/views/account/login.vue

@@ -34,7 +34,7 @@
                                 </template>
                             </el-input>
                         </el-form-item>
-                        <el-form-item prop="code">
+                        <!-- <el-form-item prop="code">
                             <div class="flex items-center">
                                 <el-input
                                     v-model="formData.code"
@@ -52,7 +52,7 @@
                                     <img class="w-full" :src="codeImg" alt="" />
                                 </div>
                             </div>
-                        </el-form-item>
+                        </el-form-item> -->
                     </el-form>
                     <div class="mb-5">
                         <el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
@@ -90,7 +90,7 @@ const codeImg = ref()
 const formData = reactive({
     account: '',
     password: '',
-    code: '',
+    // code: '',
     uuid: ''
 })
 const rules = {
@@ -107,14 +107,14 @@ const rules = {
             message: '请输入密码',
             trigger: ['blur']
         }
-    ],
-    code: [
-        {
-            required: true,
-            message: '请输入验证码',
-            trigger: ['blur']
-        }
     ]
+    // code: [
+    //     {
+    //         required: true,
+    //         message: '请输入验证码',
+    //         trigger: ['blur']
+    //     }
+    // ]
 }
 
 const getLoginCaptcha = async () => {
@@ -138,9 +138,14 @@ const handleLogin = async () => {
         account: remAccount.value ? formData.account : ''
     })
     try {
-        await userStore.login(formData)
+        let _data = {
+            "mobile": formData.account,
+            "passWord": formData.password,
+            "platform":1,//平台 1.大麦数字营销 2.大麦后台 3.麦芽 4.淘房客 5.电商中心
+        }
+        await userStore.login(_data)
     } catch (error) {
-        getLoginCaptcha()
+        // getLoginCaptcha()
     }
     const {
         query: { redirect }