Merge branch 'ciis' of https://gitlab.ezijing.com/ezijing/new-project into ciis

.config.dev.js

 module.exports = {
   domain: 'dev.ezijing.com',
-  url: 'https://ciis.ezijing.com/api',
+  url: 'https://project-api.ezijing.com/api',
   isEnableToIphoneDebugger: false,
   // apiBaseURL: '//demo-login.ezijing.com/',
   webpack: {

.config.pro.js

 module.exports = {
-  url: '/api',
+  url: '//project-api.ezijing.com/',
   DesDir: './client-dist',
-  apiBaseURL: '/api',
+  apiBaseURL: '//project-api.ezijing.com/api',
   isUploadStatic: false,
   isEnableToIphoneDebugger: false,
   webpack: {

.config.test.js

 module.exports = {
-  url: '/api',
+  url: '//project-api2.ezijing.com/',
   DesDir: './client-dist',
-  apiBaseURL: '/api',
+  apiBaseURL: '//project-api2.ezijing.com/api',
   isUploadStatic: false,
   isEnableToIphoneDebugger: false,
   webpack: {

build/config.js

@@ -7,7 +7,7 @@ let config = {
   DesDir: '../client-dist',
 
   HtmlPath: 'src/index.html',
-  IcoPath: 'src/assets/favicon.ico',
+  IcoPath: 'src/assets/favicon1.ico',
 
   JsPath: 'src/main.js',
 

package-lock.json

@@ -5748,7 +5748,7 @@
     },
     "html-tags": {
       "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/html-tags/download/html-tags-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
       "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos="
     },
     "html-webpack-plugin": {
@@ -6713,7 +6713,7 @@
     },
     "lodash.kebabcase": {
       "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.kebabcase/download/lodash.kebabcase-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
       "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY="
     },
     "loglevel": {
@@ -13585,7 +13585,7 @@
     },
     "svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/svg-tags/download/svg-tags-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q="
     },
     "swiper": {

src/assets/images/logo.svg

+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 524.01 175.41"><defs><style>.cls-1{fill:#231815;}.cls-2{fill:#ba003f;}</style></defs><title>资源 3</title><g id="图层_2" data-name="图层 2"><g id="图层_1-2" data-name="图层 1"><path class="cls-1" d="M339.69,120.27v4H328.77V129h10v3.73h-10V138h11.15v4h-15.7V120.27Z"/><path class="cls-1" d="M355.48,120.27a10.33,10.33,0,0,1,3.72.67,8,8,0,0,1,3,2,9.44,9.44,0,0,1,2,3.35,14.31,14.31,0,0,1,.71,4.73,16,16,0,0,1-.58,4.39,10,10,0,0,1-1.75,3.48,8.41,8.41,0,0,1-2.93,2.3,9.48,9.48,0,0,1-4.13.84h-8.92V120.27ZM355.16,138a5.6,5.6,0,0,0,1.91-.33,4.41,4.41,0,0,0,1.66-1.11,5.75,5.75,0,0,0,1.15-2,9.36,9.36,0,0,0,.44-3.05,13,13,0,0,0-.31-3,6.1,6.1,0,0,0-1-2.27,4.53,4.53,0,0,0-1.85-1.45,7.08,7.08,0,0,0-2.82-.5h-3.24V138Z"/><path class="cls-1" d="M386.8,140.39a9.26,9.26,0,0,1-6.49,2.15,9.16,9.16,0,0,1-6.5-2.14q-2.31-2.13-2.31-6.59V120.27h4.55v13.54a10.05,10.05,0,0,0,.15,1.74,3.49,3.49,0,0,0,.61,1.51,3.24,3.24,0,0,0,1.28,1.07,5,5,0,0,0,2.22.41,4.15,4.15,0,0,0,3.36-1.14,5.65,5.65,0,0,0,.93-3.59V120.27h4.55v13.54Q389.15,138.23,386.8,140.39Z"/><path class="cls-1" d="M409.9,126.08a4.68,4.68,0,0,0-1-1.2,4.33,4.33,0,0,0-1.38-.81,4.54,4.54,0,0,0-1.6-.29,5,5,0,0,0-2.61.63,5,5,0,0,0-1.74,1.67,7.56,7.56,0,0,0-1,2.4,12.64,12.64,0,0,0-.3,2.77,11.75,11.75,0,0,0,.3,2.67,7.35,7.35,0,0,0,1,2.33,5.06,5.06,0,0,0,1.74,1.67,5.14,5.14,0,0,0,2.61.62,4.11,4.11,0,0,0,3.26-1.34,6.33,6.33,0,0,0,1.43-3.54H415a11.75,11.75,0,0,1-.9,3.69,8.81,8.81,0,0,1-1.92,2.81,8.06,8.06,0,0,1-2.78,1.77,9.85,9.85,0,0,1-3.5.61,10.17,10.17,0,0,1-4.28-.87,9.21,9.21,0,0,1-3.2-2.4,10.78,10.78,0,0,1-2-3.58,13.86,13.86,0,0,1-.69-4.44,14.43,14.43,0,0,1,.69-4.53,11.17,11.17,0,0,1,2-3.64,9.19,9.19,0,0,1,3.2-2.44,10,10,0,0,1,4.28-.89,10.12,10.12,0,0,1,3.23.52,8.72,8.72,0,0,1,2.72,1.51,8.19,8.19,0,0,1,2,2.46,9,9,0,0,1,1,3.35h-4.4A4.11,4.11,0,0,0,409.9,126.08Z"/><path class="cls-1" d="M432,120.27l7.74,21.78H435l-1.57-4.85h-7.73l-1.63,4.85h-4.57l7.82-21.78Zm.27,13.36-2.61-8h-.06l-2.69,8Z"/><path class="cls-1" d="M440.78,124.3v-4h17v4h-6.2v17.75H447V124.3Z"/><path class="cls-1" d="M468.22,120.27v21.78h-4.55V120.27Z"/><path class="cls-1" d="M505.86,120.27l8.63,14.61h.06V120.27h4.26v21.78h-4.55l-8.6-14.58h-.06v14.58h-4.26V120.27Z"/><path class="cls-2" d="M205.54,124.3H195.31v-4h16.28v3.78l-11.1,14h11.39v4H194.44v-3.78Z"/><path class="cls-2" d="M222.66,120.27v21.78h-4.55V120.27Z"/><path class="cls-2" d="M242.13,137.54a5.91,5.91,0,0,1-.93,2.39,5.65,5.65,0,0,1-2.08,1.86,7.67,7.67,0,0,1-3.68.75,8.5,8.5,0,0,1-2.52-.38,6.34,6.34,0,0,1-2.18-1.19,5.84,5.84,0,0,1-1.53-2.08,7.23,7.23,0,0,1-.58-3.06v-1.89h4.11v1a8.41,8.41,0,0,0,.12,1.47,3.33,3.33,0,0,0,.4,1.14,2.06,2.06,0,0,0,.8.75,2.81,2.81,0,0,0,1.32.27,2.48,2.48,0,0,0,1.39-.33,1.93,1.93,0,0,0,.71-.87,3.64,3.64,0,0,0,.26-1.16c0-.42,0-.82,0-1.21v-14.7h4.55v14.92A14.61,14.61,0,0,1,242.13,137.54Z"/><path class="cls-2" d="M254.45,120.27v21.78H249.9V120.27Z"/><path class="cls-2" d="M266.53,120.27l8.63,14.61h.06V120.27h4.26v21.78h-4.55l-8.6-14.58h-.06v14.58H262V120.27Z"/><path class="cls-2" d="M299.3,141.88a7.28,7.28,0,0,1-3,.66,10.15,10.15,0,0,1-4.27-.87,9.21,9.21,0,0,1-3.2-2.4,10.6,10.6,0,0,1-2-3.58,13.87,13.87,0,0,1-.7-4.44,14.43,14.43,0,0,1,.7-4.53,11,11,0,0,1,2-3.64,9.19,9.19,0,0,1,3.2-2.44,10,10,0,0,1,4.27-.89,9.45,9.45,0,0,1,3.09.51,8.52,8.52,0,0,1,2.69,1.48,7.81,7.81,0,0,1,2,2.41,8.49,8.49,0,0,1,1,3.29h-4.35a4.59,4.59,0,0,0-1.56-2.74,4.42,4.42,0,0,0-2.82-.92,5,5,0,0,0-2.6.63,4.89,4.89,0,0,0-1.74,1.67,7.33,7.33,0,0,0-1,2.4,12.06,12.06,0,0,0-.31,2.77,11.21,11.21,0,0,0,.31,2.67,7.13,7.13,0,0,0,1,2.33,5,5,0,0,0,1.74,1.67,5.13,5.13,0,0,0,2.6.62,4.83,4.83,0,0,0,3.5-1.2,5.42,5.42,0,0,0,1.43-3.5h-4.58v-3.56h8.69v11.77h-2.89l-.47-2.47A6.91,6.91,0,0,1,299.3,141.88Z"/><path class="cls-2" d="M485,142.51a11.2,11.2,0,1,1,11.19-11.2A11.21,11.21,0,0,1,485,142.51Zm0-18.57a7.37,7.37,0,1,0,7.36,7.37A7.38,7.38,0,0,0,485,123.94Z"/><polygon class="cls-2" points="482.05 126.45 490.38 131.24 482.07 136.06 482.05 126.45"/><path class="cls-1" d="M194.45,101.89v5.8c19-3.42,22.19-19.1,22.19-19.1H206.49S204.35,97.05,194.45,101.89Z"/><path class="cls-1" d="M251.32,88.59H241.17s4.46,16.29,24.05,19.14v-5.84A26.11,26.11,0,0,1,251.32,88.59Z"/><path class="cls-1" d="M237.94,59.45h27.28V53.83H243.55V46.74h21.67V41.12H243.55V35.7H235V56.53A2.92,2.92,0,0,0,237.94,59.45Z"/><path class="cls-1" d="M197.37,59.45h31.94V53.83H216.67V46.74h12.64V41.12H216.67V35.7h-8.53V53.83H203V41.1h-8.52V56.53A2.92,2.92,0,0,0,197.37,59.45Z"/><path class="cls-1" d="M265.18,81.15l-3-8.37H253l2,5.79H233.85l17.33-16.36H237.45l-4.92,4.65H215l4.2-4.65H205.46l-7.59,8.39a1.13,1.13,0,0,0,.83,1.88h27.88l-6.46,6.09H194.45v5.62h28.84v18.12H217.5v5.62l13,0a2.93,2.93,0,0,0,2.93-2.92V84.19H262.6C264.3,84.19,265.7,82.86,265.18,81.15Z"/><path class="cls-1" d="M281.79,63.86H290V78.19h-8.21v5.62H290c-.07,5.12-.84,12.55-8.05,18.09v6s16.49-4.22,16.59-24.08h11.24V108h8.53V83.81h8.3V78.19h-8.3V63.86h8.3V58.24H281.79Zm16.74,0h11.24V78.19H298.53Z"/><rect class="cls-1" x="330.19" y="40.12" width="8.53" height="55.47"/><path class="cls-1" d="M343.75,35.7v66.61h-9.34v5.62h15.86a2.93,2.93,0,0,0,2.92-2.93V35.7Z"/><polygon class="cls-1" points="318.3 35.7 309.77 35.7 309.77 42.39 298.53 42.39 298.53 35.7 290.01 35.7 290.01 42.39 281.79 42.39 281.79 48.01 290.01 48.01 290.01 55.44 298.53 55.44 298.53 48.01 309.77 48.01 309.77 55.44 318.3 55.44 318.3 48.01 326.6 48.01 326.6 42.39 318.3 42.39 318.3 35.7"/><path class="cls-1" d="M404,84.24H393.91a27.17,27.17,0,0,0,8.45-11.91h0V66.71H387.9a22.69,22.69,0,0,0,2.88-7.2h15.09V53.89H391.28V47.65h13.19V42H391.28V35.65h-8.53V42H370.33v5.62h12.42v6.24H368.94v5.62h13.2a23.71,23.71,0,0,1-13.25,15.78v5.47a41.07,41.07,0,0,0,14.38-8.43h9.2a26.06,26.06,0,0,1-8.3,11.91H368.94v5.62h15.22v12.81H376v5.27h13.78a2.91,2.91,0,0,0,2.92-2.92V89.86H404Z"/><path class="cls-1" d="M437.1,50.22h3.44V44.6H416.66V35.86h-8.53V47.3a2.92,2.92,0,0,0,2.92,2.92h17.47c0,4.44-1.16,19.86-6.14,30.24a75.17,75.17,0,0,1-6.6-24.86h-7.65a64.52,64.52,0,0,0,9.91,32,58.07,58.07,0,0,1-14.73,14.1v6.21a63.17,63.17,0,0,0,19-14.52,58.61,58.61,0,0,0,18.23,14.52v-6.21a62,62,0,0,1-13.82-14,47.82,47.82,0,0,0,3.86-6.83C435.92,69.3,437,54.66,437.1,50.22Z"/><path class="cls-1" d="M515.22,67H462.89A2.93,2.93,0,0,0,460,69.89v38h9.44V95.6h39.3v6.72h-8.24v5.62h14.76a2.92,2.92,0,0,0,2.92-2.92V69.89A2.92,2.92,0,0,0,515.22,67ZM508.7,90H469.4V84h39.3Zm0-11.59H469.4V72.67h39.3Z"/><path class="cls-1" d="M524,46.88V41.26H493.32V35.72H484.8v5.54H453.48v5.62h10.86l-4.16,11.75a2.92,2.92,0,0,0,2.71,4h52.63a2.46,2.46,0,0,0,2.58-3L514.68,50h-9.23L508,57H471.34l3.51-10.16Z"/><polygon class="cls-2" points="155.9 48.56 77.95 85.79 34.19 64.88 95.2 35.67 80.81 28.77 22.22 56.81 22.22 72.95 77.95 99.58 155.9 62.35 155.9 48.56"/><polygon class="cls-2" points="155.9 73.9 77.95 111.15 22.22 84.53 22.22 98.31 77.95 124.94 155.9 87.69 155.9 73.9"/><polygon class="cls-2" points="155.9 99.25 77.95 136.5 22.22 109.87 22.22 123.66 77.95 150.28 155.9 113.03 155.9 99.25"/><path class="cls-2" d="M155.9,124.59l-77.4,37a1.23,1.23,0,0,1-1.09,0L13.16,130.89a1.26,1.26,0,0,1-.72-1.14V45.82a1.26,1.26,0,0,1,.72-1.13L77.41,13.84a1.3,1.3,0,0,1,1.09,0L126.62,37a.28.28,0,0,1,0,.5L66.12,66.34l14.43,6.9,75.34-36a0,0,0,0,0,0,0L78.83.2a2,2,0,0,0-1.75,0L1.14,36.65A2,2,0,0,0,0,38.47v98.65a2,2,0,0,0,1.15,1.82l75.94,36.27a2,2,0,0,0,1.73,0l75.94-36.28a2,2,0,0,0,1.14-1.82Z"/></g></g></svg>
\ No newline at end of file

src/components/layout/header.vue

+<template>
+  <header class="app-header">
+    <section class="app-header-bar">
+      <div class="inner">
+        <div class="login">
+          <template v-if="isLogin">
+            <div>{{ user.nickname || user.realname }}</div>
+            <span>|</span>
+            <div @click="handleLogout">退出</div>
+          </template>
+          <template v-else>
+            <div @click="handleRegister">注册</div>
+            <span>|</span>
+            <div @click="handleLogin">登录</div>
+          </template>
+        </div>
+      </div>
+    </section>
+    <section class="app-header-main">
+      <div class="hd">
+        <div class="hd-left">
+          <a href="/"><img src="../../assets/img/head/ezijing-logo.svg" class="logo" /></a>
+          <h1 class="title">{{ title }}</h1>
+        </div>
+        <div class="hd-right">
+          <img src="../../assets/img/head/kelley-logo.png" />
+        </div>
+      </div>
+      <div class="bd">
+        <ul class="nav">
+          <li v-for="item in navList" :key="item.path">
+            <router-link :to="item.path">{{ item.title }}</router-link>
+          </li>
+        </ul>
+        <div class="search">
+          <div class="lang">EN</div>
+          <input type="text" placeholder="Search" class="search-input" />
+          <div class="search-button">搜索</div>
+        </div>
+      </div>
+    </section>
+    <vue-passport ref="passport" @ready="onReady" :options="options"></vue-passport>
+  </header>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      title: '中国未来金融领袖计划',
+      navList: [
+        { title: '首页', path: '/index' },
+        { title: '项目介绍', path: '/project' },
+        { title: '视频中心', path: '/videoCenter' },
+        { title: '招生信息', path: '/recruit' },
+        { title: '教学模块', path: '/teaching' },
+        { title: '师生风采', path: '/presence' },
+        { title: '职业发展', path: '/careerDev' },
+        { title: '校友工作', path: '/alumniWork' }
+      ],
+      isLogin: false,
+      user: null,
+      options: {
+        login: {
+          account: {
+            onSuccess: this.loginSuccess
+          },
+          phone: {
+            onSuccess: this.loginSuccess
+          }
+        }
+      }
+    }
+  },
+  computed: {
+    passport() {
+      return this.$refs.passport
+    }
+  },
+  watch: {
+    $route(route) {
+      if (route.query.needLogin) {
+        this.handleLogin()
+      }
+    }
+  },
+  methods: {
+    handleLogin() {
+      this.passport.login()
+    },
+    handleRegister() {
+      this.passport.register()
+    },
+    handleLogout() {
+      this.passport.logout()
+      this.isLogin = false
+      window.G.UserInfo = {}
+      this.$router.push('/')
+    },
+    onReady(isLogin, user = {}) {
+      this.isLogin = isLogin
+      this.user = user
+      window.G.UserInfo = user
+    },
+    loginSuccess(data) {
+      this.passport.checkLoginStatus((isLogin, user = {}) => {
+        this.isLogin = isLogin
+        this.user = user
+        this.$router.push('/my')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-header {
+  background-color: #fff;
+  .inner {
+    max-width: 970px;
+    margin: 0 auto;
+  }
+}
+.app-header-bar {
+  height: 40px;
+  background-color: #333;
+  .login {
+    float: right;
+    display: flex;
+    line-height: 40px;
+    color: #fff;
+    div {
+      font-size: 18px;
+      text-align: center;
+      cursor: pointer;
+    }
+    span {
+      padding: 0 20px;
+    }
+  }
+}
+.app-header-main {
+  max-width: 970px;
+  margin: 0 auto;
+  .hd {
+    height: 110px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .hd-left {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .logo {
+    width: 156px;
+    // height: 50px;
+  }
+  .title {
+    margin-left: 20px;
+    padding: 0 10px;
+    color: #222;
+    font-size: 20px;
+    line-height: 33px;
+    font-weight: 600;
+    border-left: 2px solid #333;
+  }
+  .bd {
+    margin-top: -20px;
+    padding: 10px 0;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  .nav {
+    display: flex;
+    li {
+      font-size: 15px;
+      font-weight: 600;
+      color: #222;
+      line-height: 20px;
+      padding: 0 14px;
+      a {
+        position: relative;
+      }
+      &:first-child {
+        padding-left: 0;
+      }
+    }
+    li + li {
+      border-left: 1px solid #d7d8d9;
+    }
+  }
+  .router-link-active:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: -3px;
+    height: 2px;
+    background: #bf0927;
+  }
+  .search {
+    display: flex;
+    align-items: center;
+  }
+  .lang {
+    font-size: 15px;
+    color: #999;
+  }
+  .search-input {
+    outline: none;
+    width: 159px;
+    height: 34px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
+    margin: 0 3px 0 8px;
+    padding-left: 13px;
+    font-size: 15px;
+    color: #999;
+  }
+  .search-button {
+    width: 54px;
+    height: 34px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
+    font-size: 15px;
+    color: #999;
+    text-align: center;
+    line-height: 34px;
+    cursor: pointer;
+  }
+}
+</style>

src/components/page-footer/index.vue

@@ -26,19 +26,34 @@
           <a href="https://www.online-phd-programs.org/best-online-phd-psychology/" target="_blank"><span class="fo">2020年心理学在线博士项目全美排名第14</span></a>
         </div>
         <div class="footer_logo">
-          <img src="@/assets/images/logo.png" alt />
+          <img src="@/assets/images/logo.svg" alt class="ezijing-logo"/>
           <img src="@/assets/images/logginred.png" alt />
         </div>
       </div>
     </div>
-    <div class="copyright">
-      <div class="inner2">
-        <p>Copyright © 2017 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司 京ICP证150431号</p>
-        <a class="record" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802023681">
-          <img src="https://zws-imgs-pub.ezijing.com/e0a0ec47dfdfc1e0797b1d5254021d00.png" alt="">
-          <p>安备 11010802023681号</p>
+    <div class="copyright" style="height: 40px;line-height: 40px;color: #fff;background: #ccc;">
+      <div class="inner" style="width: 100%;justify-content: center;display: flex;">
+        <p style="font-size: 12px;">Copyright © 2017 Zijing Education. All rights reserved. 清控紫荆（北京）教育科技股份有限公司</p>
+        <a target="_blank" href="https://tsm.miit.gov.cn/dxxzsp/" style="color: #fff;text-decoration:none;margin-left: 10px;">
+          <p style="font-size: 12px;">京ICP证150431号</p>
+        </a>
+        <a target="_blank" class="record" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=11010802023681" style="
+          color: #fff;
+          text-decoration:none;
+          align-items: center;
+          display: flex;
+          margin-right: 5px;">
+          <img src="https://zws-imgs-pub.ezijing.com/e0a0ec47dfdfc1e0797b1d5254021d00.png" alt="" style="
+            width: 20px;
+            height: 20px;
+            margin: 0 6px;
+            display: block;
+          ">
+          <p style="font-size: 12px;">安备 11010802023681号</p>
+        </a>
+        <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index" style="color: #fff;text-decoration:none;">
+          <p style="font-size: 12px;">京ICP备15016866号-1</p>
         </a>
-        <p>京ICP备15016866号-1</p>
       </div>
     </div>
   </div>
@@ -150,6 +165,9 @@ export default {}
       align-items: baseline;
       flex-direction: column;
       justify-content: space-around;
+      .ezijing-logo{
+        width: 187px;
+      }
     }
   }
 }

src/pages/my/admission/form/xy.js

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

src/pages/my/application/form/declare.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
       callback() {
         _this.getApplication()
         this.form.options.disabled = true

src/pages/my/application/form/info/answer.js

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

src/pages/my/application/form/info/career.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
       beforeRequest(data) {
         const careers = data.map(item => {
           return [

src/pages/my/application/form/info/education.js

@@ -11,7 +11,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
       beforeRequest(data) {
         const educations = data.map(item => {
           return ['start_date', 'end_date', 'school_name_cn', 'major_cn', 'degree'].reduce((result, key) => {

src/pages/my/application/form/info/first.js

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

src/pages/my/application/form/info/honor.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
       beforeRequest(data) {
         const honors = data.map(item => {
           return ['time', 'title', 'institution_cn'].reduce((result, key) => {

src/pages/my/application/form/info/profile.js

@@ -13,7 +13,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
       callback(data) {
         const {
           basic_info: basicInfo = {},
@@ -38,7 +38,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'ID_CARD_BACK' },
             limit: 1,
             image: 'https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/cu/id_card_back.png'
@@ -118,8 +118,8 @@ export default function(_this) {
           label: '身份证国徽面',
           model: 'ID_CARD_FRONT',
           attrs: {
-            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'ID_CARD_FRONT' },
             limit: 1,
             image: 'https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/cu/id_card_front.png'
@@ -135,8 +135,8 @@ export default function(_this) {
           label: '港澳台身份证',
           model: 'HK_ID_CARD',
           attrs: {
-            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'HK_ID_CARD' },
             limit: 1
           },
@@ -151,8 +151,8 @@ export default function(_this) {
           label: '护照',
           model: 'PASSPORT',
           attrs: {
-            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'PASSPORT' },
             limit: 1
           },
@@ -167,8 +167,8 @@ export default function(_this) {
           label: '其他证件',
           model: 'OTHER_ID_CARD_PHOTO',
           attrs: {
-            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'OTHER_ID_CARD_PHOTO' },
             limit: 1
           },

src/pages/my/application/form/info/training.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
       beforeRequest(data) {
         const trainings = data.map(item => {
           return ['start_date', 'end_date', 'institution_cn', 'course_cn'].reduce((result, key) => {

src/pages/my/application/form/tjx.js

@@ -10,7 +10,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
       callback(data) {
         const { submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -29,7 +29,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}/put`,
       beforeRequest(data) {
         // const recoLetters = data.map(item => {
         //   return ['provider_name', 'provider_phone_number', 'provider_email', 'provider_relationship'].reduce(

src/pages/my/application/form/wfzzm.js

@@ -6,7 +6,7 @@ export default function(_this) {
       return _this.visible
     },
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.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: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'NO_CRIMINAL_CERT' },
             limit: 1
           },

src/pages/my/interview/form/byz.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_byz',
   title: '学历/学位证书',
   get: {
-    action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -32,8 +32,8 @@ export default {
         required: true,
         model: 'DEGREE_CERT_CN',
         attrs: {
-          action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          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`,
           data: { file_type: 'DEGREE_CERT_CN' }
         },
         append: '注意事项：需要将证书原件扫描或拍照后提交，请确保证书内容清晰可辨。'

src/pages/my/interview/form/cjd.js

@@ -2,7 +2,7 @@ export default {
   id: 'interview_cjd',
   title: '成绩单（中+英）',
   get: {
-    action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+    action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
     callback(data) {
       const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
       const stageList = [
@@ -46,8 +46,8 @@ export default {
         required: true,
         model: 'REPORT_CARD_CN',
         attrs: {
-          action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          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`,
           data: { file_type: 'REPORT_CARD_CN' }
         }
       },
@@ -57,8 +57,8 @@ export default {
         required: true,
         model: 'REPORT_CARD_EN',
         attrs: {
-          action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-          deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+          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`,
           data: { file_type: 'REPORT_CARD_EN' }
         }
       }

src/pages/my/interview/form/zp.js

@@ -3,7 +3,7 @@ export default function(_this) {
     id: 'interview_zp',
     title: '2寸照片',
     get: {
-      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
       callback(data) {
         const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
         const stageList = [
@@ -24,7 +24,7 @@ export default function(_this) {
       }
     },
     update: {
-      action: `/api/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      action: `${webConf.apiBaseURL}/enrollment/v1.0/application-materials/submit/${webConf.others.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: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
-            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            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`,
             data: { file_type: 'PERSONAL_PHOTO_FOR_ID' }
           },
           prepend: '2寸照片：以电子版的形式上传文件',