From e347eb359988592aa21f69ae9bbf0c273ea1f215 Mon Sep 17 00:00:00 2001
From: Huang <596417202@qq.com>
Date: Fri, 22 Jul 2022 11:54:43 +0800
Subject: [PATCH] style- Eslint fix

---
 src/components/BasicButton/index.vue |  4 ++--
 src/pages/about/index.vue            |  2 +-
 src/pages/login/index.vue            |  2 +-
 src/utils/http/adapters/index.ts     |  4 +++-
 src/utils/http/index.ts              | 10 ++--------
 src/utils/http/utils.ts              |  1 +
 tsconfig.json                        |  2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/components/BasicButton/index.vue b/src/components/BasicButton/index.vue
index ad5adff..7eaaaf8 100644
--- a/src/components/BasicButton/index.vue
+++ b/src/components/BasicButton/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
   import { buttonProps } from '@/components/BasicButton/prpos';
 
-  const { disabled } = defineProps(buttonProps);
+  const props = defineProps(buttonProps);
   const emits = defineEmits(['click']);
   const click = () => {
     emits('click');
@@ -9,7 +9,7 @@
 </script>
 
 <template>
-  <view class="default-btn" @tap="click"><slot></slot></view>
+  <view class="default-btn" :disabled="props.disabled" @tap="click"><slot></slot></view>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index 9a25b8b..cc75432 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -15,7 +15,7 @@
 
   // 登出
   const handleLoginOut = () => {
-    authStore.loginOut().then((res) => {
+    authStore.loginOut().then(() => {
       isLogin.value = false;
     });
   };
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index debcf62..325103f 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -15,7 +15,7 @@
   });
   const authStore = useAuthStore();
   const submit = (e: any) => {
-    authStore.login(e.detail.value).then((res) => {
+    authStore.login(e.detail.value).then(() => {
       Toast('登录成功', { duration: 1500 });
       setTimeout(() => {
         router.pushTab('/pages/about/index');
diff --git a/src/utils/http/adapters/index.ts b/src/utils/http/adapters/index.ts
index fde2272..c9dfbdf 100644
--- a/src/utils/http/adapters/index.ts
+++ b/src/utils/http/adapters/index.ts
@@ -33,7 +33,9 @@ export default <T>(config: HttpRequestConfig) => {
           if (typeof res.data === 'string') {
             res.data = JSON.parse(res.data);
           }
-        } catch (e) {}
+        } catch (e: any) {
+          reject(e);
+        }
         const cloneConfig = cloneDeep(config);
         cloneConfig.fullPath = fullPath;
         const response = {
diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts
index 7747468..58b9130 100644
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -1,8 +1,5 @@
 import Request from './core/Request';
-import { getCache } from '@/utils/catch';
-import { TOKEN_KEY } from '@/enums/cacheEnum';
 import { assign } from 'lodash-es';
-import { error } from '@/utils/log';
 import { HttpSuccess } from '@/types/http';
 import { Toast } from '@/utils/uniApi';
 import { getEnvValue } from '@/utils/env';
@@ -14,8 +11,6 @@ const HEADER = {
   Accept: 'application/json, text/plain, */*',
 };
 
-const TOKEN = () => getCache<string>(TOKEN_KEY) || undefined;
-
 function createRequest() {
   return new Request({
     baseURL: BASE_URL,
@@ -33,7 +28,6 @@ const request = createRequest();
 request.interceptors.request.use(
   (options) => {
     const { config } = options;
-    const token = TOKEN();
     if (config.custom?.auth) {
       const authStore = useAuthStore();
       if (!authStore.isLogin) {
@@ -56,9 +50,9 @@ request.interceptors.request.use(
  * 响应拦截器
  */
 request.interceptors.response.use(
-  async (response: HttpSuccess<API<any>>) => {
+  async (response: HttpSuccess<API>) => {
     const { data: resData } = response;
-    const { code, message, data } = resData;
+    const { code, message } = resData;
     if (code === 10000) {
       return resData as any;
     }
diff --git a/src/utils/http/utils.ts b/src/utils/http/utils.ts
index 3f681cc..64cc4a1 100644
--- a/src/utils/http/utils.ts
+++ b/src/utils/http/utils.ts
@@ -125,6 +125,7 @@ export function deepMerge(/* obj1, obj2, obj3, ... */) {
     }
   }
   for (let i = 0, l = arguments.length; i < l; i++) {
+    // eslint-disable-next-line prefer-rest-params
     forEach(arguments[i], assignValue);
   }
   return result;
diff --git a/tsconfig.json b/tsconfig.json
index 5d9c79f..3af8e71 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,6 @@
     "src/**/*.d.ts",
     "src/**/*.tsx",
     "src/**/*.vue",
-    "node_modules/**/uni.d.ts"
+    "node_modules/@dcloudio/types/uni-app/uni.d.ts"
   ]
 }