营地2.0-整合修改

src/App.vue

@@ -75,18 +75,20 @@
       .el-message-box__title {
         color: red;
       }
-
-      .el-message-box__close {
+      .el-message-box__headerbtn {
+        &:focus,
         &:hover {
+          .el-message-box__close {
             color: var(--color);
           }
         }
       }
+    }
 
     .el-button {
       &:nth-child(1):hover {
-        color: #fff;
-        background-color: var(--color);
+        color: var(--color);
+        background-color: #ffffff;
         border-color: var(--color);
         opacity: 0.6;
       }

src/assets/scss/dialog.scss

+::v-deep .el-dialog {
+  .el-dialog__header {
+    .el-dialog__headerbtn {
+      &:focus,
+      &:hover {
+        .el-dialog__close {
+          color: var(--color);
+        }
+      }
+    }
+  }
+
+  .el-dialog__footer {
+    .el-button {
+      &:hover {
+        color: var(--color);
+        border-color: var(--color);
+        background-color: #ffffff;
+      }
+    }
+
+    .el-button--primary {
+      border-color: var(--color);
+      background-color: var(--color);
+
+      &:hover {
+        color: #ffffff;
+        border-color: var(--color);
+        background-color: var(--color);
+      }
+    }
+  }
+}

src/components/Header.vue

@@ -5,7 +5,8 @@
         <img v-if="type==1" :src="all_logo" alt=""/>
         <img v-if="type==2" :src="system_logo" alt=""/>
         <img v-if="type==3" :src="system_logo" alt="" @click="toRecruit"/>
-        <img v-if="type==4" :src="system_logo?system_logo:all_logo" alt="" @click="toRecruit"/>
+        <img v-if="type==4" :src="all_logo" alt=""/>
+        <!--<img v-if="type==4" :src="system_logo?system_logo:all_logo" alt=""/>-->
       </div>
       <div class="right">
         <el-menu :default-active="$store.state.activeIndex"
@@ -198,10 +199,12 @@
       align-items: center;
       justify-content: space-between;
 
-      .image img {
-        // width: 318px;
-        height: 62px;
+      .image{
+        img {
+          height: 50px;
           cursor: pointer;
+          vertical-align: top;
+        }
       }
 
       .right {

src/components/base/myInfo/campList.vue

@@ -52,7 +52,7 @@
           type: this.type
         }).then((res) => {
           if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
           }
           this.activeList = res.data.data;
         })

src/components/index/SignUp/deliveryAddress.vue

@@ -99,12 +99,12 @@
   </el-dialog>
 </template>
 <script>
-/* eslint-disable */
-import { getProAndCity } from "r/index/signUp";
-import { setAddress, getAddress } from "r/index/certificate";
-import validator from "common/validator";
+  /* eslint-disable */
+  import {getProAndCity} from "r/index/signUp";
+  import {setAddress, getAddress} from "r/index/certificate";
+  import validator from "common/validator";
 
-export default {
+  export default {
     name: "deliveryAddress",
     props: {
       dialogVisibleAddress: Boolean,
@@ -114,7 +114,7 @@ export default {
         dialogVisible: false, //确认收货地址对话框
         addressRules: {
           certificate_name: [
-          { required: true, message: "姓名不能为空！", trigger: "blur" },
+            {required: true, message: "姓名不能为空！", trigger: "blur"},
           ],
           certificate_phone: [
             {
@@ -122,7 +122,7 @@ export default {
               message: "手机号不能为空！",
               trigger: "blur",
             },
-          { validator: validator.validatePhone, trigger: "blur" },
+            {validator: validator.validatePhone, trigger: "blur"},
           ],
           certificate_province: [
             {
@@ -142,7 +142,7 @@ export default {
           //   { required: true, message: "请选择所在区县！", trigger: "blur" },
           // ],
           certificate_address: [
-          { required: true, message: "详细地址不能为空！", trigger: "blur" },
+            {required: true, message: "详细地址不能为空！", trigger: "blur"},
           ],
         },
         addressForm: {
@@ -188,8 +188,8 @@ export default {
             return this.$message.error(res.data.message);
           }
           console.log(res.data.info)
-        console.log(res.data.info.length==0 )
-        if (res.data.info.length==0) {
+          console.log(res.data.info.length == 0)
+          if (res.data.info.length == 0) {
             console.log(111111)
             return;
           } else {
@@ -294,11 +294,13 @@ export default {
         });
       },
     },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-::v-deep.el-form-item {
+  @import "a/scss/dialog";
+
+  ::v-deep.el-form-item {
     margin-bottom: 20px;
 
     // item的验证红点点
@@ -310,9 +312,11 @@ export default {
       font-weight: 500;
       color: #12141c;
     }
+
     &.no_label .el-form-item__label {
       width: 0 !important;
     }
+
     &.no_label .el-form-item__label::before {
       content: "" !important;
     }
@@ -320,5 +324,5 @@ export default {
     &.no_label .el-form-item__content {
       margin-left: 0 !important;
     }
-}
+  }
 </style>

src/components/index/SignUp/pass.vue

@@ -52,11 +52,9 @@
     methods: {
       Lasting() {
         signBack({}).then((res) => {
-          console.log(res, "signBack");
           if (res.data.code != 200) {
             return this.$message.error(res.data.message);
           }
-          // console.log(res.data.status, "signBack.status");
           this.signBackStatus = res.data.status;
           this.$emit("getstatus", res.data.status);
           this.$message.success(res.data.message);
@@ -64,12 +62,8 @@
       },
       paying() {
         this.$emit("is_next", 1);
-        //  console.log(is_next);
       },
       signUpInit(status_val) {
-        // console.log(status_val, "11111");
-
-        // console.log(isNexts, "2222");
         signUpInit({}).then((res) => {
           console.log(res, "signUpInit");
           if (res.data.code != 200) {
@@ -80,13 +74,11 @@
             return this.$message.error(res.data.message);
           }
           this.status = res.data.status;
-          console.log(this.status, "11111");
           // 点击下一步传值给status,更新
           if (status_val != null) {
             this.status = status_val;
           } else {
             this.status = res.data.status;
-            // console.log(this.status, "11111");
           }
           // doubt_code，doubt_info，doubt_check。0为不填写，1为填写
           if (this.status == 0) {
@@ -101,7 +93,6 @@
               this.status = 1;
             }
           } else if (this.status == 2) {
-            console.log(this.doubt_info, "doubt_info");
             // 是否填写个人资料
             if (this.doubt_info == 0) {
               this.type = "check";
@@ -122,19 +113,13 @@
           } else if (this.status == 4) {
             this.type = "check";
             this.status = 3;
-            // console.log(this.status, "this.status ");
-            // console.log(this.isNexts ,'this.isNexts ')
-
             if (this.isNexts == 1) {
-              // console.log(11111);
               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;
-                // return this.$message.error(res.data.examine_reason);
               }
             }
           } else if (this.status == 5) {
@@ -162,7 +147,6 @@
               };
               return obj;
             });
-            const code = this.$store.state.indexIdentity;
             window.localStorage.setItem("sign_up_file_" + window.localStorage.getItem("index-phone-all"), JSON.stringify(fileList)); //上传的图片
           }
         });

src/components/index/SignUp/paying.vue

@@ -776,6 +776,7 @@
 
 <style lang="scss" scoped>
   @import "a/scss/btn";
+  @import "a/scss/dialog";
 
     .btn {
         padding-bottom: 0 !important;

src/views/index/camp/SignUp.vue

@@ -95,7 +95,7 @@
           希望广大师生以营地招生简章为准，不要轻信有关宣传，以免自身利益受损。如遇类似上述情况，可发送邮件至service@campcenter.cn反映核实。特此声明！
       </div>
       <div class="btn">
-        <el-button @click="toBackList">返回营地通知列表</el-button>
+        <el-button type="primary" @click="toBackList">返回营地通知列表</el-button>
       </div>
     </el-dialog> -->
 
@@ -117,7 +117,7 @@
         &emsp;&emsp;希望广大师生以营地招生简章为准，不要轻信有关宣传，以免自身利益受损。如遇类似上述情况，可发送邮件至service@campcenter.cn反映核实。特此声明！
       </div>
       <div class="btn">
-        <el-button @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -144,7 +144,7 @@
         <a :href="yingdiHref">查看报名简章</a>。
       </div>
       <div class="btn">
-        <el-button @click="dialogVisible = false">确 定</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
       </div>
     </el-dialog> -->
   </div>
@@ -242,7 +242,6 @@
       // 上一步回退
       lasStep() {
         signBack({}).then((res) => {
-          console.log(res, "signBack");
           if (res.data.code != 200) {
             return this.$message.error(res.data.message);
           }
@@ -261,14 +260,13 @@
         this.signUpInit(this.status_val);
       },
       // status=4,跳到审核页面；status=3时，根据doubt_check做判断
-      signUpInit(status_val) {
+      signUpInit(status_val = null) {
         signUpInit({}).then((res) => {
           if (res.data.code != 200) {
             return this.$message.error(res.data.message);
           }
-          this.status = res.data.status;
           // 点击下一步传值给status,更新
-          if (status_val != null) {
+          if (status_val && status_val != null && status_val != "") {
             this.status = status_val;
           } else {
             this.status = res.data.status;
@@ -279,7 +277,6 @@
           } else if (this.status == 1) {
             //  是否填写邀请码
             if (this.doubt_code == 0) {
-
               this.type = "referInfo";
               this.status = 2;
             } else {
@@ -344,7 +341,6 @@
               };
               return obj;
             });
-            // let code = this.$store.state.indexIdentity;
             window.localStorage.setItem("sign_up_file_" +
               window.localStorage.getItem("index-phone-all") +
               code,
@@ -402,9 +398,9 @@
     .el-button {
       width: 120px;
       height: 35px;
-      background: var(--color);
       border-radius: 4px;
       border-color: var(--color);
+      background: var(--color);
       opacity: 0.8;
       line-height: 35px;
       text-align: center;
@@ -502,3 +498,7 @@
     }
   }
 </style>
+
+<style lang="scss" scoped>
+  @import "a/scss/dialog";
+</style>