bug fixes

.browserslistrc

 > 1%
 last 2 versions
+not dead

.eslintrc.js

@@ -3,12 +3,15 @@ module.exports = {
   env: {
     node: true
   },
-  extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"],
+  'extends': [
+    'plugin:vue/essential',
+    'eslint:recommended'
+  ],
   parserOptions: {
-    parser: "babel-eslint"
+    parser: 'babel-eslint'
   },
   rules: {
-    "no-console": process.env.NODE_ENV === "production" ? "error" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "error" : "off"
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
   }
-};
+}

.gitignore

@@ -2,6 +2,7 @@
 node_modules
 /dist
 
+
 # local env files
 .env.local
 .env.*.local
@@ -10,6 +11,7 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
 
 # Editor directories and files
 .idea

README.md

-# ezijing-office-h5
+# ezijing-offices-h5
 
 ## Project setup
-
 ```
-npm install
+yarn install
 ```
 
 ### Compiles and hot-reloads for development
-
 ```
-npm run serve
+yarn serve
 ```
 
 ### Compiles and minifies for production
-
 ```
-npm run build
+yarn build
 ```
 
 ### Lints and fixes files
-
 ```
-npm run lint
+yarn lint
 ```
 
 ### Customize configuration
-
 See [Configuration Reference](https://cli.vuejs.org/config/).

package.json

 {
-  "name": "ezijing-office-h5",
+  "name": "ezijing-offices-h5",
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve --open",
+    "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint",
-    "dev-build": "vue-cli-service build --mode dev"
+    "lint": "vue-cli-service lint"
   },
   "dependencies": {
     "axios": "^0.20.0",
@@ -22,18 +21,16 @@
     "vuex": "^3.5.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.4",
-    "@vue/cli-plugin-eslint": "~4.5.4",
-    "@vue/cli-plugin-router": "~4.5.4",
-    "@vue/cli-service": "~4.5.4",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "babel-eslint": "^10.0.3",
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-router": "~4.5.0",
+    "@vue/cli-plugin-vuex": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "babel-eslint": "^10.1.0",
     "babel-plugin-import": "^1.13.0",
     "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-vue": "^6.1.2",
-    "prettier": "^1.19.1",
-    "sass": "^1.25.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "sass": "^1.26.5",
     "sass-loader": "^8.0.2",
     "vue-template-compiler": "^2.6.11"
   }

prettier.config.js

-module.exports = {
-  semi: false,
-  singleQuote: true
-}

src/views/Create.vue

@@ -68,11 +68,9 @@ export default {
       }
       api.createAffair(data).then(response => {
         if (response.success) {
-          this.$dialog
-            .alert({ confirmButtonText: '确定', message: '提交成功' })
-            .then(() => {
-              this.$router.push({ name: 'list', query: this.$route.query })
-            })
+          this.$dialog.alert({ confirmButtonText: '确定', message: '提交成功' }).then(() => {
+            this.$router.push({ name: 'list', query: this.$route.query })
+          })
         } else {
           this.$toast(response.message)
         }

src/views/Edit.vue

 <template>
   <div class="main">
     <div class="form-tips">{{ page.tips }}</div>
-    <v-form
-      ref="form"
-      :model="formModel"
-      :fields="page.form.fields"
-      @submit="onSubmit"
-    ></v-form>
+    <v-form ref="form" :model="formModel" :fields="page.form.fields" @submit="onSubmit"></v-form>
     <div class="fixed-box">
       <div class="fixed-inner">
         <div class="fixed-button" @click="handleSubmit">提交</div>
@@ -78,11 +73,9 @@ export default {
       }
       api.updateAffair(this.viewId, data).then(response => {
         if (response.success) {
-          this.$dialog
-            .alert({ confirmButtonText: '确定', message: '修改成功' })
-            .then(() => {
-              this.$router.push({ name: 'list', query: this.$route.query })
-            })
+          this.$dialog.alert({ confirmButtonText: '确定', message: '修改成功' }).then(() => {
+            this.$router.push({ name: 'list', query: this.$route.query })
+          })
         } else {
           this.$toast(response.message)
         }

src/views/Index.vue

@@ -31,14 +31,10 @@ export default {
     },
     // 成绩单列表
     transcriptList() {
-      return this.affairTypes.filter(item =>
-        ['pareport', 'elreport'].includes(item.form_name)
-      )
+      return this.affairTypes.filter(item => ['pareport', 'elreport'].includes(item.form_name))
     },
     chooseList() {
-      let list = this.affairTypes.filter(
-        item => !['pareport', 'elreport'].includes(item.form_name)
-      )
+      let list = this.affairTypes.filter(item => !['pareport', 'elreport'].includes(item.form_name))
       list.push({
         id: 'transcript',
         affair_name: '成绩单',

src/views/List.vue

 <template>
   <div class="list">
-    <van-list
-      v-model="loading"
-      :finished="finished"
-      @load="onLoad"
-      v-if="list.length"
-    >
-      <card
-        v-for="item in list"
-        :data="item"
-        :key="item.id"
-        v-bind="page.card"
-        @remove="onRemove"
-      ></card>
+    <van-list v-model="loading" :finished="finished" @load="onLoad" v-if="list.length">
+      <card v-for="item in list" :data="item" :key="item.id" v-bind="page.card" @remove="onRemove"></card>
     </van-list>
     <div class="empty" v-else>{{ page.emptyText }}</div>
     <div class="fixed-box">
       <div class="fixed-inner">
-        <div class="fixed-button" @click="toCreatePage">
-          {{ page.buttonText }}
-        </div>
+        <div class="fixed-button" @click="toCreatePage">{{ page.buttonText }}</div>
       </div>
     </div>
   </div>
@@ -82,10 +69,7 @@ export default {
         forbidClick: true,
         duration: 0
       })
-      const params = Object.assign(
-        { affair_id: this.channelId },
-        this.pagination
-      )
+      const params = Object.assign({ affair_id: this.channelId }, this.pagination)
       api
         .getAffairList(params)
         .then(response => {

src/views/Login.vue

@@ -7,12 +7,7 @@
     <div class="login-bd">
       <div class="login-form">
         <div class="login-form__item">
-          <input
-            type="text"
-            class="login-input"
-            placeholder="手机/邮箱/用户名"
-            v-model="ruleForm.account"
-          />
+          <input type="text" class="login-input" placeholder="手机/邮箱/用户名" v-model="ruleForm.account" />
         </div>
         <div class="login-form__item">
           <input
@@ -24,9 +19,7 @@
           />
         </div>
         <div class="login-form__item">
-          <van-checkbox v-model="ruleForm.RememberMe" shape="square"
-            >下次自动登录</van-checkbox
-          >
+          <van-checkbox v-model="ruleForm.RememberMe" shape="square">下次自动登录</van-checkbox>
         </div>
         <div class="login-form__item">
           <div class="login-button" @click="onSubmit">登录</div>
@@ -36,9 +29,7 @@
     <div class="login-ft">
       <p class="login-tips">
         登录遇到困难？请点击
-        <span class="forget-password" @click="passwordVisible = true"
-          >找回密码</span
-        >
+        <span class="forget-password" @click="passwordVisible = true">找回密码</span>
       </p>
     </div>
     <password v-model="passwordVisible" />
@@ -141,10 +132,7 @@ export default {
       location.href = wechatUrl
     },
     checkWechatLogin() {
-      return !!(
-        Cookies.get('wechat_login_error') ||
-        Cookies.get('wechat_login_no_phone_error')
-      )
+      return !!(Cookies.get('wechat_login_error') || Cookies.get('wechat_login_no_phone_error'))
     }
   },
   created() {

src/views/Password.vue

@@ -7,12 +7,7 @@
     @closed="onClosed"
   >
     <div class="password" v-if="!isSuccess">
-      <van-form
-        ref="form"
-        class="form"
-        validate-trigger="onChange"
-        @submit="onSubmit"
-      >
+      <van-form ref="form" class="form" validate-trigger="onChange" @submit="onSubmit">
         <h2 class="password-title">修改密码</h2>
         <van-field
           v-model="ruleForm.account"
@@ -32,10 +27,7 @@
           :rules="[{ required: true, message: '请输入验证码' }]"
         >
           <template slot="button">
-            <countdown-button
-              @click.native="onSendCode"
-              ref="countdown"
-            ></countdown-button>
+            <countdown-button @click.native="onSendCode" ref="countdown"></countdown-button>
           </template>
         </van-field>
         <van-field
@@ -62,18 +54,14 @@
           ]"
         />
         <div style="margin: 16px 16px 10px;">
-          <van-button block native-type="submit" class="password-button"
-            >立即更改</van-button
-          >
+          <van-button block native-type="submit" class="password-button">立即更改</van-button>
         </div>
       </van-form>
     </div>
     <div class="password-success" v-else>
       <span class="password-success__icon"></span>
       <span class="password-success__text">密码修改成功</span>
-      <van-button block class="password-button" @click="onClosed"
-        >立即登录</van-button
-      >
+      <van-button block class="password-button" @click="onClosed">立即登录</van-button>
     </div>
   </van-popup>
 </template>
@@ -189,11 +177,7 @@ export default {
   background-color: transparent;
 }
 .password-button {
-  background: linear-gradient(
-    180deg,
-    rgba(255, 155, 150, 1) 0%,
-    rgba(206, 62, 58, 1) 100%
-  );
+  background: linear-gradient(180deg, rgba(255, 155, 150, 1) 0%, rgba(206, 62, 58, 1) 100%);
   color: #fff;
   border: 0;
 }

src/views/View.vue

@@ -14,21 +14,15 @@
       </template>
       <div class="p-item">
         <div class="p-title">审核状态</div>
-        <div class="p-content">
-          {{ statusText }}
-        </div>
+        <div class="p-content">{{ statusText }}</div>
       </div>
       <div class="p-item" v-if="detail.approve_time1 || detail.approve_time2">
         <div class="p-title">审核时间</div>
-        <div class="p-content">
-          {{ detail.approve_time1 || detail.approve_time2 }}
-        </div>
+        <div class="p-content">{{ detail.approve_time1 || detail.approve_time2 }}</div>
       </div>
       <div class="p-item" v-if="detail.remark1 || detail.remark2">
         <div class="p-title">备注</div>
-        <div class="p-content is-red">
-          {{ detail.remark1 || detail.remark2 }}
-        </div>
+        <div class="p-content is-red">{{ detail.remark1 || detail.remark2 }}</div>
       </div>
     </div>
   </div>
@@ -84,11 +78,11 @@ export default {
     statusText() {
       const map = {
         '-1': '待审核',
-        '0': '未通过',
-        '1': '通过',
-        '2': '通过',
-        '3': '未通过',
-        '4': '通过'
+        0: '未通过',
+        1: '通过',
+        2: '通过',
+        3: '未通过',
+        4: '通过'
       }
       return map[this.detail.status]
     }

src/views/transcript/Create.vue

@@ -77,8 +77,7 @@ const pages = {
   },
   elreport: {
     title: '电子成绩单',
-    tips:
-      '毕业生可申请成绩单。<br />请仔细核查您填写的信息后提交，提交后不可修改。电子成绩单将发送至您填写的邮箱。',
+    tips: '毕业生可申请成绩单。<br />请仔细核查您填写的信息后提交，提交后不可修改。电子成绩单将发送至您填写的邮箱。',
     form: {
       fields: [
         // {
@@ -174,11 +173,9 @@ export default {
       data.affair_id = this.channelId
       api.createAffair(data).then(response => {
         if (response.success) {
-          this.$dialog
-            .alert({ confirmButtonText: '确定', message: '已提交成功！' })
-            .then(() => {
-              this.getDetail()
-            })
+          this.$dialog.alert({ confirmButtonText: '确定', message: '已提交成功！' }).then(() => {
+            this.getDetail()
+          })
         } else {
           this.$toast(response.message)
         }

src/views/transcript/Index.vue

@@ -2,11 +2,7 @@
   <div class="choose">
     <div class="choose-list">
       <van-radio-group v-model="radio">
-        <div
-          class="choose-item"
-          v-for="item in transcriptList"
-          :key="item.value"
-        >
+        <div class="choose-item" v-for="item in transcriptList" :key="item.value">
           <van-radio :name="item.id">{{ item.affair_name }}</van-radio>
         </div>
       </van-radio-group>
@@ -36,9 +32,7 @@ export default {
     },
     // 成绩单列表
     transcriptList() {
-      return this.affairTypes.filter(item =>
-        ['pareport', 'elreport'].includes(item.form_name)
-      )
+      return this.affairTypes.filter(item => ['pareport', 'elreport'].includes(item.form_name))
     }
   },
   methods: {