diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..8990b9f
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,19 @@
+config
+.husky
+**/.gitignore
+dist/
+deploy_versions/
+.temp/
+.rn_temp/
+node_modules/
+.DS_Store
+.swc
+.husky
+.prettierignore
+.env.*
+**/*.json
+**/*.svg
+**/*.scss
+**/*.md
+*.config.js
+index.html
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
index e82e540..0526e64 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,4 @@
-/**/.gitignore
+**/.gitignore
 dist/
 deploy_versions/
 .temp/
@@ -9,8 +9,5 @@ node_modules/
 .husky
 .prettierignore
 .env.*
-<<<<<<< HEAD
 project.*.json
-=======
 **/*.svg
->>>>>>> dev
diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx
index c8c2fcc..07fa1be 100644
--- a/src/custom-tab-bar/index.tsx
+++ b/src/custom-tab-bar/index.tsx
@@ -1,9 +1,9 @@
 import { Component, ReactNode } from 'react';
 import { AtTabBar } from 'taro-ui';
 import Taro from '@tarojs/taro';
+import pt from '@/plain-text';
 import 'taro-ui/dist/style/index.scss';
 import './index.scss';
-import pt from '@/plain-text';
 
 const navList: Array<Taro.TabBarItem> = [
   {
diff --git a/src/pages/user/inform/inform.tsx b/src/pages/user/inform/inform.tsx
index c0aa4f8..2a4218c 100644
--- a/src/pages/user/inform/inform.tsx
+++ b/src/pages/user/inform/inform.tsx
@@ -1,8 +1,8 @@
 import { Component, ReactNode } from 'react';
 import { AtForm, AtInput, AtButton, AtMessage } from 'taro-ui';
-import './inform.scss';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import './inform.scss';
 
 export default class InformPage extends Component {
   state = {
diff --git a/src/pages/user/myTicket/myTicket.tsx b/src/pages/user/myTicket/myTicket.tsx
index 12c5514..9002a83 100644
--- a/src/pages/user/myTicket/myTicket.tsx
+++ b/src/pages/user/myTicket/myTicket.tsx
@@ -1,6 +1,6 @@
 import { Component, ReactNode } from 'react';
-import './myTicket.scss';
 import { View } from '@tarojs/components';
+import './myTicket.scss';
 
 export default class SettingsPage extends Component {
   render(): ReactNode {
diff --git a/src/pages/user/report/report.tsx b/src/pages/user/report/report.tsx
index b4df277..cb2c0a6 100644
--- a/src/pages/user/report/report.tsx
+++ b/src/pages/user/report/report.tsx
@@ -1,8 +1,8 @@
 import { AtTextarea, AtButton, AtForm, AtMessage } from 'taro-ui';
 import { Component, ReactNode } from 'react';
-import './report.scss';
 import Taro from '@tarojs/taro';
 import pt from '@/plain-text';
+import './report.scss';
 
 export default class SettingsPage extends Component {
   state = {
@@ -36,7 +36,7 @@ export default class SettingsPage extends Component {
   }
   onReset() {
     this.setState({
-      Report: '',
+      report: '',
     });
   }
   render(): ReactNode {
diff --git a/src/pages/user/settings/settings.tsx b/src/pages/user/settings/settings.tsx
index f037dfd..ea447d4 100644
--- a/src/pages/user/settings/settings.tsx
+++ b/src/pages/user/settings/settings.tsx
@@ -1,26 +1,24 @@
 import { AtButton, AtList, AtListItem } from 'taro-ui';
 import { Component, ReactNode } from 'react';
-import './settings.scss';
 import Taro from '@tarojs/taro';
 import { View, Picker } from '@tarojs/components';
 import pt, { Lang } from '@/plain-text';
+import './settings.scss';
 
 export default class SettingsPage extends Component {
+  state = {
+    selector: ['简体中文', 'English'],
+    selectorChecked: {
+      zh_CN: '简体中文',
+      en_US: 'English',
+    }[pt.getCurLang()],
+  };
+
   showLangDict: Record<string, Lang> = {
     简体中文: 'zh_CN',
     English: 'en_US',
   };
 
-  reversedShowLangDict: Record<Lang, string> = {
-    zh_CN: '简体中文',
-    en_US: 'English',
-  };
-
-  state = {
-    selector: ['简体中文', 'English'],
-    selectorChecked: this.reversedShowLangDict[pt.getCurLang()],
-  };
-
   onSelect = (e: { detail: { value: string | number } }) => {
     this.setState({
       selectorChecked: this.state.selector[e.detail.value],
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 2d4581b..a1649d4 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -1,11 +1,11 @@
 import { View } from '@tarojs/components';
 import { Component, ReactNode } from 'react';
 import Taro from '@tarojs/taro';
-import type CustomTabBar from '../../custom-tab-bar';
-import './user.scss';
+import type CustomTabBar from '@/custom-tab-bar';
 import { AtList, AtListItem } from 'taro-ui';
 import PageFooter from '@/components/PageFooter/PageFooter';
 import pt from '@/plain-text';
+import './user.scss';
 
 export default class UserPage extends Component {
   // 以下是TabBar相关