111

src/App.vue

 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 <script>
-
-  import {getCam} from "r/index/login";
-  export default {
+/* eslint-disable */
+import { getCam } from "r/index/login";
+export default {
   name: "recruit",
   data() {
     return {};
@@ -21,7 +21,7 @@
         let root = document.querySelector(":root");
         root.style.setProperty("--color", res.data.system_color);
         root.style.setProperty("--bk_pic", res.data.background_picture); //当前营地的背景图
-          window.localStorage.setItem('bk_pic',res.data.background_picture)
+        window.localStorage.setItem("bk_pic", res.data.background_picture);
         //当前营地logo
         window.localStorage.setItem("system_logo", res.data.system_logo);
         window.localStorage.setItem(
@@ -39,12 +39,12 @@
       });
     },
   },
-  };
+};
 </script>
 <style lang="scss">
-  @import "a/scss/index";
-  // @import "~a/css/base.css";
-  #app {
+@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;
@@ -52,46 +52,48 @@
   height: 100vh;
   background: #fff;
   background: #f8f8f8;
-  }
-  //滚动条的宽度
-  ::-webkit-scrollbar {
+}
+//滚动条的宽度
+::-webkit-scrollbar {
   width: 12px;
   height: 12px;
-  }
-  //滚动条的滑块
-  ::-webkit-scrollbar-thumb {
+}
+//滚动条的滑块
+::-webkit-scrollbar-thumb {
   background-color: #cccccc;
   border-radius: 4px;
-  }
+}
 
-  .el-dropdown-menu {
+.el-dropdown-menu {
   .el-dropdown-menu__item {
-      padding: 0 26px !important;
+    padding: 0 30px !important;
 
     &:hover {
       color: #ffffff !important;
       background-color: var(--color) !important;
     }
+    i {
+      font-size: 19px;
     }
   }
+}
 
-
-  .el-message-box {
+.el-message-box {
   width: 360px !important;
 
   .el-message-box__header {
     .el-message-box__title {
       color: red;
     }
-      .el-message-box__close{
-        &:hover{
+    .el-message-box__close {
+      &:hover {
         color: var(--color);
       }
     }
   }
 
-    .el-button{
-      &:nth-child(1):hover{
+  .el-button {
+    &:nth-child(1):hover {
       color: #fff;
       background-color: var(--color);
       border-color: var(--color);
@@ -109,5 +111,5 @@
       }
     }
   }
-  }
+}
 </style>

src/components/breadcrumb.vue

@@ -131,7 +131,7 @@ export default {
         font-family: PingFang SC;
       }
 
-      .img {
+      img {
         margin: 0 15px 0 10px;
       }
     }

src/components/index/SignUp/Header.vue

@@ -12,7 +12,9 @@
             <i class="el-icon-arrow-down el-icon--right"></i>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="1">退出</el-dropdown-item>
+            <el-dropdown-item command="1">
+              <i class="el-icon-switch-button"></i>退出</el-dropdown-item
+            >
           </el-dropdown-menu>
         </el-dropdown>
       </div>
@@ -63,10 +65,10 @@ export default {
       window.localStorage.removeItem("has_amount");
       window.localStorage.removeItem("campsite_id");
       window.localStorage.removeItem("order_no");
-
+      window.localStorage.removeItem("campindex_type");
       this.$store.state.token = "";
       // 使用编程式导航跳转到登录页面
-      this.$router.replace({ name: "recruit" });
+      this.$router.push({ name: "recruit" });
     },
     // 点击图片跳转到招生简章页面
     toRecruit() {
@@ -83,8 +85,9 @@ export default {
       window.localStorage.removeItem("has_amount");
       window.localStorage.removeItem("campsite_id");
       window.localStorage.removeItem("order_no");
+      window.localStorage.removeItem("campindex_type");
       this.$store.state.token = "";
-      this.$router.replace({ name: "recruit" });
+      this.$router.push({ name: "recruit" });
     },
   },
 };

src/components/index/SignUp/referInfo.vue

@@ -669,10 +669,12 @@ export default {
         return this.$message.info("chaochushuliamng");
       }
     },
-    uploadSuccess(res, file) {
-      // console.log(res, "111");
+    uploadSuccess(res, file, fileList) {
+      console.log(res, "res");
+      console.log(file, "file");
+      console.log(fileList, "fileList");
       this.referForm.achievementPath = res;
-      this.fileList[0] = {
+      this.fileList = {
         name: file.name,
         url: res,
       };
@@ -726,6 +728,9 @@ export default {
                   savefile: res.data.config.savefile,
                 };
                 this.fileList.push(obj);
+                
+  // this.fileList = fileList
+
                 console.log(this.fileList, " this.fileList");
                 window.localStorage.setItem(
                   "sign_up_file_" + window.localStorage.getItem("phone"),
@@ -931,6 +936,10 @@ export default {
         //去除upload组件过渡效果 css
         .el-upload-list__item {
           transition: none !important;
+
+          .is-ready {
+            display: none;
+          }
           div {
             height: 100%;
           }

src/components/index/SignUp/success.vue

@@ -8,7 +8,7 @@
         </div>
 
         <div class="btn">
-          <el-button >下载录取通知书</el-button>
+          <el-button @click="handleDownload">下载录取通知书</el-button>
         </div>
       </div>
 
@@ -23,25 +23,20 @@
 
 <script>
 /* eslint-disable */
-  import {getCam} from "r/index/login";
+import { getCam } from "r/index/login";
 
 export default {
   name: "Sucess",
 
   data() {
-    return {
-      pdf_address:'',
-    };
-  },
-  created() {
-
-
+    return {};
   },
+  created() {},
   methods: {
-    getCam() {
+    handleDownload() {
       getCam({}).then((res) => {
         console.log(res, "getCam");
-         this.pdf_address=res.data.pdf_address
+        window.location.href = res.data.pdf_address;
       });
     },
   },

src/views/index/camp/Index.vue

@@ -28,7 +28,7 @@
         </div>
 
         <div class="camp_right" ref="rightBox">
-          <router-view @getType="getType" />
+          <router-view @getStatus="getStatus" />
         </div>
       </div>
     </div>
@@ -72,17 +72,14 @@ export default {
       ],
 
       campindex_type: "",
-      index_type: "",
+      index_status: "",
     };
   },
   watch: {
     type(val) {
       window.localStorage.setItem("campindex_type", val);
     },
-    getType(val) {
-      console.log(val, "index_type");
-      this.index_type = val;
-    },
+   
   },
   created() {
     window.localStorage.setItem("campindex_type", 0);
@@ -97,10 +94,16 @@ export default {
     window.removeEventListener("resize", this.onResize, true);
   },
   methods: {
+     getStatus(val) {
+      console.log(val, "index_type");
+      this.index_status = val;
+      this.ToSignUp()
+    },
     ToSignUp(index) {
       this.campindex_type = index;
+      
       if (this.campindex_type == 0) {
-        this.$router.push("/signUp/:index_type");
+        this.$router.push("/signUp/"+this.index_status);
         //  this.$router.replace({name: "index-signUp"});
       } else if (this.campindex_type == 1) {
         this.$router.push("/homework");
@@ -169,7 +172,6 @@ export default {
     display: flex;
     flex-flow: row;
 
-   
     .camp_left {
       position: relative;
       width: 22%;
@@ -179,8 +181,10 @@ export default {
       background-color: #ffffff;
       border-radius: 8px;
       padding: 20px 0;
-        margin: 0;
-
+      margin-right: 25px;
+      .camp_left_box {
+        padding-inline-start: 0 !important;
+      }
       &.is-fixed {
         position: fixed;
         top: 104px;
@@ -194,6 +198,7 @@ export default {
         bottom: 0;
         width: 100%;
       }
+    }
 
     li {
       position: relative;
@@ -214,7 +219,6 @@ export default {
       &:hover {
         cursor: pointer;
         background-color: #f8f8f8;
-      
       }
     }
   }
@@ -224,6 +228,5 @@ export default {
     border-radius: 8px;
     background-color: #ffffff;
   }
-  }
 }
 </style>

src/views/index/camp/SignUp.vue

@@ -159,7 +159,7 @@ export default {
         } else if (this.status == 6) {
           this.type = "success";
         }
-        this.$emit("getType",this.type)
+        this.$emit("getStatus",this.type)
         // console.log(this.status)
         //审核报名资料状态
 

src/views/index/recruit/Index.vue

@@ -59,7 +59,7 @@
         "index-identity",
         "c59086fdb37848e7a10765812d1da349"
       );
-      // this.getCam();
+      this.getCam();
     },
     methods: {
       toLogin() {