11

src/assets/fonts/icomoon.svg

+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe900;" glyph-name="icon-2" d="M307.2 396.8h409.6v-76.8h-409.6v76.8zM307.2 243.2h409.6v-76.8h-409.6v76.8z" />
+<glyph unicode="&#xe901;" glyph-name="icon-1" d="M307.2 652.8h409.6v-76.8h-409.6v76.8zM307.2 448h256v-76.8h-256v76.8z" />
+<glyph unicode="&#xe902;" glyph-name="icon" d="M512 960c282.77 0 512-229.23 512-512s-229.23-512-512-512c-282.77 0-512 229.23-512 512s229.23 512 512 512zM729.223 620.856l-289.647-289.631-144.799 144.815-32.181-32.181 176.997-176.997 321.812 321.812-32.181 32.181z" />
+<glyph unicode="&#xe903;" glyph-name="icon1" d="M294.4 89.6h435.2c21.208 0 38.4-17.192 38.4-38.4s-17.192-38.4-38.4-38.4h-435.2c-21.208 0-38.4 17.192-38.4 38.4s17.192 38.4 38.4 38.4zM453.945 349.726l-181.019 181.019 54.306 54.306 126.686-126.652 235.352 235.264 54.306-54.306-289.631-289.631z" />
+</font></defs></svg>
\ No newline at end of file

src/assets/img/signUp/icon-1.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="06-3下载证书" transform="translate(-405.000000, -204.000000)">
+            <g id="左侧导航" transform="translate(380.000000, 104.000000)">
+                <g id="营地作业" transform="translate(0.000000, 84.000000)">
+                    <g id="icon" transform="translate(25.000000, 16.000000)">
+                        <path d="M16,1.75 C16.345178,1.75 16.657678,1.88991102 16.8838835,2.11611652 C17.110089,2.34232203 17.25,2.65482203 17.25,3 L17.25,3 L17.25,13.1715729 C17.25,13.5030935 17.1183039,13.8210359 16.8838835,14.0554564 L16.8838835,14.0554564 L13.0554564,17.8838835 C12.8210359,18.1183039 12.5030935,18.25 12.1715729,18.25 L12.1715729,18.25 L4,18.25 C3.65482203,18.25 3.34232203,18.110089 3.11611652,17.8838835 C2.88991102,17.657678 2.75,17.345178 2.75,17 L2.75,17 L2.75,3 C2.75,2.65482203 2.88991102,2.34232203 3.11611652,2.11611652 C3.34232203,1.88991102 3.65482203,1.75 4,1.75 L4,1.75 Z" id="矩形" stroke="#60194A" stroke-width="1.5"></path>
+                        <rect id="矩形" fill="#60194A" x="6" y="6" width="8" height="1.5"></rect>
+                        <rect id="矩形" fill="#60194A" x="6" y="10" width="5" height="1.5"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/img/signUp/icon-2.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 8</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="06-3下载证书" transform="translate(-404.000000, -256.000000)">
+            <g id="左侧导航" transform="translate(380.000000, 104.000000)">
+                <g id="营地证书" transform="translate(0.000000, 136.000000)">
+                    <g id="编组-8" transform="translate(24.000000, 16.000000)">
+                        <path d="M12.25,1.75 L12.25,7.59861218 L10,6.09861218 L7.75,7.59861218 L7.75,1.75 L12.25,1.75 Z" id="矩形" stroke="#60194A" stroke-width="1.5"></path>
+                        <rect id="矩形" stroke="#60194A" stroke-width="1.5" x="2.75" y="1.75" width="14.5" height="16.5" rx="2"></rect>
+                        <rect id="矩形" fill="#60194A" x="6" y="11" width="8" height="1.5"></rect>
+                        <rect id="矩形" fill="#60194A" x="6" y="14" width="8" height="1.5"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/img/signUp/icon-4.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="90px" height="90px" viewBox="0 0 90 90" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>形状结合</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="05-报名资料审核" transform="translate(-1082.000000, -328.000000)" fill="#60194A">
+            <g id="icon-shenhe" transform="translate(1082.000000, 328.000000)">
+                <path d="M45,3.63797881e-11 C69.8528137,3.63797881e-11 90,20.1471863 90,45 C90,69.8528137 69.8528137,90 45,90 C20.1471863,90 4.36557457e-11,69.8528137 4.36557457e-11,45 C4.36557457e-11,20.1471863 20.1471863,3.63797881e-11 45,3.63797881e-11 Z M64.0918831,29.8076118 L38.6346248,55.263456 L25.9081169,42.5355339 L23.0796898,45.363961 L38.636039,60.9203102 L66.9203102,32.636039 L64.0918831,29.8076118 Z" id="形状结合"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/img/signUp/icon.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="06-3下载证书" transform="translate(-405.000000, -152.000000)">
+            <g id="左侧导航" transform="translate(380.000000, 104.000000)">
+                <g id="营地报名" transform="translate(0.000000, 32.000000)">
+                    <g id="icon" transform="translate(25.000000, 16.000000)">
+                        <rect id="矩形" x="0" y="0" width="20" height="20"></rect>
+                        <rect id="矩形" fill="#60194A" x="5" y="17" width="10" height="1.5" rx="0.75"></rect>
+                        <path d="M8.86611652,11.9194174 L7.80545635,10.8587572 L5.33058262,8.38388348 L6.39124279,7.3232233 L8.86558262,9.79690296 L13.4623106,5.20190296 L14.5229708,6.26256313 L8.86611652,11.9194174 Z" id="形状结合" fill="#60194A"></path>
+                        <rect id="矩形" stroke="#60194A" stroke-width="1.5" x="1.75" y="2.75" width="16.5" height="11.5" rx="2"></rect>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/assets/style.css

+/* @font-face {
+  font-family: 'icomoon';
+  src:  url('assets/fonts/icomoon.eot?p1nl2o');
+  src:  url('../assets/fonts/icomoon.eot?p1nl2o#iefix') format('embedded-opentype'),
+    url('../assets/fonts/icomoon.ttf?p1nl2o') format('truetype'),
+    url('../assets/fonts/icomoon.woff?p1nl2o') format('woff'),
+    url('../assets/fonts/icomoon.svg?p1nl2o#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+} */
+
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'icomoon' !important;
+  speak: never;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-icon-2:before {
+  content: "\e900";
+}
+.icon-icon-1:before {
+  content: "\e901";
+}
+/* pass页面 */
+.icon-icon:before {
+  content: "\e902";
+}
+.icon-icon1:before {
+  content: "\e903";
+  color: #60194a;
+}

src/components/index/SignUp/pass.vue

@@ -2,11 +2,12 @@
   <div class="pass">
     <div class="p_content">
       <div>
-        <img src="@/assets/img/signUp/icon-shenhe.png" alt="" />
+        <!-- <img src="@/assets/img/signUp/icon-shenhe.png" alt="" /> -->
+        <i class="icon-icon"></i>
       </div>
       <div>同学你好，你的报名资料已提交</div>
       <div>
-        请等待工作人员审核，审核结果将于1-3个工作日发布，请留意网站及短信
+        请等待工作人员审核，审核结果将于1-3个工作日发布，请留意网站
       </div>
       <div v-if="this.examine_status == 1">审核已通过</div>
       <div v-if="this.examine_status == 2">提示:{{ this.examine_reason }}</div>
@@ -22,7 +23,6 @@
 
 <script>
 /* eslint-disable */
-import Cookie from "js-cookie";
 import { signUpInit } from "r/index/signUp";
 export default {
   name: "Pass",
@@ -164,12 +164,31 @@ export default {
 
 <style  lang="scss" scoped>
 @import "a/scss/btn";
+@import "a/scss/index";
+@import "a/style";
+@font-face {
+  font-family: "icomoon";
+  src: url("../../../assets/fonts/icomoon.eot?dcunb6");
+  src: url("../../../assets/fonts/icomoon.eot?dcunb6#iefix")
+      format("embedded-opentype"),
+    url("../../../assets/fonts/icomoon.ttf?dcunb6") format("truetype"),
+    url("../../../assets/fonts/icomoon.woff?dcunb6") format("woff"),
+    url("../../../assets/fonts/icomoon.svg?dcunb6#icomoon") format("svg");
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+}
+
 .btn {
   padding-bottom: 0 !important;
 }
 .pass {
   padding: 0 56px 65px 56px;
   .p_content {
+    i {
+      font-size: 100px;
+      color: var(--color);
+    }
     div {
       text-align: center;
       font-size: 16px;

src/components/index/SignUp/referInfo.vue

@@ -254,6 +254,10 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <div class="tipsMsg">
+          如果没有您所在学校，请联系邮箱：ydhdservice@163.com
+        </div>
         <el-col :span="12">
           <el-form-item label="中学联系人" prop="school_contacts">
             <el-input
@@ -555,14 +559,14 @@ export default {
     let signUpFile = window.localStorage.getItem(
       "sign_up_file_" + window.localStorage.getItem("phone" + code) + code
     );
-    // console.log(signUpFile)
+    console.log(signUpFile);
     if (signUpFile && JSON.parse(signUpFile).length > 0) {
       this.fileList = JSON.parse(signUpFile);
     }
     this.getSchool();
     this.getProAndCity();
     this.getTenYear();
-    this.getAccount();
+    this.getAccount(); // 页面信息个人获取
   },
   watch: {
     referForm(val) {
@@ -617,14 +621,14 @@ export default {
     getTenYear() {
       let nowDate = new Date();
       let currentYear = nowDate.getFullYear();
-      console.log(nowDate, currentYear);
+      // console.log(nowDate, currentYear);
       let yearArr = [];
       let rxYearArr = [];
       for (let i = 0; i < 42; i++) {
         let year = currentYear - i;
         yearArr.push(year);
       }
-      console.log(yearArr, "yearArr");
+      // console.log(yearArr, "yearArr");
       for (let i = 0; i < 10; i++) {
         let year = currentYear - i;
         rxYearArr.push(year);
@@ -645,6 +649,7 @@ export default {
             res.data.info.jiguan_province.toString() +
             res.data.info.jiguan_city.toString();
         }
+        // this.fileList=
       });
     },
     getTime() {
@@ -684,6 +689,7 @@ export default {
         if (!status) {
           this.referForm.school_city = "";
           this.referForm.school = "";
+          this.selectSchoolList = []; //重新选择省份时候，学校list清空
         }
       }
     },
@@ -763,7 +769,7 @@ export default {
             // console.log(res)
             if (res.data.code === 200) {
               this.schoolName = res.data.school_list;
-              const code = this.$store.state.indexIdentity;
+              let code = this.$store.state.indexIdentity;
               window.localStorage.setItem(
                 "schoolName" + code,
                 JSON.stringify(res.data.list)
@@ -858,7 +864,6 @@ export default {
           if (res.data.code === 200) {
             let oss_url = res.data.config.host;
             let filename = res.data.config.file;
-
             let formData = new FormData();
             formData.append("OSSAccessKeyId", res.data.config.accessid);
             formData.append("policy", res.data.config.policy);
@@ -884,15 +889,10 @@ export default {
                   savefile: res.data.config.savefile,
                 };
                 this.fileList.push(obj);
-
-                // this.fileList = fileList
-
-                // console.log(this.fileList, " this.fileList");
                 let code = this.$store.state.indexIdentity;
                 window.localStorage.setItem(
                   "sign_up_file_" +
-                    +window.localStorage.getItem("phone" + code) +
-                    code,
+                    +window.localStorage.getItem("phone" + code),
                   JSON.stringify(this.fileList)
                 );
               })
@@ -917,25 +917,25 @@ export default {
       ); //https://yingdi-achievement.oss-cn-beijing.aliyuncs.com/进行分割，
       // console.log(str, "str");
       const savefile = str[1];
-      console.log(savefile, "savefile");
-      delPic({ object: savefile }).then((res) => {
-        // console.log(res, "delpic");
-        if (res.data.code != 200) {
-          return this.$message.error(res.data.message);
-        }
-        // delete this.fileList[idx];
+      // console.log(savefile, "savefile");
 
+      // delete this.fileList[idx];
       this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
+          delPic({ object: savefile }).then((res) => {
+            // console.log(res, "delpic");
+            if (res.data.code != 200) {
+              return this.$message.error(res.data.message);
+            }
             this.fileList.forEach((item, idx) => {
               // console.log(item.url == file.url);
               if (item.url == file.url) {
                 this.fileList.splice(idx, 1);
-                let code = this.$store.state.indexIdentity;
+                const code = this.$store.state.indexIdentity;
                 window.localStorage.setItem(
                   "sign_up_file_" +
                     window.localStorage.getItem("phone" + code) +
@@ -945,17 +945,13 @@ export default {
               }
             });
             // console.log(this.fileList);
-
-            this.$message({
-              type: "success",
-              message: "删除成功!",
+            this.$message.success(res.data.message);
           });
         })
-          .catch(() => {
+        .catch((err) => {
           this.$message({
             type: "info",
-              message: "已取消删除",
-            });
+            message: "取消删除",
           });
         });
     },
@@ -1034,6 +1030,14 @@ export default {
       font-weight: 500;
       color: #12141c;
     }
+    .tipsMsg {
+      padding: 0 10px;
+      margin-bottom: 15px;
+      font-size: 10px;
+      font-family: PingFang SC;
+      font-weight: 500;
+      color: #a7a2a6;
+    }
 
     ::v-deep .el-form-item {
       margin-bottom: 20px;

src/request/index/signUp.js

@@ -53,8 +53,8 @@ export function getAchievementOss(data) {
     data
   })
 }
-//删除图片
 
+//删除图片
 export function delPic(data) {
   data['identity'] = store.state.indexIdentity;
   return request({
@@ -63,6 +63,7 @@ export function delPic(data) {
     params:data
   })
 }
+
 // 页面个人信息保存
 export function setAccount(data) {
   data['identity'] = store.state.indexIdentity;

src/views/index/camp/Index.vue

@@ -21,7 +21,7 @@
               :class="{ active: campindex_type === index }"
               @click="ToSignUp(index)"
             >
-              <img :src="item.image" />
+              <img :src="item.url" />
               {{ item.desc }}
             </li>
           </ul>
@@ -41,7 +41,9 @@
 import Cookie from "js-cookie";
 import Header from "@/components/index/SignUp/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';
 
 export default {
   name: "campIndex",
@@ -59,17 +61,20 @@ export default {
         {
           id: "0",
           desc: "营地报名",
-          image: require("@/assets/img/signUp/icon-bm.png"),
+          icon: "icon-icon1",
+          url: svg1
         },
         {
           id: "1",
           desc: "营地作业",
-          image: require("@/assets/img/signUp/icon-zs.png"),
+          icon: "icon-icon-1",
+          url: svg2
         },
         {
           id: "2",
           desc: "营地证书",
-          image: require("@/assets/img/signUp/icon-zy.png"),
+          icon: "icon-icon-2",
+          url: svg3
         },
       ],
 
@@ -84,7 +89,6 @@ export default {
     // },
   },
   created() {
-  
     this.getStatus();
     this.ToSignUp(this.index);
   },
@@ -153,7 +157,23 @@ export default {
 
 <style lang="scss" scoped>
 @import "a/scss/common";
-
+@import "a/scss/index";
+@import "a/style";
+@font-face {
+  font-family: "icomoon";
+  src: url("../../../assets/fonts/icomoon.eot?dcunb6");
+  src: url("../../../assets/fonts/icomoon.eot?dcunb6#iefix")
+      format("embedded-opentype"),
+    url("../../../assets/fonts/icomoon.ttf?dcunb6") format("truetype"),
+    url("../../../assets/fonts/icomoon.woff?dcunb6") format("woff"),
+    url("../../../assets/fonts/icomoon.svg?dcunb6#icomoon") format("svg");
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+}
+.camp_left i {
+  font-family: "icomoon";
+}
 .camp-index {
   background: #f8f8f8;
 
@@ -211,7 +231,7 @@ export default {
 
     li {
       position: relative;
-      padding: 0 23px;
+      padding: 0 23px 0 51px;
       height: 44px;
       line-height: 44px;
       margin: 10px 0;
@@ -222,6 +242,9 @@ export default {
         vertical-align: middle;
         margin: -3px 8px 0 0;
         width: 20px;
+        position: absolute;
+        left: -1000px;
+        filter: drop-shadow(var(--color) 1023px 13px) !important;
       }
 
       &.active,

src/views/index/camp/SignUp.vue

@@ -45,9 +45,9 @@ export default {
     return {
       type: "examInfo",
       status: "", //进度
-      doubt_code: window.localStorage.getItem("doubt_code"),
-      doubt_info: window.localStorage.getItem("doubt_info"),
-      doubt_check: window.localStorage.getItem("doubt_check"),
+      doubt_code: window.localStorage.getItem("doubt_code"+this.$store.state.indexIdentity),
+      doubt_info: window.localStorage.getItem("doubt_info"+this.$store.state.indexIdentity),
+      doubt_check: window.localStorage.getItem("doubt_check"+this.$store.state.indexIdentity),
       status_val: "",
       getExamine: "",
       isNexts: "",
@@ -57,13 +57,8 @@ export default {
     this.type = this.$route.params.type;
     // console.log(this.$route, "router");
     this.statuss();
-    // this.signUpInit();
-    // getWxConfig({
-    //   pay_type: 1,
-    // }).then((res) => {
-    //   console.log(res);
-    //   this.status = res.data.status;
-    // });
+    this.signUpInit();
+
   },
 
   watch: {
@@ -197,9 +192,9 @@ export default {
             };
             return obj;
           });
-          const code = this.$store.state.indexIdentity;
+          // let code = this.$store.state.indexIdentity;
           window.localStorage.setItem(
-            "sign_up_file_" + window.localStorage.getItem("phone" + code),
+            "sign_up_file_" + window.localStorage.getItem("phone"+ code )+ code,
             JSON.stringify(fileList)
           ); //上传的图片
         }
@@ -210,6 +205,7 @@ export default {
 </script>
 
 <style lang="scss" >
+
 .flex {
   display: flex;
 }

src/views/index/login/Login.vue

@@ -253,6 +253,7 @@ export default {
         font-size: 16px;
         padding: 0;
         margin: 30px 0 0 0;
+        border: none;
       }
     }
     .box {
@@ -280,11 +281,11 @@ export default {
         margin-top: -10px;
         cursor: pointer;
         &:hover {
-          color: #563279;
+          color: var(--color);
           text-decoration: underline;
         }
       }
-      .fc{
+      .fc {
         font-size: 4px;
         float: right;
         // height: 18px;

src/views/index/login/Register.vue

@@ -381,6 +381,7 @@ export default {
           font-size: 16px;
           padding: 0;
           margin: 30px 0 0 0;
+          border: none;
         }
       }
     }
@@ -397,9 +398,8 @@ export default {
         color: #999999;
         margin-top: -10px;
         cursor: pointer;
-
         &:hover {
-          color: #563279;
+          color: var(--color);
           text-decoration: underline;
         }
       }