修改

src/components/breadcrumb.vue

@@ -66,7 +66,7 @@ export default {
       },
     ];
     let arr = [];
-    console.log(newArr, "newArr");
+    // console.log(newArr, "newArr");
     for (let i = 0; i < newArr.length; i++) {
       const item = newArr[i];
       if (
@@ -82,7 +82,7 @@ export default {
   },
   watch: {
     statusNum(val) {
-      console.log(val, "statusNum");
+      // console.log(val, "statusNum");
       this.status = val;
     },
   },

src/components/index/SignUp/ConfirmSignUp.vue

@@ -79,7 +79,6 @@ export default {
         this.isShowqr = false;
         return;
       }
-
       this.isShowqr = true;
       this.createQrCode(res.code_url);
       //初始化 websocket 链接

src/components/index/SignUp/paying.vue

@@ -33,7 +33,7 @@
         <div>
           4、对于多次缴费的考生，除生效一笔之外其他重复支付的得用会在缴费结束阶段统一退款。
         </div>
-        <div>5、网上缴费如有问题，请致电项目组工作人员：XXX-XXXXXXXXX。</div>
+        <!-- <div>5、网上缴费如有问题，请致电项目组工作人员：XXX-XXXXXXXXX。</div> -->
       </div>
     </div>
     <!-- 支付扫码框 -->
@@ -64,8 +64,8 @@
 /* eslint-disable */
 import ConfirmSignUp from "c/index/SignUp/ConfirmSignUp";
 import { getAccount } from "r/index/signUp";
-import { parseTime } from "common/utils";
 import { signUpInit } from "r/index/signUp";
+import { getWxConfig } from "r/index/pay";
 
 export default {
   name: "Paying",
@@ -78,6 +78,9 @@ export default {
       personalInfo: {},
       camp_name: "", //营地名称
       has_amount: "", //支付金额
+      status: "", //状态
+      status_wx: "", //状态
+      type: "", //状态
     };
   },
   created() {
@@ -94,23 +97,52 @@ export default {
         clearInterval(this.timer);
       }
     },
-   
+
     paying() {
+      getWxConfig({
+        pay_type: 1,
+      }).then((res) => {
+        console.log(res, "getWxConfig");
+        // this.status_wx = res.data.status;
+          this.$emit("getstatus", res.data.status);
+        console.log(this.status_wx, " this.status_wx");
+        this.signUpInit(this.status_wx);
+      });
+      // return;
+    },
+    signUpInit(status_wx) {
       signUpInit({}).then((res) => {
         console.log(res, "signUpInit");
         if (res.data.code != 200) {
-          if (res.data.code == 400001) {
-            this.status = 6;
-            this.type = "success";
-          }
           return this.$message.error(res.data.message);
         }
-        this.status = res.data.status;
-        console.log(this.status, "this.status");
+        // this.status = res.data.status;
         // 点击下一步传值给status,更新
-        if (this.status == 5) {
-          this.type = "pay";
+        if (status_wx) {
+          this.status = status_wx;
+          console.log(this.status, "status_wx");
+        } else {
+          this.status = res.data.status;
+          // console.log(this.status, "11111");
+        }
+        // return;
+        // 点击下一步传值给status,更新
+        if (this.status == 4) {
+          this.type = "check";
+          this.status = 3;
+          if (this.isNexts == 1) {
+            if (res.data.examine_status == 1) {
+              console.log(333);
+              this.type = "pay";
+              this.status = 4;
+            } else if (res.data.examine_status == 2) {
+              this.type = "referInfo";
+              this.status = 2;
+            }
+          }
           this.confirmSignUpDialogFu = true;
+        } else if (this.status == 5) {
+          this.type = "pay";
         } else if (this.status == 6) {
           this.type = "success";
         }

src/components/index/SignUp/referInfo.vue

@@ -284,7 +284,9 @@
         prop="backgroundPicture"
         class="bgPic"
       >
-        <div class="bgInfo">1、资料包括：XXXXXXXXXXXXX；</div>
+        <div class="bgInfo">
+          1、资料包括：近期校级考试的成绩单、在校期间获得证书等相关证明；
+        </div>
         <div class="bgInfo">
           2、请上传1-10张图片，支持JPG、JPEG、PNG等格式，每张图片不超过10M
         </div>

src/components/index/SignUp/success.vue

@@ -8,7 +8,7 @@
         </div>
 
         <div class="btn">
-          <el-button @click="handleDownload">下载录取通知书</el-button>
+          <el-button @click="handleDownload">下载入营通知书</el-button>
         </div>
       </div>
 

src/views/index/camp/SignUp.vue

@@ -28,7 +28,7 @@ import Pass from "c/index/SignUp/pass";
 import Paying from "c/index/SignUp/paying";
 import Success from "c/index/SignUp/success";
 import { signUpInit } from "r/index/signUp";
-import Cookie from "js-cookie";
+import { getWxConfig } from "r/index/pay";
 
 export default {
   name: "signUp",
@@ -58,6 +58,12 @@ export default {
     // console.log(this.$route, "router");
     this.statuss();
     // this.signUpInit();
+    // getWxConfig({
+    //   pay_type: 1,
+    // }).then((res) => {
+    //   console.log(res);
+    //   this.status = res.data.status;
+    // });
   },
 
   watch: {
@@ -72,13 +78,13 @@ export default {
       deep: true,
     },
     status(val) {
-      console.log(val, "status");
+      // console.log(val, "status");
     },
   },
   methods: {
     is_nextevent(val) {
       this.isNexts = val;
-      console.log(val, "isNexts");
+      // console.log(val, "isNexts");
       //  this.signUpInit(  this.isNexts );
       this.signUpInit(this.status_val);
     },
@@ -90,17 +96,15 @@ export default {
     },
     // status=4,跳到审核页面；status=3时，根据doubt_check做判断
     signUpInit(status_val) {
-      console.log(11111);
       // console.log(status_val, "11111");
       // console.log(isNexts, "2222");
       signUpInit({}).then((res) => {
-        // console.log(22222);
-        console.log(res, "signUpInit");
+        // console.log(res, "signUpInit");
         if (res.data.code != 200) {
           // if (res.data.code == 400001) {
           //   this.status = 6;
           //   this.type = "success";
-          // } 
+          // }
           return this.$message.error(res.data.message);
         }
         this.status = res.data.status;
@@ -170,12 +174,18 @@ export default {
         // console.log(res.data.examine_status, "res.data.examine_status");
 
         //订单支付金额
-        let code =this.$store.state.indexIdentity
-        window.localStorage.setItem("has_amount"+code, res.data.has_amount);
-        window.localStorage.setItem("campsite_id"+code, res.data.campsite_id);
-        window.localStorage.setItem("order_no"+code, res.data.order_no);
-        window.localStorage.setItem("examine_status"+code, res.data.examine_status); //返回错误原因
-        window.localStorage.setItem("examine_reason"+code, res.data.examine_reason); //资料审核状态
+        let code = this.$store.state.indexIdentity;
+        window.localStorage.setItem("has_amount" + code, res.data.has_amount);
+        window.localStorage.setItem("campsite_id" + code, res.data.campsite_id);
+        window.localStorage.setItem("order_no" + code, res.data.order_no);
+        window.localStorage.setItem(
+          "examine_status" + code,
+          res.data.examine_status
+        ); //返回错误原因
+        window.localStorage.setItem(
+          "examine_reason" + code,
+          res.data.examine_reason
+        ); //资料审核状态
         // window.localStorage.setItem("achievement_path", res.data.achievement_path); //上传的图片
         const aPath = res.data.achievement_path;
         if (aPath) {

src/views/index/login/Login.vue

@@ -53,6 +53,7 @@
       </el-form-item>
       <div class="box">
         <div class="fr" @click="register()">还没有账号？立即注册</div>
+        <div class="fc">忘记密码请联系管理员邮箱：ydhdservice@163.com</div>
         <!-- <div class="fl" @click="forgetPwd()">忘记密码？</div> -->
       </div>
     </el-form>
@@ -164,10 +165,10 @@ export default {
           window.localStorage.setItem("index-token" + code, res.data.token);
           window.localStorage.setItem("phone" + code, this.loginForm.phone);
           // 报名信息
-          window.localStorage.setItem("camp_name"+code, res.data.cam.name);
+          window.localStorage.setItem("camp_name" + code, res.data.cam.name);
           //获取主题色
           window.localStorage.setItem(
-            "system_color"+code,
+            "system_color" + code,
             res.data.cam.system_color
           );
 
@@ -256,9 +257,23 @@ export default {
     }
     .box {
       height: 18px;
-      display: block;
-      .fl {
-        float: right;
+      // display: block;
+      display: flex;
+      flex-direction: column;
+      // .fl {
+      //   float: right;
+      //   height: 18px;
+      //   line-height: 18px;
+      //   color: #999999;
+      //   margin-top: -10px;
+      //   cursor: pointer;
+      //   &:hover {
+      //     color: #563279;
+      //     text-decoration: underline;
+      //   }
+      // }
+      .fr {
+        float: left;
         height: 18px;
         line-height: 18px;
         color: #999999;
@@ -269,17 +284,18 @@ export default {
           text-decoration: underline;
         }
       }
-      .fr {
-        float: left;
-        height: 18px;
+      .fc{
+        font-size: 4px;
+         float: right;
+        // height: 18px;
         line-height: 18px;
         color: #999999;
-        margin-top: -10px;
-        cursor: pointer;
-        &:hover {
-          color: #563279;
-          text-decoration: underline;
-        }
+        margin-top: 10px;
+        // cursor: pointer;
+        // &:hover {
+        //   color: #563279;
+        //   text-decoration: underline;
+        // }
       }
     }
   }