营地2.0-修改

src/components/base/myInfo/campList.vue

@@ -9,13 +9,16 @@
                 <el-image :src="item.activityCover" fit="cover"/>
               </div>
               <div class="right">
-                <div>
-                  <div class="item_title">{{item.schoolName}}</div>
-                  <div class="item_tag">{{item.activityLabel}}</div>
-                  <div class="item_time">活动时间：{{formatYMD(item.activityStartTime)}} 至
-                    {{formatYMD(item.activityEndTime)}}
+                <div class="item_title">{{item.name}}</div>
+                <div class="sign-box" v-if="item.activityLabel">
+                  <div class="sign"
+                       v-for="(item2, index2) in item.activityLabel.split(',')"
+                       :key="index2">{{item2}}
                   </div>
                 </div>
+                <div class="item_time">活动时间：{{formatYMD(item.activityStartTime)}} 至
+                  {{formatYMD(item.activityEndTime)}}
+                </div>
               </div>
             </div>
           </el-card>
@@ -58,7 +61,9 @@
         })
       },
       toSignUp(code) {
-        console.log(code)
+        if(this.type==5){
+          return false;
+        }
         this.$store.commit('setIndexIdentity', code)
         this.$router.push('/signUp/undefined?code=' + code)
       }
@@ -120,19 +125,34 @@
       .right {
         flex: 1;
         display: flex;
-        align-items: center;
+        flex-flow: column;
+        justify-content: space-around;
 
         .item_title {
           font-size: 15px;
         }
 
-        .item_tag {
+        .sign-box {
           font-size: 10px;
-          background-color: #F2F2F2;
-          width: fit-content;
-          padding: 3px;
-          border-radius: 7px;
-          margin: 20px 0;
+          display: inline-block;
+          margin-right: 10px;
+
+          &:last-child {
+            margin-right: 0;
+          }
+
+          .sign {
+            display: inline-block;
+            padding: 0 10px;
+            border-radius: 4px;
+            background-color: #eeeeee;
+            margin: 5px 10px 5px 0;
+            line-height: 25px;
+
+            &:last-child {
+              margin-right: 0;
+            }
+          }
         }
 
         .item_time {

src/views/base/active/Active.vue

@@ -69,11 +69,11 @@
                          :label="item.lableId"
                          border>{{item.lableName}}
             </el-checkbox>
+            <div class="btn-area">
+              <el-button @click="resetHandle">重置</el-button>
+              <el-button @click="searchHandle">确定</el-button>
+            </div>
           </el-checkbox-group>
-          <div class="btn-area">
-            <el-button @click="resetHandle">重置</el-button>
-            <el-button @click="searchHandle">确定</el-button>
-          </div>
         </div>
       </div>
     </div>
@@ -394,12 +394,14 @@
         .content-item {
           display: flex;
           flex-flow: row;
-          align-items: center;
+          /*align-items: center;*/
           line-height: 36px;
           margin: 15px 0;
 
           .content-item-tit {
             width: 140px;
+            height: 36px;
+            line-height: 36px;
             text-align: center;
             font-size: 16px;
             background-color: #f5f5f5;
@@ -407,7 +409,8 @@
           }
 
           ::v-deep .el-checkbox-group {
-            height: 36px;
+            flex: 1;
+            /*height: 36px;*/
             line-height: 36px;
           }
 
@@ -472,13 +475,13 @@
           }
 
           .btn-area {
-            /*margin-left: 130px;*/
+            display: inline-block;
             .el-button {
               height: 36px;
               color: #333333;
               border-color: #333333;
               background-color: #ffffff;
-              margin-left: 15px;
+              margin-left: 30px;
 
               &:hover {
                 color: var(--all_color);

src/views/base/login/Register.vue

@@ -260,9 +260,9 @@
         }).then((res) => {
           console.log(res, "passwordCode");
           if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
           }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
           this.codeTime = res.data.data.now * 1000;
           // console.log(this.codeTime)
           window.localStorage.setItem("register_code_time",
@@ -285,9 +285,8 @@
           }).then((res) => {
             console.log(res);
             if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
             }
-            // this.$message.success(res.data.message);
             // token存储
             this.$store.commit('login', res.data.token);
             window.localStorage.setItem("index-phone-all", this.registerForm.phone);

src/views/index/camp/SignUp.vue

@@ -2,6 +2,7 @@
   <div class="signUp">
     <div class="content">
       <div class="">
+        <i class="el-icon-arrow-left back-arrow" @click="backArrow()"/>
         <div
           class="lastBtn"
           v-show="
@@ -21,7 +22,6 @@
           <div v-else class="signUp_titile">营地报名</div>
         </div>
       </div>
-
       <div>
         <Breadcrumb :statusNum="status"></Breadcrumb>
       </div>
@@ -229,6 +229,12 @@
       },
     },
     methods: {
+      // 箭头返回按钮
+      backArrow(){
+        let root = document.querySelector(":root");
+        root.style.setProperty("--color", "#4FACFE");
+        this.$router.push('/myInfo/signUpList');
+      },
       // 营地通知 详情内容
       // toMsgDetail() {
       //   this.dialogVisibleList = false;
@@ -424,7 +430,22 @@
     }
 
     .content {
-      padding: 50px 55px;
+      position: relative;
+      padding: 70px 55px 50px;
+
+      .back-arrow.el-icon-arrow-left {
+        position: absolute;
+        left: 10px;
+        top: 10px;
+        color: #12141c;
+        font-weight: bold;
+        font-size: 40px;
+
+        &:hover {
+          color: var(--color);
+          cursor: pointer;
+        }
+      }
     }
   }
 

src/views/index/login/Register.vue

@@ -270,9 +270,9 @@
         }).then((res) => {
           console.log(res, "passwordCode");
           if (res.data.code != 200) {
-            return this.$message.error(res.data.message);
+            return this.$message.error(res.data.msg);
           }
-          this.$message.success(res.data.message);
+          this.$message.success(res.data.msg);
           this.codeTime = res.data.data.now * 1000;
           // console.log(this.codeTime)
           let code = this.$store.state.indexIdentity;
@@ -296,9 +296,9 @@
           }).then((res) => {
             console.log(res);
             if (res.data.code != 200) {
-              return this.$message.error(res.data.message);
+              return this.$message.error(res.data.msg);
             }
-            // this.$message.success(res.data.message);
+            // this.$message.success(res.data.msg);
             let code = this.$store.state.indexIdentity;
             // token存储
             this.$store.commit('login', res.data.token);