Merge branch 'master' of http://git.thussat.com.cn/yangmengxue/campsite

* 'master' of http://git.thussat.com.cn/yangmengxue/campsite:
  11

src/components/index/SignUp/confirm.vue

@@ -19,7 +19,7 @@
     </div> -->
     <div class="check">
       <el-checkbox v-model="checked"
-        >我已阅读并了解《2021年南开大学历史学科暑假营报名须知》</el-checkbox
+        >我已阅读并了解《2021年历史学科暑假营报名须知》</el-checkbox
       >
     </div>
     <div class="btn">

src/components/index/SignUp/success.vue

@@ -2,7 +2,7 @@
   <div class="sucess">
     <div class="p_content">
       <div class="top">
-        <div>恭喜你！成功报名2021南开大学历史学科暑假营</div>
+        <div>恭喜你！成功报名2021历史学科暑假营</div>
         <div>
           <img src="@/assets/img/signUp/offer.png" alt="" />
         </div>

src/router/index.js

@@ -9,7 +9,9 @@ import indexCamp from './index/camp'
 import {
   getCam
 } from "r/index/login";
-import { Message } from 'element-ui';
+import {
+  Message
+} from 'element-ui';
 Vue.prototype.$message = Message;
 
 Vue.use(VueRouter)
@@ -46,6 +48,15 @@ const routes = [{
 
     component: () =>
       import('v/index/recruit/Index.vue')
+  },
+  {
+    path: "/404",
+    name: "notFound",
+    component: () =>
+      import('v/index/notFound.vue'),
+  }, {
+    path: "*", // 此处需特别注意置于最底部
+    redirect: "/404"
   }
 
 ]
@@ -77,7 +88,7 @@ router.onError((error) => {
 })
 
 function checkCam(code, cb) {
-  if(!code){
+  if (!code) {
     Message({
       message: "请访问正确的营地链接地址",
       type: 'waring'

src/views/index/notFound.vue

+<template>
+  <div>
+    <div>当前页面不存在，请检查网址是否正确</div>
+    <div>
+      <router-link to="/">返回报名首页 </router-link>
+    </div>
+  </div>
+</template>
+<script>
+/* eslint-disable */
+
+export default {
+  name: "404",
+
+  data() {
+    return {};
+  },
+  created() {},
+  methods: {},
+};
+</script>
+<style  lang="scss">
+</style>