Merge branch 'master' of http://git.thussat.com.cn/yangmengxue/campsite

src/assets/scss/common.scss

 .com-container{
   width: 60%;
   max-width: 1160px;
-  min-width: 1024px;
+  min-width: 1050px;
   //min-width: 960px;
   padding: 0 40px;
   margin: 0 auto;

src/components/breadcrumb.vue

@@ -23,75 +23,6 @@
         />
       </div>
     </div>
-    <!-- 1 -->
-    <!--    <div class="step flex">-->
-    <!--      <div :class="'cricle' + ' ' + (status >= 0? 'speed-bg-color' : '')">-->
-    <!--        <span class="num">1</span>-->
-    <!--      </div>-->
-    <!--      <div-->
-    <!--        :class="'step_title' + ' ' + (status >= 0 ? 'speed-text-color' : '')"-->
-    <!--      >-->
-    <!--        确认报名须知-->
-    <!--      </div>-->
-    <!--      <div>-->
-    <!--        <img src="../assets/img/signUp/left.png" alt=""/>-->
-    <!--      </div>-->
-    <!--    </div>-->
-    <!-- 2 -->
-    <!--    <div class="step flex">-->
-    <!--      <div-->
-    <!--        class="cricle cc"-->
-    <!--        :class="'cricle' + ' ' + (status >= 1 ? 'speed-bg-color' : '')"-->
-    <!--      >-->
-    <!--        <span class="num">2</span>-->
-    <!--      </div>-->
-    <!--      <div-->
-    <!--        :class="'step_title' + ' ' + (status >= 1? 'speed-text-color' : '')"-->
-    <!--      >-->
-    <!--        填写邀请码-->
-    <!--      </div>-->
-    <!--      <img src="../assets/img/signUp/left.png" alt=""/>-->
-    <!--    </div>-->
-    <!-- 3 -->
-    <!--    <div class="step flex">-->
-    <!--      <div-->
-    <!--        class="cricle cc"-->
-    <!--        :class="'cricle' + ' ' + (status >=2 ? 'speed-bg-color' : '')"-->
-    <!--      >-->
-    <!--        <span class="num">3</span>-->
-    <!--      </div>-->
-    <!--      <div-->
-    <!--        :class="'step_title' + ' ' + (status >=2 ? 'speed-text-color' : '')"-->
-    <!--      >-->
-    <!--        填写报名资料-->
-    <!--      </div>-->
-    <!--      <img src="../assets/img/signUp/left.png" alt=""/>-->
-    <!--    </div>-->
-    <!-- 4 -->
-    <!--    <div class="step flex">-->
-    <!--      <div-->
-    <!--        class="cricle cc"-->
-    <!--        :class="'cricle' + ' ' + (status >=3 ? 'speed-bg-color' : '')"-->
-    <!--      >-->
-    <!--        <span class="num">4</span>-->
-    <!--      </div>-->
-    <!--      <div :class="'step_title' + ' ' + (status >=3? 'speed-text-color' : '')">-->
-    <!--        报名资料审核-->
-    <!--      </div>-->
-    <!--      <img src="../assets/img/signUp/left.png" alt=""/>-->
-    <!--    </div>-->
-    <!-- 5 -->
-    <!--    <div class="step flex">-->
-    <!--      <div-->
-    <!--        class="cricle cc"-->
-    <!--        :class="'cricle' + ' ' + (status >= 4 ? 'speed-bg-color' : '')"-->
-    <!--      >-->
-    <!--        <span class="num">5</span>-->
-    <!--      </div>-->
-    <!--      <div :class="'step_title' + ' ' + (status >= 4 ? 'speed-text-color' : '')">-->
-    <!--        缴费-->
-    <!--      </div>-->
-    <!--    </div>-->
   </div>
 </template>
 
@@ -174,41 +105,36 @@ export default {
   color: var(--color) !important;
 }
 
-.steps {
-  .step {
-    align-items: center;
-  }
-
-  .num {
-    color: #ffff;
-    position: absolute;
-    z-index: 999;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-  }
-
-  .cricle {
-    position: relative;
-    width: 57px;
-    height: 29px;
+  .steps {
+    .step {
+      align-items: center;
+      .cricle {
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        color: #ffff;
+        background: #d0ced0;
+        border-radius: 15px;
+        margin-right: 10px;
+        font-size: 14px;
+        font-family: PingFang SC;
+      }
 
-    background: #d0ced0;
-    border-radius: 41px;
-    // margin-right: 10px;
-  }
+      .step_title {
+        flex: 1;
+        font-size: 14px;
+        height: 20px;
+        font-weight: 600;
+        color: #d0ced0;
+        line-height: 20px;
+        font-family: PingFang SC;
+      }
 
-  img {
-    margin: 15px;
+      .img {
+        margin: 0 15px 0 10px;
+      }
+    }
   }
 
-  .step_title {
-    font-size: 14px;
-    width: 100%;
-    height: 20px;
-    font-weight: 600;
-    color: #d0ced0;
-    margin-left: 5px;
-  }
-}
 </style>

src/components/index/SignUp/confirm.vue

@@ -39,7 +39,7 @@ export default {
     };
   },
   created() {
-   
+
   },
   methods: {
     next() {
@@ -50,7 +50,7 @@ export default {
           this.$emit("getstatus", res.data.status);
         this.$message.success(res.data.message);
         this.$router.push("/signUp/invitation");
-      
+
       });
     },
   },
@@ -60,7 +60,7 @@ export default {
 <style  lang="scss" scoped>
 @import "a/scss/btn";
 .confirm {
-  padding: 0 56px 65px 56px;
+  padding: 0 50px 60px;
   .line {
     border-bottom: 1px solid #d4d0d4;
   }
@@ -83,6 +83,6 @@ export default {
     text-align: center;
     margin-top: 42px;
   }
- 
+
 }
 </style>

src/views/index/camp/Index.vue

@@ -169,15 +169,10 @@ export default {
     display: flex;
     flex-flow: row;
 
-    .camp_left {
-      position: relative;
-      width: 24%;
-      max-width: 280px;
-      min-width: 200px;
-      border-radius: 8px;
-      margin-right: 24px;
-
-      .camp_left_box {
+   
+      .camp_left {
+        position: relative;
+        width: 22%;
         max-width: 280px;
         min-width: 200px;
         height: 300px;
@@ -219,7 +214,7 @@ export default {
           &:hover {
             cursor: pointer;
             background-color: #f8f8f8;
-          }
+      
         }
       }
     }