update

api/index.js

@@ -2,12 +2,12 @@ import httpRequest from '@/utils/httpRequest'
 
 // 获取新闻列表
 export function getNewsList(params) {
-  return httpRequest.get(`/zws/v1/cms/news`, { params })
+  return httpRequest.get(`/api/zws/v1/cms/news`, { params })
 }
 
 // 获取新闻详情
 export function getNewsDetails(params) {
-  return httpRequest.get(`/zws/v1/cms/new`, { params })
+  return httpRequest.get(`/api/zws/v1/cms/new`, { params })
 }
 
 /**

components/Head.vue

@@ -8,10 +8,11 @@
           alt=""
           @click="goPage('/')"
         />
-        <!-- <div class="login-btn-box">
-          <div class="login">快速登录</div>
-          <div class="register">注册</div>
-        </div> -->
+        <div class="user" v-if="user.id">{{ user.realname }}</div>
+        <div class="login-btn-box" v-else>
+          <div class="login"><a :href="loginURL">快速登录</a></div>
+          <div class="register"><a :href="registerURL">注册</a></div>
+        </div>
       </div>
     </div>
     <div class="head-nav-content max-width-content">
@@ -167,6 +168,10 @@ export default {
               path: '/alumni/sharing'
             }
           ]
+        },
+        {
+          name: '报名申请',
+          path: '/my'
         }
       ],
       time: null
@@ -222,6 +227,18 @@ export default {
     }
   },
   computed: {
+    user() {
+      return this.$store.state.user || {}
+    },
+    loginURL() {
+      return `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.origin + this.$route.fullPath)}`
+    },
+    registerURL() {
+      console.log(this.$route)
+      return `${process.env.loginURL}/register?redirect_uri=${encodeURIComponent(
+        location.origin + this.$route.fullPath
+      )}`
+    },
     getNameActive() {
       return item => {
         const currentPath = this.$route.path

modules/my/account/home.vue

@@ -45,9 +45,7 @@ import 'driver.js/dist/driver.min.css'
 export default {
   name: 'AppHome',
   data() {
-    const user = window.G.UserInfo
     return {
-      user,
       material: {},
       progress: {},
       submissionStage: {
@@ -61,6 +59,9 @@ export default {
     }
   },
   computed: {
+    user() {
+      return this.$store.state.user
+    },
     activeProgress() {
       for (const key in this.submissionStage) {
         const list = this.submissionStage[key]

modules/my/admission/form/cjd.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'admission_cjd',
     title: '成绩单（中+英）',
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -45,8 +45,8 @@ export default function(_this) {
           label: '中文成绩单',
           model: 'REPORT_CARD_CN',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'REPORT_CARD_CN' }
           }
         },
@@ -55,8 +55,8 @@ export default function(_this) {
           label: '英文成绩单',
           model: 'REPORT_CARD_EN',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'REPORT_CARD_EN' }
           }
         }

modules/my/admission/form/xfjn.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'admission_xfjn',
     title: '缴费凭证',
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -41,8 +41,8 @@ export default function(_this) {
           model: 'PAYMENT_VOUCHER',
           label: '上传缴费凭证',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'PAYMENT_VOUCHER' }
           },
           append: `申请者可将转账/支付缴费凭证截图或拍照后提交。<br>

modules/my/admission/form/xy.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'admission_xy',
     title: '入学协议',
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -34,8 +34,8 @@ export default function(_this) {
           required: true,
           model: 'ADMISSION_AGREEMENT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ADMISSION_AGREEMENT' }
           },
           prepend: `

modules/my/application/form/declare.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { submission_stage: submissionStage = 'FILLING' } = data.data.material
         const isSubmited = submissionStage !== 'FILLING'
@@ -22,7 +22,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
       callback() {
         _this.getApplication()
         this.form.options.disabled = true

modules/my/application/form/info/answer.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { answers = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -28,7 +28,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         return {
           answers: [

modules/my/application/form/info/career.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { careers: list = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -19,7 +19,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         const careers = data.map(item => {
           return [

modules/my/application/form/info/education.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { educations: list = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -19,7 +19,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         const educations = data.map(item => {
           return ['start_date', 'end_date', 'school_name_cn', 'major_cn', 'degree'].reduce((result, key) => {

modules/my/application/form/info/first.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return this.tabActive === 'application_info_first'
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const {
           basic_info: basicInfo = {},
@@ -37,7 +37,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         const basicInfo = ['phone_number', 'email', 'id_type'].reduce((result, key) => {
           result[key] = data[key]
@@ -79,8 +79,8 @@ export default function(_this) {
           label: '身份证人像面',
           model: 'ID_CARD_BACK',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ID_CARD_BACK' },
             limit: 1,
             accept: 'image/*',
@@ -97,8 +97,8 @@ export default function(_this) {
           label: '身份证国徽面',
           model: 'ID_CARD_FRONT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ID_CARD_FRONT' },
             limit: 1,
             accept: 'image/*',
@@ -115,8 +115,8 @@ export default function(_this) {
           label: '港澳台身份证',
           model: 'HK_ID_CARD',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'HK_ID_CARD' },
             limit: 1,
             accept: 'image/*'
@@ -132,8 +132,8 @@ export default function(_this) {
           label: '中国护照',
           model: 'PASSPORT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'PASSPORT' },
             limit: 1,
             accept: 'image/*'
@@ -149,8 +149,8 @@ export default function(_this) {
           label: '其他证件',
           model: 'OTHER_ID_CARD_PHOTO',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'OTHER_ID_CARD_PHOTO' },
             limit: 1,
             accept: 'image/*'

modules/my/application/form/info/honor.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { honors: list = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -18,7 +18,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         const honors = data.map(item => {
           return ['time', 'title', 'institution_cn'].reduce((result, key) => {

modules/my/application/form/info/profile.js

@@ -13,7 +13,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const {
           basic_info: basicInfo = {},
@@ -39,7 +39,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         // let [province, city] = data.city.split('-')
         // data.address_province = province
@@ -101,8 +101,8 @@ export default function(_this) {
           label: '身份证人像面',
           model: 'ID_CARD_BACK',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ID_CARD_BACK' },
             limit: 1,
             accept: 'image/*',
@@ -119,8 +119,8 @@ export default function(_this) {
           label: '身份证国徽面',
           model: 'ID_CARD_FRONT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'ID_CARD_FRONT' },
             limit: 1,
             accept: 'image/*',
@@ -137,8 +137,8 @@ export default function(_this) {
           label: '港澳台身份证',
           model: 'HK_ID_CARD',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'HK_ID_CARD' },
             limit: 1,
             accept: 'image/*'
@@ -154,8 +154,8 @@ export default function(_this) {
           label: '中国护照',
           model: 'PASSPORT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'PASSPORT' },
             limit: 1,
             accept: 'image/*'
@@ -171,8 +171,8 @@ export default function(_this) {
           label: '其他证件',
           model: 'OTHER_ID_CARD_PHOTO',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'OTHER_ID_CARD_PHOTO' },
             limit: 1,
             accept: 'image/*'

modules/my/application/form/info/training.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { trainings: list = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -18,7 +18,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         const trainings = data.map(item => {
           return ['start_date', 'end_date', 'institution_cn', 'course_cn'].reduce((result, key) => {

modules/my/application/form/tjx.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -29,7 +29,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
       beforeRequest(data) {
         return { reco_letters: data }
       }

modules/my/application/form/wfzzm.js

@@ -6,7 +6,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         this.form.options.disabled = submissionStage !== 'FILLING'
@@ -28,8 +28,8 @@ export default function(_this) {
           required: true,
           model: 'NO_CRIMINAL_CERT',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'NO_CRIMINAL_CERT' },
             limit: 1
           },

modules/my/application/pay.vue

@@ -44,6 +44,9 @@ export default {
     }
   },
   computed: {
+    user() {
+      return this.$store.state.user
+    },
     // 二维码地址
     qrcodeValue() {
       return this.order.payment_url
@@ -88,7 +91,7 @@ export default {
     },
     // 检查支付状态
     checkPay(order) {
-      const userId = window.G.UserInfo.id
+      const userId = this.user.id
       api.checkPay(order.id, { user_id: userId }).then(response => {
         if (response.data.payment_status === 'SUCCESS') {
           this.timer && clearInterval(this.timer)

modules/my/interview/form/byzs.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_byzs',
   title: '毕业证书',
   get: {
-    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -32,8 +32,8 @@ export default {
         required: true,
         model: 'DIPLOMA_CN',
         attrs: {
-          action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+          deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
           data: { file_type: 'DIPLOMA_CN' }
         },
         append:

modules/my/interview/form/cjd.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'interview_cjd',
     title: '成绩单（中+英）',
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -32,7 +32,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
       beforeRequest(data) {
         return { submission_stage: 'INTERVIEW_APPLICATION' }
       },
@@ -60,8 +60,8 @@ export default function(_this) {
           label: '中文成绩单',
           model: 'REPORT_CARD_CN',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'REPORT_CARD_CN' }
           }
         },
@@ -70,8 +70,8 @@ export default function(_this) {
           label: '英文成绩单',
           model: 'REPORT_CARD_EN',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'REPORT_CARD_EN' }
           }
         }

modules/my/interview/form/xwzs.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_xwzs',
   title: '学位证书',
   get: {
-    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -33,8 +33,8 @@ export default {
         required: true,
         model: 'DEGREE_CERT_CN',
         attrs: {
-          action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+          deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
           data: { file_type: 'DEGREE_CERT_CN' }
         },
         append:

modules/my/interview/form/xwzszm.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_xwzsywzm',
   title: '学位证书英文证明',
   get: {
-    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -33,8 +33,8 @@ export default {
         required: true,
         model: 'DEGREE_CERT_EN',
         attrs: {
-          action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+          deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
           data: { file_type: 'DEGREE_CERT_EN' }
         },
         append: '请将学校出具的学位证书英文证明原件扫描或者拍照后提交。'

modules/my/interview/form/ywjl.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_ywjl',
   title: '英文简历',
   get: {
-    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -33,8 +33,8 @@ export default {
         required: true,
         model: 'RESUME_EN',
         attrs: {
-          action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+          deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
           data: { file_type: 'RESUME_EN' }
         },
         append: `

modules/my/interview/form/zp.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'interview_zp',
     title: '2寸照片',
     get: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -24,7 +24,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
       beforeRequest(data) {
         return { submission_stage: 'INTERVIEW_APPLICATION' }
       },
@@ -47,8 +47,8 @@ export default function(_this) {
           type: 'v-upload',
           model: 'PERSONAL_PHOTO_FOR_ID',
           attrs: {
-            action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/put`,
+            deleteAction: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/attachments/${process.env.projectId}/delete`,
             data: { file_type: 'PERSONAL_PHOTO_FOR_ID' },
             limit: 1
           },

modules/my/welcome/indexPay.vue

@@ -47,6 +47,9 @@ export default {
     }
   },
   computed: {
+    user() {
+      return this.$store.state.user
+    },
     // 二维码地址
     qrcodeValue() {
       return this.order.payment_url
@@ -91,7 +94,7 @@ export default {
     },
     // 检查支付状态
     checkPay(order) {
-      const userId = window.G.UserInfo.id
+      const userId = this.user.id
       api.checkPay(order.id, { user_id: userId }).then(response => {
         if (response.data.payment_status === 'SUCCESS') {
           this.timer && clearInterval(this.timer)

nuxt.config.js

@@ -7,7 +7,8 @@ if (process.env.NODE_ENV === 'production') {
   config = {
     env: {
       projectId: '1001',
-      baseURL: 'https://project-api.ezijing.com'
+      baseURL: 'https://project-api.ezijing.com',
+      loginURL: 'https://login.ezijing.com/auth'
     },
     server: { port: 2048, host: '0.0.0.0' }
   }
@@ -15,7 +16,8 @@ if (process.env.NODE_ENV === 'production') {
   config = {
     env: {
       projectId: '1001',
-      baseURL: 'https://project-api.ezijing.com'
+      baseURL: 'https://project-api.ezijing.com',
+      loginURL: 'https://login.ezijing.com/auth'
     },
     server: {
       host: 'dev.ezijing.com',
@@ -29,6 +31,7 @@ if (process.env.NODE_ENV === 'production') {
 
 export default {
   ...config,
+  ssr: false,
   // Global page headers: https://go.nuxtjs.dev/config-head
   head: {
     title: '紫荆教育-在线MBA课程-MBA在线课程-专业金融在线教育品牌',
@@ -63,6 +66,7 @@ export default {
 
   // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins
   plugins: [
+    '@/plugins/router',
     '@/plugins/axios',
     '@/plugins/element-ui',
     {

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'
 
 Vue.use(Element, { locale })
+Vue.use(VueForm)
+Vue.use(VuePassport)

plugins/router.js

+export default ({ app, store }) => {
+  app.router.beforeEach(async (to, from, next) => {
+    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()
+  })
+}

router/routes.js

+/**
+ * 报名申请相关的自定义路由
+ */
+
 export default (routes, resolve) => {
   routes.push(
     {
       path: '/my',
-      component: resolve(__dirname, '../modules/my/layout.vue'),
+      component: resolve(__dirname, '../layouts/main.vue'),
       children: [
         {
           name: 'apply',

store/index.js

+import { getUser, logout } from '@/api/my'
+export const state = () => ({
+  user: {}
+})
+
+export const mutations = {
+  setUser(state, user) {
+    state.user = user
+  },
+  removeUser(state) {
+    state.user = {}
+  }
+}
+
+export const actions = {
+  getUser({ commit }) {
+    getUser().then(response => {
+      commit('setUser', response.data)
+    })
+  },
+  // 退出登录
+  logout({ commit }) {
+    return logout().then(response => {
+      commit('setUser', {})
+      return response
+    })
+  },
+  // 检测登录状态
+  async checkLogin({ commit }) {
+    const isLogin = await getUser()
+      .then(response => {
+        commit('setUser', response.data)
+        return true
+      })
+      .catch(() => {
+        commit('setUser', {})
+        return false
+      })
+    return isLogin
+  }
+}

utils/httpRequest.js

@@ -35,8 +35,18 @@ httpRequest.interceptors.request.use(
 httpRequest.interceptors.response.use(
   function(response) {
     const { data } = response
+    // zws
     if (parseInt(data.code)) {
-      Message.error(data.msg)
+      return Promise.reject(data)
+    }
+    if (parseInt(data.error) && data.message === '需要登录才能调用接口') {
+      location.href = `${process.env.loginURL}/login/index?redirect_uri=${encodeURIComponent(location.href)}`
+      return Promise.reject(data)
+    }
+
+    // enrollment
+    if (parseInt(data.error)) {
+      Message.error(data.message)
       return Promise.reject(data)
     }
     return data