营地2.0-公共修改

src/App.vue

 <template>
   <div id="app">
-    <router-view  v-if="isRouterAlive"/>
+    <router-view v-if="isRouterAlive"/>
   </div>
 </template>
 <script>
-/* eslint-disable */
-export default {
-  name: "app",
-  data() {
-    return {     isRouterAlive: true
-    };
-  },
-  created() {
-    this.$store.commit('setActiveIndex', this.$route.path)
-  },
-  methods: {
-    reload () {
-      this.isRouterAlive = false
-      this.$nextTick(() => (this.isRouterAlive = true))
-    }
-  },
-  watch: {
-    '$route.path'(val) {
-      this.$store.commit('setActiveIndex', val)
+  /* eslint-disable */
+  export default {
+    name: "app",
+    data() {
+      return {
+        isRouterAlive: true
+      };
+    },
+    created() {
+      this.$store.commit('setActiveIndex', this.$route.path)
+    },
+    methods: {
+      reload() {
+        this.isRouterAlive = false
+        this.$nextTick(() => (this.isRouterAlive = true))
+      }
+    },
+    watch: {
+      '$route.path'(val) {
+        this.$store.commit('setActiveIndex', val)
+      }
     }
-  }
-};
+  };
 </script>
 <style lang="scss">
-@import "a/scss/index";
-// @import "~a/css/base.css";
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  position: relative;
-  height: 100vh;
-  background: #fff;
-  // background: #f8f8f8;
-}
-//滚动条的宽度
-::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-//滚动条的滑块
-::-webkit-scrollbar-thumb {
-  background-color: #cccccc;
-  border-radius: 4px;
-}
+  @import "a/scss/index";
+  // @import "~a/css/base.css";
+  #app {
+    font-family: Avenir, Helvetica, Arial, sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    position: relative;
+    height: 100vh;
+    background: #fff;
+    // background: #f8f8f8;
+  }
 
-.el-dropdown-menu {
-  .el-dropdown-menu__item {
-    padding: 0 30px !important;
+  //滚动条的宽度
+  ::-webkit-scrollbar {
+    width: 12px;
+    height: 12px;
+  }
 
-    &:hover {
-      color: #ffffff !important;
-      background-color: var(--color) !important;
-    }
-    i {
-      font-size: 19px;
-    }
+  //滚动条的滑块
+  ::-webkit-scrollbar-thumb {
+    background-color: #cccccc;
+    border-radius: 4px;
   }
-}
 
-.el-message-box {
-  width: 360px !important;
+  .el-dropdown-menu {
+    .el-dropdown-menu__item {
+      padding: 0 30px !important;
 
-  .el-message-box__header {
-    .el-message-box__title {
-      color: red;
-    }
-    .el-message-box__close {
       &:hover {
-        color: var(--color);
+        color: #ffffff !important;
+        background-color: var(--color) !important;
+      }
+
+      i {
+        font-size: 19px;
       }
     }
   }
 
-  .el-button {
-    &:nth-child(1):hover {
-      color: #fff;
-      background-color: var(--color);
-      border-color: var(--color);
-      opacity: 0.6;
+  .el-message-box {
+    width: 360px !important;
+
+    .el-message-box__header {
+      .el-message-box__title {
+        color: red;
+      }
+
+      .el-message-box__close {
+        &:hover {
+          color: var(--color);
+        }
+      }
     }
-    &:nth-child(2) {
-      color: #fff;
-      background-color: var(--color);
-      border-color: var(--color);
-      &:hover {
+
+    .el-button {
+      &:nth-child(1):hover {
         color: #fff;
         background-color: var(--color);
         border-color: var(--color);
-        opacity: 0.9;
+        opacity: 0.6;
+      }
+
+      &:nth-child(2) {
+        color: #fff;
+        background-color: var(--color);
+        border-color: var(--color);
+
+        &:hover {
+          color: #fff;
+          background-color: var(--color);
+          border-color: var(--color);
+          opacity: 0.9;
+        }
       }
     }
   }
-}
 </style>

src/components/base/Footer.vue → src/components/Footer.vue

@@ -16,11 +16,11 @@
         </div>
         <div class="contact_qr">
           <div class="contact_qr_item">
-            <img src="../../assets/img/footer/service.png"/>
+            <img src="../assets/img/footer/service.png"/>
             <div class="name">大中衔接人才培养</div>
           </div>
           <div class="contact_qr_item">
-            <img src="../../assets/img/footer/wb.png"/>
+            <img src="../assets/img/footer/wb.png"/>
             <div class="name">大中贯通人才培养</div>
           </div>
         </div>

src/components/base/Header.vue → src/components/Header.vue

@@ -2,7 +2,8 @@
   <div class="Header">
     <div class="H_content com-container">
       <div class="image">
-        <img alt="" src="../../assets/img/logo_base.png"/>
+        <img v-if="type==1" src="../assets/img/logo_base.png" alt=""/>
+        <img v-if="type==2" :src="system_logo" alt="" @click="toRecruit"/>
       </div>
       <div class="right">
         <el-menu :default-active="$store.state.activeIndex" @select="handleSelect" class="el-menu-demo"
@@ -16,11 +17,6 @@
             @click="toLogin"
             @mouseenter="onMouserEnter(false)"
           >登录 | 注册</span>
-          <!--          <span-->
-          <!--            @mouseenter="onMouserEnter(true)"-->
-          <!--            :class="isHover ? 'is-hover' : ''"-->
-          <!--            @click="toRegister"-->
-          <!--          > 注册</span>-->
         </div>
         <div class="alreadyLogin" v-else>
           <el-dropdown @command="handleCommand" trigger="click">
@@ -48,16 +44,24 @@
 
   export default {
     name: "Header",
+    props: {
+      typeFu: [String, Number],
+    },
     data() {
       return {
+        type: this.typeFu, // 1-baseHeader 2-indexHeader
         isHover: true,
         isLogin: false,
         phone: '',
+        system_logo: '',
       };
     },
     created() {
       this.isLogin = !!localStorage.getItem("index-token-all");
       this.phone = localStorage.getItem("index-phone-all") || "";
+      console.log(this.type)
+      let code = this.$store.state.indexIdentity;
+      this.system_logo = localStorage.getItem("system_logo" + code) || "";
     },
     methods: {
       // 导航栏操作
@@ -79,11 +83,24 @@
       },
       // 去注册
       toRegister() {
-        this.$router.push("/baseRegister");
+        if (this.type == 1) {
+          this.$router.push("/baseRegister");
+        } else if (this.type == 2) {
+          let code = this.$store.state.indexIdentity;
+          this.$router.push("/register?code=" + code);
+        }
       },
       // 去登录页
       toLogin() {
-        this.$router.push("/baseLogin");
+        if (this.type == 1) {
+          this.$router.push("/baseLogin");
+          if (this.$route.fullPath != '/baseLogin') {
+            this.$store.commit('setFullPath', this.$route.fullPath);
+          }
+        } else if (this.type == 2) {
+          let code = this.$store.state.indexIdentity;
+          this.$router.push("/login?code=" + code);
+        }
       },
       // 退出登录
       async logout() {
@@ -93,21 +110,72 @@
           closeOnClickModal: false,
           type: "warning",
         }).catch((err) => err);
-        if (confirmResult !== "confirm") {
+        if (confirmResult !== "confirm")
           return this.$message.info("您取消了退出");
+        // 清除本地缓存除了大学logo
+        if (this.type == 1) {
+          // 清除所有缓存
+          window.localStorage.clear();
+          this.isLogin = false;
+        } else if (this.type == 2) {
+          this.reload()
+          let code = this.$store.state.indexIdentity;
+          window.localStorage.removeItem("doubt_code" + code);
+          window.localStorage.removeItem("doubt_info" + code);
+          window.localStorage.removeItem("doubt_check" + code);
+          window.localStorage.removeItem("camp_name" + code);
+          window.localStorage.removeItem("system_color" + code);
+          window.localStorage.removeItem("system_logo" + code);
+          window.localStorage.removeItem("has_amount" + code);
+          window.localStorage.removeItem("campsite_id" + code);
+          window.localStorage.removeItem("order_no" + code);
+          window.localStorage.removeItem("campindex_type" + code);
+          window.localStorage.removeItem("bk_pic" + code);
+          window.localStorage.removeItem("examine_status" + code);
+          window.localStorage.removeItem("examine_reason" + code);
+          window.localStorage.removeItem("sign_up_file_18355151517" + window.localStorage.getItem("phone" + code) + code);
+          window.localStorage.removeItem("schoolName" + code);
+          window.localStorage.removeItem("camp_statement" + code);
+          window.localStorage.removeItem("transfer_account" + code);
+          window.localStorage.removeItem("payee" + code);
+          window.localStorage.removeItem("bank_first" + code);
+          window.localStorage.removeItem("bank_idcard" + code);
+          window.localStorage.removeItem("bank_info" + window.localStorage.getItem("phone" + code) + code);
+          window.localStorage.removeItem("index-token-all");
+          window.localStorage.removeItem("index-phone-all");
+          this.isLogin = false;
+          this.reload()
+          if (this.$store.state.human == 1) {
+            await this.$router.replace({
+              path: "/login",
+              query: {
+                code: code,
+              },
+            });
+          } else {
+            await this.$router.replace("/" + code);
+          }
         }
-
-        // 清除所有缓存
-        window.localStorage.clear();
-        this.isLogin = false;
-        this.$message.success('退出成功');
+        this.$message.success("退出成功");
         await logout({});
-
       },
+      // 鼠标移入事件
       onMouserEnter(val) {
         this.isHover = val;
       },
+      // 点击图片跳转到招生简章页面
+      toRecruit() {
+        // 清除本地缓存除了大学logo
+        let code = this.$store.state.indexIdentity;
+        this.$router.replace("/" + code);
+      },
     },
+    watch: {
+      typeFu(val) {
+        console.log(val)
+        this.type = val;
+      }
+    }
   };
 </script>
 <style lang="scss" scoped>

src/components/index/Header.vue

@@ -92,7 +92,6 @@ export default {
       if (confirmResult !== "confirm")
         return this.$message.info("您取消了退出");
       // 清除本地缓存除了大学logo
-      // window.localStorage.clear();]
       this.reload()
       let code = this.$store.state.indexIdentity;
       window.localStorage.removeItem("doubt_code" + code);
@@ -128,7 +127,6 @@ export default {
       this.reload()
       console.log(this.$store.state.human)
       if (this.$store.state.human == 1) {
-        console.log(222)
         await this.$router.replace({
           path: "/login",
           query: {
@@ -145,6 +143,11 @@ export default {
     },
     onMouserEnter(val) {
       this.isHover = val;
+    },// 点击图片跳转到招生简章页面
+    toRecruit() {
+      // 清除本地缓存除了大学logo
+      let code = this.$store.state.indexIdentity;
+      this.$router.replace("/" + code);
     },
   },
 };

src/router/index.js

@@ -10,7 +10,7 @@ import indexHome from './base/home';
 import indexActive from './base/active';
 import indexCamp from './index/camp'
 import personalInfo from './index/personalInfo'
-import {getCam,getCamInfo} from "r/index/login";
+import {getCam, getCamInfo} from "r/index/login";
 import {Message} from 'element-ui';
 
 Vue.prototype.$message = Message;
@@ -199,21 +199,17 @@ function checkCam(code, cb) {
 }
 
 router.beforeEach((to, from, next) => {
-  console.log(to)
-  let
-    toLogin = "/login",
+  let toLogin = "/login",
     toBaseLogin = "/baseLogin",
     toRegister = "/register",
     toBaseRegister = "/baseRegister",
     toReset = "/reset",
     toBaseReset = "/baseReset",
     toHome = "/home",
-    toActive = "/active";
-  let toInfo;
-  toInfo = "/myInfo";
+    toActive = "/active",
+    toInfo = "/myInfo";
   let code = false;
   document.title = to.meta.title;
-  console.log(to.path )
   if (to.path == toLogin || to.path == toRegister || to.path == toReset) {
     // code = to.params.code ? to.params.code : to.query.code;
     // checkCam(code, (res) => {
@@ -228,7 +224,7 @@ router.beforeEach((to, from, next) => {
     //   }
     // });
     return next();
-  } else if (to.path == toBaseLogin ||to.path == toBaseRegister ||to.path == toBaseReset || to.path == '/myInfo' || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
+  } else if (to.path == toBaseLogin || to.path == toBaseRegister || to.path == toBaseReset || to.path == '/myInfo' || to.path == toHome || to.path == toActive || to.path.indexOf(toActive) != -1) {
     return next();
   } else if (to.name == "recruit") {
     code = to.params.code;

src/store/index.js

@@ -9,7 +9,7 @@ Vue.use(Vuex)
 
 let state = {
   // 上一页地址
-  previousPage: "",
+  fullPath: localStorage.getItem("index-fullPath") || "/",
   // 数据
   data: [],
   token: '',

src/store/mutations.js

@@ -8,7 +8,6 @@ export default {
   setData(state, city) {
     state.data = city;
   },
-
   login(state) {
     state.isLogin = "1";
     localStorage.setItem("isLogin", "1");
@@ -23,4 +22,8 @@ export default {
     state.activeIndex = key;
     window.localStorage.setItem('index-active-path', key);
   },
+  setFullPath(state, path){
+    state.fullPath = path;
+    window.localStorage.setItem('index-fullPath', path);
+  },
 };

src/views/base/Index.vue

 <template>
   <el-container>
     <el-header height="80px">
-      <Header></Header>
+      <Header :typeFu="1"></Header>
     </el-header>
     <el-container>
       <router-view :key="$route.name" style="flex: 1;"></router-view>
@@ -16,9 +16,8 @@
   </el-container>
 </template>
 <script>
-  import Header from "../../components/base/Header";
-  import Footer from "../../components/base/Footer";
-
+  import Header from "../../components/Header";
+  import Footer from "../../components/Footer";
 
   export default {
     name: "index-index",

src/views/base/login/Index.vue

 <template>
   <div class="login-index">
-    <Header></Header>
+    <Header :typeFu="1"></Header>
     <div class="big-right">
       <div class="info-box">
         <router-view/>
@@ -10,7 +10,7 @@
 </template>
 <script>
   /* eslint-disable */
-  import Header from "@/components/base/Header.vue";
+  import Header from "@/components/Header.vue";
 
   export default {
     name: "loginBase",

src/views/base/login/Login.vue

@@ -203,7 +203,6 @@
       intervalHandle(startTime, endTime) {
         // 时间差
         const timeLag = intervalTime(startTime, endTime);
-        console.log(timeLag);
         if (!this.timer) {
           this.count = timeLag - 1;
           this.showCode = false;
@@ -236,12 +235,7 @@
           }
           this.$message.success(res.data.message);
           this.codeTime = res.data.data.now * 1000;
-          // console.log(this.codeTime)
-          let code = this.$store.state.indexIdentity;
-          window.localStorage.setItem(
-            "login_code_time",
-            res.data.data.now * 1000
-          );
+          window.localStorage.setItem("login_code_time", res.data.data.now * 1000);
           this.intervalHandle(new Date(), res.data.data.now * 1000);
         });
       },
@@ -288,12 +282,13 @@
             if (res.data.code != 200) {
               return this.$message.error(res.data.message);
             }
-            // this.$message.success("登录成功");请访问正确的营地链接地址
+            this.$message.success("登录成功");
             window.localStorage.setItem("index-token-all", res.data.token);
             window.localStorage.setItem("index-phone-all", this.loginForm.phone);
             window.localStorage.setItem("email", res.data.email);
-            // this.$router.replace("/myInfo");]
-            this.$router.go(-1);
+            let fullPath = this.$store.state.fullPath;
+            this.$router.push(fullPath);
+            this.$store.commit('setFullPath', '/');
           });
         });
       },
@@ -302,10 +297,10 @@
 </script>
 
 <style lang="scss" scoped>
-  @media screen  and (max-width: 1500px){
+  @media screen and (max-width: 1500px) {
     .container {
       height: 300px !important;
-      padding: 30px 37px 70px 37px!important;
+      padding: 30px 37px 70px 37px !important;
 
       .title_Login {
         margin: 0 !important;
@@ -322,6 +317,7 @@
 
       ::v-deep .el-form {
         margin-top: 25px !important;
+
         .el-form-item {
           /*margin-bottom: 25px !important;*/
 
@@ -343,8 +339,9 @@
               /*margin-top:10px !important;*/
               height: 50px !important;
               line-height: 50px !important;
-            }}
+            }
           }
+        }
       }
     }
 

src/views/base/myInfo/index.vue

 <template>
   <div class="camp-index">
     <el-header height="104px">
-      <Header></Header>
+      <Header :typeFu="1"></Header>
       <div class="bg-top"></div>
     </el-header>
     <div class="com-container">
@@ -39,8 +39,8 @@
 
 <script>
   /* eslint-disable */
-  import Header from "@/components/base/Header.vue";
-  import Footer from "@/components/base/Footer.vue";
+  import Header from "@/components/Header.vue";
+  import Footer from "@/components/Footer.vue";
   import svg1 from '@/assets/img/signUp/icon.svg';
   import signUpList from '../myInfo/signUp.vue';
 

src/views/index/Info/Index.vue

 <template>
   <div class="camp-index">
     <el-header height="104px">
-      <Header></Header>
+      <Header :typeFu="2"></Header>
       <!-- <div class="bg-top"></div> -->
       <div class="bg-top">
         <el-breadcrumb separator="/">
@@ -52,8 +52,8 @@
 
 <script>
 /* eslint-disable */
-import Header from "@/components/index/Homework/Header.vue";
-import Footer from "@/components/index/Footer.vue";
+import Header from "@/components/Header.vue";
+import Footer from "@/components/Footer.vue";
 import svg1 from "@/assets/img/signUp/icon.svg";
 import svg2 from "@/assets/img/signUp/icon-1.svg";
 import personalInfo from "v/index/Info/personalInfo";

src/views/index/camp/Index.vue

 <template>
   <div class="camp-index">
     <el-header height="104px">
-      <Header></Header>
+      <Header :typeFu="2"></Header>
       <div class="bg-top"></div>
     </el-header>
     <div class="com-container">
@@ -70,8 +70,8 @@
 <script>
   /* eslint-disable */
 
-  import Header from "@/components/index/SignUp/Header.vue";
-  import Footer from "@/components/index/Footer.vue";
+  import Header from "@/components/Header.vue";
+  import Footer from "@/components/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";

src/views/index/recruit/Index.vue

 <template>
   <div class="recruit">
     <el-header height="104px">
-      <Header></Header>
+      <Header :typeFu="2"></Header>
       <div class="notify flex" v-if="$store.state.isDisplay_num == 1">
         <div class="flex">
           <img class="notify_img" src="../../../assets/img/notify.png" alt=""/>
@@ -44,7 +44,7 @@
         </p>
       </div> -->
 
-      <div class="btn">
+      <div class="btn" v-if="info.name">
         <el-button @click="toLogin()">立即报名</el-button>
       </div>
     </div>
@@ -54,8 +54,8 @@
 <script>
   /* eslint-disable */
 
-  import Header from "@/components/index/Header.vue";
-  import Footer from "@/components/index/Footer.vue";
+  import Header from "@/components/Header.vue";
+  import Footer from "@/components/Footer.vue";
   import {getCamInfo} from "r/index/login";
   import {setLogs} from "@/common/utils";
   import {Notification} from "element-ui";
@@ -106,6 +106,9 @@
   }
 
   .recruit {
+    min-height: 100%;
+    display: flex;
+    flex-flow: column;
     font-family: PingFang SC;
 
     .el-header {
@@ -134,6 +137,7 @@
     }
 
     .content {
+      flex: 1;
       .title {
         padding: 170px 0 20px 0;
         font-size: 34px;