增加报名申请

api/my.js

@@ -34,14 +34,14 @@ export function sendCode(data) {
  * 检验验证码
  */
 export function checkCode(params) {
-  return httpRequest.get('/api/usercenter/user/check-code' + params)
+  return httpRequest.get('/api/usercenter/user/check-code', { params })
 }
 
 /**
  * 获取报名信息
  */
 export function getApplication(params) {
-  return httpRequest.get(`/api/enrollment/v1.0/application-materials/${projectId}`, params)
+  return httpRequest.get(`/api/enrollment/v1.0/application-materials/${projectId}`, { params })
 }
 /**
  * 获取报名信息
@@ -65,7 +65,7 @@ export function getApplicationStatus() {
 export function getOrder(params) {
   return httpRequest.get(
     `/api/enrollment/v1.0/application-materials/payment-records/request/${projectId}/APPLICATION_FEE`,
-    params
+    { params }
   )
 }
 
@@ -75,7 +75,7 @@ export function getOrder(params) {
 export function checkPay(id, params) {
   return httpRequest.get(
     `/api/enrollment/v1.0/application-materials/payment-records/check-status/${projectId}/APPLICATION_FEE/${id}`,
-    params
+    { params }
   )
 }
 
@@ -125,7 +125,7 @@ export function logout() {
 export function changeFileStatus(userId, recordId, status) {
   return httpRequest.get(
     `/api/enrollment/v1.0/application-materials/attachments/change-status/${projectId}/${userId}/${recordId}`,
-    { status }
+    { params: { status } }
   )
 }
 
@@ -146,8 +146,8 @@ export function createSign(data) {
 /**
  * 获取签名文档
  */
-export function getSignDocument(data) {
-  return httpRequest.get('/api/usercenter/v1/sign/document', data)
+export function getSignDocument(params) {
+  return httpRequest.get('/api/usercenter/v1/sign/document', { params })
 }
 
 /**

components/Head.vue

@@ -8,7 +8,10 @@
           alt=""
           @click="goPage('/')"
         />
-        <div class="user" v-if="user.id">{{ user.realname }}</div>
+        <div class="user" v-if="user.id">
+          <span>{{ user.realname }}</span
+          ><em>|</em><span class="logout" @click="logout">退出</span>
+        </div>
         <div class="login-btn-box" v-else>
           <div class="login"><a :href="loginURL">快速登录</a></div>
           <div class="register"><a :href="registerURL">注册</a></div>
@@ -224,6 +227,11 @@ export default {
       const dom2 = document.getElementById('show-enroll-content')
       dom.style.display = 'block'
       dom2.style.display = 'block'
+    },
+    logout() {
+      this.$store.dispatch('logout').then(() => {
+        this.$router.replace('/')
+      })
     }
   },
   computed: {
@@ -231,7 +239,9 @@ export default {
       return this.$store.state.user || {}
     },
     loginURL() {
-      return `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}`
+      return `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(
+        location.origin + this.$route.fullPath
+      )}`
     },
     registerURL() {
       console.log(this.$route)
@@ -285,6 +295,15 @@ li {
         cursor: pointer;
         display: block;
       }
+      .user {
+        margin-left: auto;
+        font-size: 18px;
+        em {
+          font-size: 16px;
+          font-style: normal;
+          padding: 0 14px;
+        }
+      }
       .login-btn-box {
         margin-left: auto;
         display: flex;

modules/my/layout.vue

@@ -30,7 +30,7 @@ export default {
 
 <style lang="scss" scoped>
 .layout {
-  max-width: 970px;
+  max-width: 1200px;
   margin: 0 auto;
   overflow: hidden;
 }

nuxt.config.js

@@ -62,7 +62,7 @@ export default {
     ]
   },
   // Global CSS: https://go.nuxtjs.dev/config-css
-  css: ['element-ui/lib/theme-chalk/index.css', 'assets/css/base.css'],
+  css: ['@ezijing/vue-form/dist/vue-form.css', 'assets/theme/index.css', 'assets/css/base.css'],
 
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
   plugins: [
@@ -90,9 +90,6 @@ export default {
     transpile: [/^element-ui/]
   },
   router: {
-    scrollBehavior(to, from, savedPosition) {
-      return { x: 0, y: 0 }
-    },
     extendRoutes: routes
   }
 }

package.json

@@ -10,7 +10,6 @@
   },
   "dependencies": {
     "@ezijing/vue-form": "^2.2.1",
-    "@ezijing/vue-passport": "^1.0.3",
     "axios": "^0.21.1",
     "core-js": "^3.9.1",
     "driver.js": "^0.9.8",

plugins/element-ui.js

 import Vue from 'vue'
-import VuePassport from '@ezijing/vue-passport'
-import '@ezijing/vue-passport/dist/vue-passport.css'
-import VueForm from '@ezijing/vue-form'
-import '@ezijing/vue-form/dist/vue-form.css'
 import Element from 'element-ui'
 import locale from 'element-ui/lib/locale/lang/en'
+import VueForm from '@ezijing/vue-form'
 
 Vue.use(Element, { locale })
 Vue.use(VueForm)
-Vue.use(VuePassport)

plugins/router.js

@@ -3,11 +3,9 @@ export default ({ app, store }) => {
     const isLogin = store.state.user.id || (await store.dispatch('checkLogin'))
 
     if (to.meta.requiredLogin && !isLogin) {
-      next()
       location.href = `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.href)}`
       return
     }
-    console.log(to, isLogin)
     next()
   })
 }

plugins/styles.scss

-/* 改变主题色变量 */
-$--color-primary: #c41230;
-/* 改变 icon 字体路径变量，必需 */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
-
-/* 引入element-ui对应scss文件，重新编译 */
-@import '~element-ui/packages/theme-chalk/src/index';

router.scrollBehavior.js

+export default function(to, from, savedPosition) {
+  return { x: 0, y: 0 }
+}