11

src/components/index/Homework/Header.vue

+<template>
+  <div class="Header">
+    <div class="H_content com-container">
+      <div class="image" @click="toRecruit">
+        <img :src="system_logo" alt="" />
+      </div>
+      <div class="right">
+        <el-dropdown @command="handleCommand" trigger="click">
+          <div class="el-dropdown-link">
+            <img src="@/assets/img/default.svg" class="img_user" />
+            <span class="phone">{{ phone }}</span>
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="1">
+              <i class="el-icon-switch-button"></i>退出
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+/* eslint-disable */
+import Cookie from "js-cookie";
+import { logout } from "r/index/login";
+
+export default {
+  name: "Header",
+  data() {
+    return {
+      phone: window.localStorage.getItem(
+        "phone" + this.$store.state.indexIdentity
+      ),
+      system_logo: window.localStorage.getItem(
+        "system_logo" + this.$store.state.indexIdentity
+      ),
+    };
+  },
+  methods: {
+    handleCommand(command) {
+      if (command == 1) {
+        this.logout();
+      }
+    },
+    //  退出
+    async logout() {
+      const confirmResult = await this.$confirm(`确认退出登录？`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        type: "warning",
+      }).catch((err) => err);
+      if (confirmResult !== "confirm")
+        return this.$message.info("您取消了退出");
+
+      // 清除本地缓存除了大学logo
+      window.localStorage.clear();
+      let code = this.$store.state.indexIdentity;
+      await this.$router.replace("/" + code);
+      this.$message.success("退出成功");
+      await logout({});
+    },
+    // 点击图片跳转到招生简章页面
+    toRecruit() {
+      // 清除本地缓存除了大学logo
+      let code = this.$store.state.indexIdentity;
+      this.$router.replace("/" + code);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "a/scss/common";
+
+.Header {
+  font-family: PingFang SC;
+  height: 80px;
+  box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.12);
+
+  .H_content {
+    height: 100%;
+    display: flex;
+    flex-flow: row;
+    align-items: center;
+    justify-content: space-between;
+
+    .image img {
+      // width: 318px;
+      height: 62px;
+    }
+
+    .right {
+      height: 80px;
+
+      ::v-deep .el-dropdown {
+        height: 80px;
+
+        .el-dropdown-link {
+          height: 80px;
+          display: flex;
+          flex-flow: row;
+          align-items: center;
+
+          .img_user {
+            width: 34px;
+            height: 34px;
+            background-color: #d8d8d8;
+            border-radius: 50%;
+          }
+
+          .phone {
+            margin: 0 10px 0 12px;
+          }
+        }
+
+        &:hover {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/index/SignUp/confirm.vue

@@ -18,9 +18,7 @@
       <img src="../../../assets/img/signUp/computer.png" alt="" />
     </div> -->
     <div class="check">
-      <el-checkbox v-model="checked"
-        >我已阅读并了解须知</el-checkbox
-      >
+      <el-checkbox v-model="checked">我已阅读并了解须知</el-checkbox>
     </div>
     <div class="btn">
       <el-button :disabled="!checked" @click="next()">下一步</el-button>
@@ -30,7 +28,7 @@
 
 <script>
 /* eslint-disable */
-import Cookie from "js-cookie"
+import Cookie from "js-cookie";
 import { setSignShould } from "r/index/signUp";
 import { getCam } from "r/index/login";
 export default {
@@ -73,8 +71,8 @@ export default {
 
 <style  lang="scss" scoped>
 @import "a/scss/btn";
-.btn{
-  padding-bottom: 34px!important;
+.btn {
+  padding-bottom: 34px !important;
 }
 .confirm {
   padding: 0 50px 60px;
@@ -100,5 +98,19 @@ export default {
     text-align: center;
     margin-top: 42px;
   }
+
+  ::v-deep .el-checkbox__inner:hover {
+    border-color: var(--color);
+  }
+  ::v-deep .el-checkbox__input.is-checked {
+    .el-checkbox__inner {
+      background-color: var(--color);
+      border-color: var(--color);
+    }
+
+    + .el-checkbox__label {
+      color: var(--color);
+    }
+  }
 }
 </style>

src/components/index/SignUp/invitation.vue

@@ -47,14 +47,21 @@
       </div>
     </div>
 
-    <div class="tips">
-      备注：每个邀请码只能绑定一个用户，请谨慎使用。无邀请码可直接点【下一步】
+    <div class="tips flex">
+      <div class="tipsContent">
+        <div>备注：</div>
+        <div>1.每个邀请码仅能绑定一个用户。</div>
+        <div>2.如没有邀请码请直接点击【提交/跳过】跳过此步骤继续报名。</div>
+      </div>
+      <!-- <div>备注：</div>
+      <div>1，每个邀请码仅能绑定一个用户。</div>
+      <div>2，如没有邀请码请直接点击【下一步】跳过此步骤继续报名。</div> -->
+      <!-- 备注：每个邀请码只能绑定一个用户，请谨慎使用。如没有邀请码请直接点击【下一步】跳过此步骤继续报名 -->
     </div>
 
     <div class="btn">
-      <el-button @click="next()">下一步</el-button>
+      <el-button @click="next()">提交/跳过</el-button>
     </div>
-
   </div>
 </template>
 
@@ -260,10 +267,15 @@ export default {
   .tips {
     font-size: 14px;
     font-weight: 500;
-    color: #a7a2a6;
-    line-height: 54px;
+    // color: #a7a2a6;
+    color: var(--color);
+    line-height: 23px;
     margin: 30px 0;
-    text-align: center;
+    // text-align: center;
+    flex-direction: column;
+    align-items: center; /*垂直居中*/
+    width: 100%;
+    height: 100%;
   }
   .errorCode {
     font-size: 12px;

src/components/index/SignUp/pass.vue

@@ -5,10 +5,15 @@
         <!-- <img src="@/assets/img/signUp/icon-shenhe.png" alt="" /> -->
         <i class="icon-icon"></i>
       </div>
-      <div>同学你好，你的报名资料已提交</div>
-      <div>请等待工作人员审核，审核结果将于1-3个工作日发布，请留意网站</div>
-      <div v-if="this.examine_status == 1">审核已通过</div>
-      <div v-if="this.examine_status == 2">提示:{{ this.examine_reason }}</div>
+      <!-- {{!this.examine_status == 1}} -->
+      <div v-if="!this.examine_status == 1||!this.examine_status == 2">同学你好，你的报名资料已提交</div>
+      <div v-if="!this.examine_status == 1||!this.examine_status == 2">
+       请等待工作人员审核，审核结果将于24小时内发布，请留意网站。
+      </div>
+      <div v-if="this.examine_status == 1">
+        同学你好，你的材料已经通过审核，请点击“下一步”完成报名
+      </div>
+      <div v-if="this.examine_status == 2">同学你好，你的申请材料未能通过审核。原因是：{{ this.examine_reason }}</div>
       <div class="btn" v-show="this.examine_status == 2">
         <el-button @click="Lasting()">上一步 </el-button>
       </div>
@@ -35,6 +40,7 @@ export default {
       ),
       signBackStatus: "",
       status_val: "",
+      status: "",
     };
   },
   created() {
@@ -60,7 +66,7 @@ export default {
       //  console.log(is_next);
     },
     signUpInit(status_val) {
-      console.log(status_val, "11111");
+      // console.log(status_val, "11111");
 
       // console.log(isNexts, "2222");
       signUpInit({}).then((res) => {
@@ -73,7 +79,7 @@ export default {
           return this.$message.error(res.data.message);
         }
         this.status = res.data.status;
-        // console.log(this.status, "11111");
+        console.log(this.status, "11111");
         // 点击下一步传值给status,更新
         if (status_val != null) {
           this.status = status_val;

src/components/index/SignUp/referInfo.vue

@@ -37,7 +37,7 @@
             <el-input
               ref="id_card"
               v-model="referForm.id_card"
-              placeholder="填写真实姓名身份证号"
+              placeholder="填写真实身份证号"
               size="small"
               clearable
             />
@@ -138,12 +138,26 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="入学年份(高中)" prop="start_school_date">
+          <el-form-item label="入学年份" prop="start_school_date">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-select v-model="start_grade" placeholder="年级" clearable>
+                  <el-option
+                    v-for="(item, index) in gradeArrs"
+                    :key="index"
+                    :label="item"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="12">
                 <el-select
                   ref="start_school_date"
-              v-model="referForm.start_school_date"
+                  v-model="start_year"
                   placeholder="年份"
                   clearable
+                  @change="getyear()"
                 >
                   <el-option
                     v-for="(item, index) in yearArrs"
@@ -153,6 +167,8 @@
                   >
                   </el-option>
                 </el-select>
+              </el-col>
+            </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -176,7 +192,7 @@
         <el-col :span="12">
           <el-form-item label="手机号">
             <el-input
-              v-model="phone"
+              v-model="referForm.phone"
               placeholder="请输入手机号"
               size="small"
               :disabled="true"
@@ -186,7 +202,6 @@
         <el-col :span="12">
           <el-form-item label="电子邮箱" prop="email">
             <el-input
-              ref="email"
               v-model="referForm.email"
               placeholder="填写电子邮箱"
               size="small"
@@ -360,6 +375,7 @@
 
 <script>
 /* eslint-disable */
+import Cookie from "js-cookie";
 import {
   getAccount,
   getAchievementOss,
@@ -408,7 +424,7 @@ export default {
         school_contacts: null,
         school_phone: null,
       },
-      phone: "",
+
       schoolName: {},
       referInfoRules: {
         name: [{ required: true, message: "姓名不能为空！", trigger: "blur" }],
@@ -442,10 +458,10 @@ export default {
         political_status: [
           { required: true, message: "政治面貌不能为空！", trigger: "blur" },
         ],
-        email: [
-          { required: true, message: "电子邮箱不能为空！", trigger: "blur" },
-          { validator: validator.validateEmail, trigger: "blur" },
-        ],
+        // email: [
+        //   { required: true, message: "电子邮箱不能为空！", trigger: "blur" },
+        //   { validator: validator.validateEmail, trigger: "blur" },
+        // ],
         school_province: [
           {
             required: true,
@@ -534,6 +550,22 @@ export default {
       bdYear: "", //选择的生日年份
       bdMonth: "", //选择的生日月份
       bdDay: "", //选择的生日日期
+      //入学年份（初中高中）
+      gradeArrs: [
+        "初一",
+        "初二",
+        "初三",
+        "高一",
+        "高二",
+        "高三",
+        "大一",
+        "大二",
+        "大三",
+        "大四",
+      ],
+      //选择年级
+      start_grade: "",
+      start_year: "",
       // 政治面貌
       political_status: [
         {
@@ -561,8 +593,9 @@ export default {
   mounted() {},
   created() {
     const code = this.$store.state.indexIdentity;
-    this.phone = window.localStorage.getItem("phone" + code); //本地取用户手机号
-    this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户手机号
+    this.referForm.phone = window.localStorage.getItem("phone" + code); //本地取用户手机号
+    this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户邮箱
+    console.log(this.referForm.email, " this.referForm.email");
     let signUpFile = window.localStorage.getItem(
       "sign_up_file_" + window.localStorage.getItem("phone" + code) + code
     );
@@ -588,14 +621,19 @@ export default {
         // console.log(val.gender)
         this.referForm.gender = val.gender;
       }
-      if (val.birthday && val.birthday !== "") {
       //出生日期
+      if (val.birthday && val.birthday !== "") {
         this.bdYear = val.birthday.slice(0, 4); //前4位取年
         this.bdMonth = val.birthday.slice(4, 6); //中2位取月
         this.bdDay = val.birthday.slice(6, 8); //后2位取日
       }
-      if (val.jiguan_city !== null && val.jiguan_province !== null) {
+      //入学年份
+      if (val.start_school_date && val.start_school_date !== "") {
+        this.start_year = val.start_school_date.slice(0, 4); //年份
+        this.start_grade = val.start_school_date.slice(5, 8); //年级
+      }
       //籍贯
+      if (val.jiguan_city !== null && val.jiguan_province !== null) {
         if (this.referForm.jiguan_city) {
         }
         this.jgProvinceCode = Number(val.jiguan_province);
@@ -603,12 +641,12 @@ export default {
         this.jiguan_city = Number(val.jiguan_city);
       }
       // console.log(val.school_province, val.school_city, val.school);
+      //学校
       if (
         val.school_province !== null &&
         val.school_city !== null &&
         val.school !== null
       ) {
-        //学校
         this.referForm.school_province = Number(val.school_province);
         this.referForm.school_city = Number(val.school_city);
         this.referForm.school = Number(val.school);
@@ -656,17 +694,25 @@ export default {
             res.data.info.jiguan_province.toString() +
             res.data.info.jiguan_city.toString();
         }
-        // this.fileList=
+        if (res.data.info.email == null) {
+          const code = this.$store.state.indexIdentity;
+          this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户邮箱
+        }
       });
     },
+    //组装出生日期
     getTime() {
       this.referForm.birthday =
         this.bdYear.toString() +
         this.bdMonth.toString() +
-        this.bdDay.toString(); //组装出生日期
+        this.bdDay.toString();
       // console.log(this.referForm.birthday);
     },
-
+    //组装入学年份
+    getyear() {
+      this.referForm.start_school_date =
+        this.start_year.toString() + "-" + this.start_grade.toString();
+    },
     // 获取省份城市
     getProAndCity() {
       getProAndCity({}).then((res) => {

src/router/index.js

@@ -19,8 +19,6 @@ Vue.prototype.$message = Message;
 
 Vue.use(VueRouter)
 
-
-
 const routes = [{
     path: '/login',
     name: 'loginIndex',
@@ -32,26 +30,27 @@ const routes = [{
     children: [...indexLogin]
   },
   {
-    path: '/',
-    name: 'cerificateIndex',
+    path: '/Info',
+    name: 'Info',
     meta: {
-      title: '营地报名'
+      title: '个人信息'
     },
-    // redirect: '/cerificate/signUp',
+    
+    // redirect: '/Info/personalInfo',
     component: () =>
-      import('v/index/camp/Index.vue'),
-    children: [...indexCamp]
+      import('v/index/Info/Index.vue'),
+    children: [...personalInfo]
   },
   {
-    path: '/Info',
-    name: 'Info',
+    path: '/',
+    name: 'cerificateIndex',
     meta: {
-      title: '个人信息'
+      title: '营地报名'
     },
     // redirect: '/cerificate/signUp',
     component: () =>
-      import('v/index/Info/Index.vue'),
-    children: [...personalInfo]
+      import('v/index/camp/Index.vue'),
+    children: [...indexCamp]
   },
   {
     path: '/:code',
@@ -59,7 +58,6 @@ const routes = [{
     meta: {
       title: ''
     },
-
     component: () =>
       import('v/index/recruit/Index.vue')
   },
@@ -161,6 +159,7 @@ function checkCam(code, cb) {
 
 router.beforeEach((to, from, next) => {
   console.log(to, 'to')
+  console.log(from, 'from')
   let
     toLogin = "/login",
     toRegister = "/register",

src/router/index/personalInfo.js

 export default [{
-    path: '/personalInfo',
-    name: 'index-personalInfo',
+    path: 'personalInfo',
+    name: 'info-personalInfo',
     component: () => import('v/index/Info/personalInfo.vue'),
     meta: {
       title: '个人资料'
     }
   },
   {
-    path: '/password',
-    name: 'index-password',
+    path: 'password',
+    name: 'info-password',
     component: () => import('v/index/Info/password.vue'),
     meta: {
       title: '修改密码'

src/views/index/Info/Index.vue

@@ -2,8 +2,15 @@
   <div class="camp-index">
     <el-header height="104px">
       <Header></Header>
-      <div class="bg-top"></div>
+      <!-- <div class="bg-top"></div> -->
+      <div class="bg-top">
+        <el-breadcrumb separator="/">
+          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+          <el-breadcrumb-item>活动管理</el-breadcrumb-item>
+        </el-breadcrumb>
+      </div>
     </el-header>
+
     <div class="com-container">
       <div class="index-container">
         <div class="camp_left" ref="leftBoxFu">
@@ -28,7 +35,9 @@
         </div>
 
         <div class="camp_right" ref="rightBox">
-          <router-view @getStatus="getStatus" />
+          <!-- <router-view @getStatus="getStatus" /> -->
+          <personalInfo v-if="this.campindex_type == 0"> </personalInfo>
+          <password v-if="this.campindex_type == 1"> </password>
         </div>
       </div>
     </div>
@@ -38,59 +47,49 @@
 
 <script>
 /* eslint-disable */
-import Header from "@/components/index/SignUp/Header.vue";
+import Header from "@/components/index/Homework/Header.vue";
 import Footer from "@/components/index/Footer.vue";
 import svg1 from "@/assets/img/signUp/icon.svg";
 import svg2 from "@/assets/img/signUp/icon-1.svg";
-import svg3 from "@/assets/img/signUp/icon-2.svg";
+import personalInfo from "v/index/Info/personalInfo";
+import password from "v/index/Info/password";
 
 export default {
-  name: "campIndex",
+  name: "Info",
   components: {
     Header,
     Footer,
+    personalInfo,
+    password,
   },
-  // props:{}
   data() {
     return {
-      index: 0,
+      index: "",
       isPosition: 0, // 左侧box是否浮动
       pageYOffset: 0, // 左侧box浮动时，滚动的高度
       scorllHeight: 0, // 最大滚动高度
       tabs: [
         {
           id: "0",
-          desc: "营地报名",
+          desc: "个人信息",
           icon: "icon-icon1",
           url: svg1,
         },
         {
           id: "1",
-          desc: "营地作业",
+          desc: "修改密码",
           icon: "icon-icon-1",
           url: svg2,
         },
-        {
-          id: "2",
-          desc: "营地证书",
-          icon: "icon-icon-2",
-          url: svg3,
-        },
       ],
-
-      campindex_type: 0,
+      campindex_type: "",
       index_status: "",
     };
   },
-  watch: {
-    // type(val) {
-    //   console.log(val,'val')
-    //   window.localStorage.setItem("campindex_type", val);
-    // },
-  },
+  watch: {},
   created() {
     // this.ToSignUp(this.index);
-    this.getStatus();
+    this.ToSignUp();
     //  this.$refs.child.signUpInit();
   },
   mounted() {
@@ -102,22 +101,18 @@ export default {
     window.removeEventListener("resize", this.onResize, true);
   },
   methods: {
-    getStatus(val) {
-      // console.log(val, "index_type");
-      this.index_status = val;
-      this.ToSignUp(this.campindex_type);
-    },
+  
     ToSignUp(index) {
-      // console.log(index,'index')
+      console.log(index, "index");
       let code = this.$store.state.indexIdentity;
       this.campindex_type = index;
-      if (this.campindex_type == 0) {
-        this.$router.push("/signUp/" + this.index_status + "?code=" + code);
-      } else if (this.campindex_type == 1) {
-        this.$router.push("/homework?code=" + code);
-      } else if (this.campindex_type == 2) {
-        this.$router.push("/certificate?code=" + code);
-      }
+      console.log(this.$route)
+      // if (this.campindex_type == 0) {
+      //   this.$router.push("Info/personalInfo?code=" + code);
+      // } else
+      // if (this.campindex_type == 1) {
+      //   this.$router.push("/password?code=" + code);
+      // }
     },
     onResize() {
       const refLeft = this.$refs["leftBox"];
@@ -188,13 +183,16 @@ export default {
     .bg-top {
       height: 24px;
       background-color: #f8f8f8;
+      padding: 20px 0 5px 0;
+      padding-left: 120px;
     }
   }
+
   // .com-container {
   //   height: calc(100% - 100px);
   // }
   .index-container {
-    padding: 104px 0 70px 0;
+    padding: 150px 0 70px 0;
     display: flex;
     flex-flow: row;
 

src/views/index/Info/password.vue

+<template>
+  <div class="camp-index">
+      weweaaaa
+  </div>
+</template>
\ No newline at end of file

src/views/index/Info/personalInfo.vue

+<template>
+  <div class="camp-index">
+      wewe
+  </div>
+</template>
+
+<script>
+export default {
+  name: "info-personalInfo",
+};
+</script>
\ No newline at end of file

src/views/index/camp/Homework.vue

@@ -59,7 +59,7 @@ export default {
     toRefer() {
       let code = this.$store.state.indexIdentity;
       this.$router.push("/homework/refer?code=" + code);
-      this.$emit("torefer", 1);
+      this.$emit("torefer", 3);
     },
     getTeacherWork() {
       getTeacherWork({ page: 1 }).then((res) => {

src/views/index/camp/Index.vue

@@ -29,10 +29,15 @@
 
         <div class="camp_right" ref="rightBox">
           <!-- <router-view @getStatus="getStatus" /> -->
-          <SignUp @getStatus="getStatus" v-if="this.campindex_type==0"> </SignUp>
-          <Homework v-if="this.campindex_type==1"> </Homework>
-          <Certificate v-if="this.campindex_type==2"> </Certificate>
-          <homeRefer @torefer="torefer"> </homeRefer>
+          <SignUp @getStatus="getStatus" v-if="this.campindex_type == 0">
+          </SignUp>
+          <Homework
+            v-if="this.campindex_type == 1 && this.homework_val == null"
+            @torefer="torefer"
+          >
+          </Homework>
+          <Certificate v-if="this.campindex_type == 2"> </Certificate>
+          <homeRefer v-if="this.homework_val == 3"> </homeRefer>
         </div>
       </div>
     </div>
@@ -93,6 +98,7 @@ export default {
 
       campindex_type: 0,
       index_status: "",
+      homework_val: "",
     };
   },
   watch: {
@@ -100,15 +106,10 @@ export default {
     //   console.log(val,'val')
     //   window.localStorage.setItem("campindex_type", val);
     // },
-    torefer(val){
- console.log(val,'val')
-    }
   },
   created() {
-    // this.ToSignUp(this.index);
     this.getStatus();
-    //  this.$refs.child.signUpInit();
-  
+    this.torefer();
   },
   mounted() {
     window.addEventListener("scroll", this.handleScrollX, true);
@@ -119,6 +120,10 @@ export default {
     window.removeEventListener("resize", this.onResize, true);
   },
   methods: {
+    torefer(val) {
+      console.log(val, "val");
+      this.homework_val = val;
+    },
     getStatus(val) {
       // console.log(val, "index_type");
       this.index_status = val;
@@ -130,12 +135,12 @@ export default {
       this.campindex_type = index;
       if (this.campindex_type == 0) {
         this.$router.push("/signUp/" + this.index_status + "?code=" + code);
+        this.homework_val == "";
       } else if (this.campindex_type == 1) {
         this.$router.push("/homework?code=" + code);
-        // this.$refs.rightBox.$children[0].getTeacherWork();
-        // console.log( this.$refs.rightBox.children)
       } else if (this.campindex_type == 2) {
         this.$router.push("/certificate?code=" + code);
+       
       }
     },
     onResize() {