From f995691e1040e76b3772fee11d4d580ee42716ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=9A=E5=90=8D=E7=A8=8B=E5=BA=8F=E5=91=98?=
 <1968115437@qq.com>
Date: Mon, 13 Mar 2023 19:02:44 +0800
Subject: [PATCH] =?UTF-8?q?ci=EF=BC=9A=E6=8C=81=E7=BB=AD=E9=9B=86=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.cjs                       | 3 +++
 src/components/BasicInput/index.vue | 4 ++--
 src/components/Iconify/index.vue    | 6 ++++--
 src/components/Navbar/index.vue     | 4 ++--
 src/utils/router/constant.ts        | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index ee55f0f..8821985 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -43,6 +43,9 @@ module.exports = {
         'vue/singleline-html-element-content-newline': 'off', //要求在单行元素的内容之前和之后有一个换行符
         'vue/max-attributes-per-line': 'off', //执行每行的最大属性数(被 prettier 最大单行控制了暂off)
         'vue/multi-word-component-names': 'off', //要求组件名称始终为多字
+        '@typescript-eslint/ban-ts-comment': 'off', // 不允许@ts-<指令>评论或要求指令后的描述
+        '@typescript-eslint/ban-types': 'off', // 不允许某些类型
+        '@typescript-eslint/no-non-null-assertion': 'off', // 不允许使用！后缀操作符的非空断言
     },
     globals: {
         //可以定义全局中的变量的权限（只读，可读可写）
diff --git a/src/components/BasicInput/index.vue b/src/components/BasicInput/index.vue
index aaf35bb..ee5f984 100644
--- a/src/components/BasicInput/index.vue
+++ b/src/components/BasicInput/index.vue
@@ -21,8 +21,8 @@ export default defineComponent({
             default: '',
         },
     },
-    setup(props) {
-        const _props = props;
+    setup(_props) {
+        // const _props = props;
         return {};
     },
 });
diff --git a/src/components/Iconify/index.vue b/src/components/Iconify/index.vue
index 01216e9..9cfe5bd 100644
--- a/src/components/Iconify/index.vue
+++ b/src/components/Iconify/index.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup name="Iconify">
 import { computed, ref, unref } from 'vue';
 import { assign } from 'lodash-es';
+import { isBoolean } from '@/utils/is';
 
 const props = defineProps({
     icon: {
@@ -15,8 +16,9 @@ const props = defineProps({
 });
 
 const iconSize = ref<string | boolean>(props.size ? `${props.size}rpx` : false);
-const style = computed(() => {
-    return assign(unref(iconSize) ? { width: unref(iconSize), height: unref(iconSize) } : {}, props.color ? { color: props.color } : {});
+let style = computed(() => {
+    let ISize = unref(iconSize);
+    return assign({ width: isBoolean(ISize) ? '' : ISize, height: isBoolean(ISize) ? '' : ISize }, { color: props.color });
 });
 
 const emit = defineEmits(['click']);
diff --git a/src/components/Navbar/index.vue b/src/components/Navbar/index.vue
index aca9aea..73a7234 100644
--- a/src/components/Navbar/index.vue
+++ b/src/components/Navbar/index.vue
@@ -70,10 +70,10 @@ const onBackHome = () => {
                     <slot name="left">
                         <view class="_u_h-full _u_flex _u_items-center">
                             <template v-if="backShow">
-                                <Iconify @click="onBack" :size="navbarLeftIconSize" :color="navbarTitleColor" icon="i-humbleicons-chevron-left" />
+                                <Iconify @click="onBack" :size="navbarLeftIconSize" :color="navbarTitleColor===true?undefined:navbarTitleColor" icon="i-humbleicons-chevron-left" />
                             </template>
                             <template v-if="backHomeShow">
-                                <Iconify @click="onBackHome" :size="navbarLeftIconSize" :color="navbarTitleColor" icon="i-iconoir-home-simple-door" />
+                                <Iconify @click="onBackHome" :size="navbarLeftIconSize" :color="navbarTitleColor===true?undefined:navbarTitleColor" icon="i-iconoir-home-simple-door" />
                             </template>
                         </view>
                     </slot>
diff --git a/src/utils/router/constant.ts b/src/utils/router/constant.ts
index 5245a0f..375de4c 100644
--- a/src/utils/router/constant.ts
+++ b/src/utils/router/constant.ts
@@ -33,6 +33,6 @@ export function jumpLogin(path: string) {
  * @param prefix
  */
 export function filterPath(url: string, prefix = '') {
-    const path = url.split('?')[0];
+    const path = url.split('?')[0] || '';
     return prefix + (path.startsWith('/') ? path.substring(1) : path);
 }