Merge pull request #7 from j10ccc/master

chore(*): 统一组件写法

.eslintrc.json

@@ -0,0 +1,39 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended"
+  ],
+  "overrides": [],
+  "parser": "vue-eslint-parser",
+  "parserOptions": {
+    "parser": "@typescript-eslint/parser",
+    "ecmaVersion": 2021,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "vue",
+    "@typescript-eslint"
+  ],
+  "rules": {
+    "indent": [
+      "error",
+      2
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "semi": [
+      "error",
+      "always"
+    ]
+  }
+}

Readme.md

@@ -1,16 +1,17 @@
 # WeJH-Taro
 
-使用跨平台框架 Taro
+使用跨平台框架 Taro 构建的基于 Vue + TS 的小程序
 
-# 微精弘
+## 介绍
 
-> 微精弘是是碎片化、一站式、一体化校园移动门户，适用于浙江工业大学学生，集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。
->
-> 微精弘有更好用的课表查询，本周视图、学期视图、对应日期及时钟轴，清晰明了。
->
-> 微精弘有更方便的考试安排，帮你折算出考试周对应的日期，以及考试时间倒计时，一目了然。
->
-> 微精弘还是校园生活助手与管家，一卡通余额及消费一览无余，让同学们更合理安排生活费。微精弘更是/更有... （期待您的发现）
+- 微精弘是是碎片化、一站式、一体化校园移动门户，适用于浙江工业大学学生，集课表、成绩、考试、空教室、一卡通、借阅等功能于一身。
+- 微精弘有更好用的课表查询，本周视图、学期视图、对应日期及时钟轴，清晰明了。
+- 微精弘有更方便的考试安排，帮你折算出考试周对应的日期，以及考试时间倒计时，一目了然。
+- 微精弘还是校园生活助手与管家，一卡通余额及消费一览无余，让同学们更合理安排生活费。微精弘更是/更有... （期待您的发现）
+
+## 技术栈
+
+Vue3, Typescript, Taro, Vuex
 
 ## 更多资料
 

babel.config.js

@@ -3,9 +3,9 @@
 module.exports = {
   presets: [
     [
-      'taro',
+      "taro",
       {
-        framework: 'vue3',
+        framework: "vue3",
         ts: true,
         loose: false
       }

config/dev.js

@@ -1,7 +1,7 @@
 module.exports = {
   env: {
-    NODE_ENV: '"development"',
-    HOST: '"https://wejh.zjutjh.com"'
+    NODE_ENV: "\"development\"",
+    HOST: "\"https://wejh.zjutjh.com\""
   },
   defineConstants: {},
   mini: {},

config/index.js

@@ -1,39 +1,40 @@
-import { buildDate, commit } from './utils/version';
-import PackageJson from '../package.json';
-import path from 'path';
+import { buildDate, commit } from "./utils/version";
+import PackageJson from "../package.json";
+import path from "path";
 const config = {
-  projectName: 'WeJh-Taro',
-  date: '2021-4-20',
+  projectName: "WeJh-Taro",
+  date: "2021-4-20",
   designWidth: 750,
   deviceRatio: {
     640: 2.34 / 2,
     750: 1,
     828: 1.81 / 2,
     375: 2 / 1
   },
-  sourceRoot: 'src',
-  outputRoot: 'dist',
+  sourceRoot: "src",
+  outputRoot: "dist",
   defineConstants: {
     APP_VERSION: JSON.stringify(PackageJson.version),
-    'process.env.APP_NAME': JSON.stringify(PackageJson.name),
-    'process.env.COMMIT_HASH': JSON.stringify(commit),
-    'process.env.BUILD_TIME': JSON.stringify(buildDate),
-    'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+    "process.env.APP_NAME": JSON.stringify(PackageJson.name),
+    "process.env.COMMIT_HASH": JSON.stringify(commit),
+    "process.env.BUILD_TIME": JSON.stringify(buildDate),
+    "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
   },
   copy: {
     patterns: [],
     options: {}
   },
-  framework: 'vue3',
+  framework: "vue3",
   alias: {
-    '@/assets': path.resolve(__dirname, '..', 'src/assets'),
-    '@/store': path.resolve(__dirname, '..', 'src/store'),
-    '@/utils': path.resolve(__dirname, '..', 'src/utils'),
-    '@/types': path.resolve(__dirname, '..', 'src/types'),
-    '@/services': path.resolve(__dirname, '..', 'src/services'),
-    '@/constants': path.resolve(__dirname, '..', 'src/constants'),
-    '@/components': path.resolve(__dirname, '..', 'src/components'),
-    '@/style': path.resolve(__dirname, '..', 'src/style')
+    "@/assets": path.resolve(__dirname, "..", "src/assets"),
+    "@/store": path.resolve(__dirname, "..", "src/store"),
+    "@/utils": path.resolve(__dirname, "..", "src/utils"),
+    "@/hooks": path.resolve(__dirname, "..", "src/hooks"),
+    "@/types": path.resolve(__dirname, "..", "src/types"),
+    "@/services": path.resolve(__dirname, "..", "src/services"),
+    "@/constants": path.resolve(__dirname, "..", "src/constants"),
+    "@/components": path.resolve(__dirname, "..", "src/components"),
+    "@/style": path.resolve(__dirname, "..", "src/style")
   },
   mini: {
     miniCssExtractPluginOption: {
@@ -53,15 +54,15 @@ const config = {
       cssModules: {
         enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
         config: {
-          namingPattern: 'module', // 转换模式，取值为 global/module
-          generateScopedName: '[name]__[local]___[hash:base64:5]'
+          namingPattern: "module", // 转换模式，取值为 global/module
+          generateScopedName: "[name]__[local]___[hash:base64:5]"
         }
       }
     }
   },
   h5: {
-    publicPath: '/',
-    staticDirectory: 'static',
+    publicPath: "/",
+    staticDirectory: "static",
     postcss: {
       autoprefixer: {
         enable: true,
@@ -70,17 +71,17 @@ const config = {
       cssModules: {
         enable: false, // 默认为 false，如需使用 css modules 功能，则设为 true
         config: {
-          namingPattern: 'module', // 转换模式，取值为 global/module
-          generateScopedName: '[name]__[local]___[hash:base64:5]'
+          namingPattern: "module", // 转换模式，取值为 global/module
+          generateScopedName: "[name]__[local]___[hash:base64:5]"
         }
       }
     }
   }
 };
 
 module.exports = function (merge) {
-  if (process.env.NODE_ENV === 'development') {
-    return merge({}, config, require('./dev'));
+  if (process.env.NODE_ENV === "development") {
+    return merge({}, config, require("./dev"));
   }
-  return merge({}, config, require('./prod'));
+  return merge({}, config, require("./prod"));
 };

config/prod.js

@@ -1,7 +1,7 @@
 module.exports = {
   env: {
-    NODE_ENV: '"production"',
-    HOST: '"https://wejh.zjutjh.com"'
+    NODE_ENV: "\"production\"",
+    HOST: "\"https://wejh.zjutjh.com\""
   },
   defineConstants: {},
   mini: {},

config/utils/version.js

@@ -1,15 +1,15 @@
-import dayjs from 'dayjs';
-const child_process = require('child_process');
+import dayjs from "dayjs";
+const child_process = require("child_process");
 // git 最后一次提交的 Head
 const commit = child_process
-  .execSync('git show -s --format=%H')
+  .execSync("git show -s --format=%H")
   .toString()
   .trim();
 const commitDateObj = new Date(
-  child_process.execSync(`git show -s --format=%cd`).toString()
+  child_process.execSync("git show -s --format=%cd").toString()
 );
-const commitDate = dayjs(commitDateObj).format('YYYY-MM-DD HH:mm:ss');
-const buildDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+const commitDate = dayjs(commitDateObj).format("YYYY-MM-DD HH:mm:ss");
+const buildDate = dayjs().format("YYYY-MM-DD HH:mm:ss");
 
 module.exports = {
   commit,

package.json

@@ -56,8 +56,8 @@
     "@tarojs/cli": "^3.5.5",
     "@types/jest": "^26.0.17",
     "@types/webpack-env": "^1.16.0",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
     "@vue/babel-plugin-jsx": "^1.0.0-rc.4",
     "@vue/compiler-sfc": "^3.0.0",
     "@vue/test-utils": "^2.0.0-rc.6",
@@ -67,12 +67,11 @@
     "cross-env": "^7.0.2",
     "eslint": "^7.25.0",
     "eslint-config-taro": "^3.5.5",
-    "eslint-plugin-vue": "^7.9.0",
+    "eslint-plugin-vue": "^9.8.0",
     "git-revision-webpack-plugin": "^5.0.0",
     "jest": "^26.6.3",
     "jest-serializer-vue": "^2.0.2",
     "jest-transform-stub": "^2.0.0",
-    "prettier": "^2.4.0",
     "ts-jest": "^26.5.5",
     "ts-loader": "^9.2.6",
     "typescript": "^4.4.3",

src/app.config.ts

@@ -1,31 +1,28 @@
 export default {
   pages: [
-    'pages/index/index',
-    'pages/activation/index',
-    'pages/bind/index',
-    'pages/lessonstable/index',
-    'pages/schoolbus/index',
-    'pages/library/index',
-    'pages/schoolcard/index',
-    'pages/about/index',
-    'pages/exam/index',
-    'pages/score/index',
-    'pages/setting/index',
-    'pages/connect/index',
-    'pages/connect/faq/index',
-    'pages/lab/index',
-    'pages/freeroom/index',
-    'pages/canteenflow/index',
-    'pages/announcement/index'
+    "pages/index/index",
+    "pages/activation/index",
+    "pages/bind/index",
+    "pages/lessonstable/index",
+    "pages/schoolbus/index",
+    "pages/library/index",
+    "pages/schoolcard/index",
+    "pages/about/index",
+    "pages/exam/index",
+    "pages/score/index",
+    "pages/setting/index",
+    "pages/connect/index",
+    "pages/connect/faq/index",
+    "pages/lab/index",
+    "pages/freeroom/index",
+    "pages/canteenflow/index",
+    "pages/announcement/index"
   ],
   darkmode: false,
   window: {
-    backgroundTextStyle: 'light',
-    navigationBarBackgroundColor: '#fff',
-    // navigationBarBackgroundColor: '@navBgColor',
-    // navigationBarTextStyle: '@navTxtStyle',
-    navigationBarTextStyle: 'black',
-    navigationStyle: 'custom'
+    backgroundTextStyle: "light",
+    navigationBarBackgroundColor: "#fff",
+    navigationBarTextStyle: "black",
+    navigationStyle: "custom"
   }
-  // themeLocation: 'theme.json'
 };

src/app.scss

@@ -1,3 +1,2 @@
-@import './style/icons.scss';
 @import './style';
-@import './style/puhuiti.scss'
+@import './style/theme.scss';

src/app.ts

@@ -1,15 +1,15 @@
-import { createApp } from 'vue';
-import store from './store/index';
-import { LoginByTaro } from './services';
-import { SystemService } from './services';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc'; // dependent on utc plugin
-import 'dayjs/locale/zh-cn';
-import './app.scss';
+import { createApp } from "vue";
+import store from "./store/index";
+import { LoginByTaro } from "./services";
+import { SystemService } from "./services";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+import relativeTime from "dayjs/plugin/relativeTime";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc"; // dependent on utc plugin
+import "dayjs/locale/zh-cn";
+import "./app.scss";
 
-dayjs.locale('zh-cn');
+dayjs.locale("zh-cn");
 dayjs.extend(customParseFormat);
 dayjs.extend(utc);
 dayjs.extend(relativeTime);

src/components/Alarm/index.scss

@@ -5,7 +5,7 @@
 }
 
 .wjh-alarm-icon {
-  font-size: 1.2rem;
+  font-size: 1.2rem !important;
   color: var(--wjh-color-text-secondary);
 }
 
@@ -21,4 +21,4 @@
   border-radius: 1000Px;
   position: relative;
   text-align: center;
-}
+}