Merge remote-tracking branch 'origin/yingdi2.0' into yingdi2.0

src/request/base/register.js

+/* eslint-disable */
+
+import {
+  request
+} from './network'
+
+// 通过邮箱验证码注册
+export function registerEmailCode(data) {
+  return request({
+    method: 'post',
+    url: 'web/code/registerEmailCode',
+    params: data
+  })
+}
+// 通过邮箱验证码找回密码（忘记密码）
+export function passwordEmailCode(data) {
+  return request({
+    method: 'post',
+    url: 'web/code/passwordEmailCode',
+    params: data
+  })
+}
+// 发送注册时候验证码
+export function registerCode(data) {
+  return request({
+    method: 'post',
+    url: '/web/code/registerCode',
+    params: data
+  })
+}
+export function passwordCode(data) {
+  return request({
+    method: 'post',
+    url: '/web/code/passwordCode',
+    params: data
+  })
+}
+
+// 填写注册信息
+export function setAccountInfo(data) {
+  return request({
+    method: 'post',
+    url: '/web/register/setAccountInfo',
+    data
+  })
+}
+
+// 获取注册信息
+export function getAccountInfo(data) {
+  return request({
+    method: 'post',
+    url: '/web/register/getAccountInfo',
+    data
+  })
+}

src/router/base/login.js

@@ -15,7 +15,7 @@ export default [{
   }
 },
 {
-  path: '/reset',
+  path: '/baseReset',
   name: 'base-reset',
   component: () => import(/* webpackChunkName: "reset" */ 'v/base/login/Reset.vue'),
   meta: {

src/router/index.js

@@ -204,7 +204,9 @@ router.beforeEach((to, from, next) => {
     toLogin = "/login",
     toBaseLogin = "/baseLogin",
     toRegister = "/register",
+    toBaseRegister = "/baseRegister",
     toReset = "/reset",
+    toBaseReset = "/baseReset",
     toHome = "/home",
     toActive = "/active";
   let toMyInfo;
@@ -225,7 +227,7 @@ router.beforeEach((to, from, next) => {
     //   }
     // });
     return next();
-  } else if (to.path == toBaseLogin || to.path == toMyInfo || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
+  } else if (to.path == toBaseLogin ||to.path == toBaseRegister ||to.path == toBaseReset || to.path == toMyInfo || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
     return next();
   } else if (to.name == "recruit") {
     code = to.params.code;

src/views/base/login/Index.vue

 <template>
   <div class="login-index">
+    <Header></Header>
     <div class="big-right">
       <div class="info-box">
-        <router-view />
+        <router-view/>
       </div>
     </div>
   </div>
 </template>
 <script>
-/* eslint-disable */
-import Cookie from "js-cookie"
+  /* eslint-disable */
+  import Header from "@/components/base/Header.vue";
 
-export default {
-  name: "loginBase",
-  data() {
-    return {
-    };
-  },
-  created() {
-
-    this.$emit("getStatus", false);
-  },
-  methods: {
-    toHome() {
-      let code = this.$store.state.indexIdentity;
-      this.$router.push("/"+code);
-    }
-  },
-};
+  export default {
+    name: "loginBase",
+    data() {
+      return {};
+    },
+    components: {
+      Header,
+    },
+    created() {
+    },
+    methods: {},
+  };
 </script>
 
-<style scoped lang="scss">
-.login-index {
-  position: relative;
-  min-width: 1104px;
-  background: #f8f8f8;
-  display: flex;
-  flex-flow: row;
-  min-height: 100%;
-  .big-img {
-    width: (500/1920 * 100%);
-    min-width: 350px;
-    min-height: 100%;
-    img {
-      width: 100%;
-      min-height: 100%;
+<style lang="scss" scoped>
+  @media (min-width: 1024px) {
+    .login-index .big-right .info-box {
+      width: 32%!important;
+      top: 60%!important;
     }
   }
-  .big-right {
-    flex: 1;
+
+
+  .login-index {
     position: relative;
-    .info-box {
-      width: 520px;
-      height: auto;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
+    min-width: 1104px;
+    background: #f8f8f8;
+    min-height: 100%;
+    width: 100%;
+
+    .big-right {
+      height: calc(100% - 80px);
+
+      .info-box {
+        width: 520px;
+        height: auto;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
     }
   }
-}
 </style>