营地2.0-修改getDownLoadTeacherWork

src/assets/scss/active/activeList.scss

@@ -112,7 +112,7 @@
 
             > span {
               padding: 5px 10px;
-              border-radius: 8px;
+              border-radius: 13px;
               color: #ffffff;
               background-color: var(--all_color);
               margin-right: 5px;

src/components/Footer.vue

@@ -22,12 +22,8 @@
         </div>
         <div class="contact_qr">
           <div class="contact_qr_item">
-            <img src="../assets/img/footer/qr_1.png"/>
-            <div class="name">大中衔接人才培养</div>
-          </div>
-          <div class="contact_qr_item">
-            <img src="../assets/img/footer/qr_2.png"/>
-            <div class="name">大中贯通人才培养</div>
+            <img src="../assets/img/footer/qr_1.jpg"/>
+            <div class="name">CAMP CENTER公众号</div>
           </div>
         </div>
       </div>

src/components/Header.vue

@@ -203,7 +203,7 @@
 
       .image{
         img {
-          height: 40px;
+          height: 30px;
           cursor: pointer;
           vertical-align: top;
         }

src/components/base/myInfo/campList.vue

@@ -84,40 +84,15 @@
   .campList {
     margin: 20px 0;
 
-    ::v-deep .el-card {
-      cursor: pointer;
-
-      .el-image {
-        width: 100%;
-        height: 100%;
-        border-radius: 4px;
-        transition: all .5s;
-        -webkit-transition: all .5s;
-
-        .el-image__error {
-          background-color: #D8D8D8;
-        }
-      }
-
-      &:hover {
-        box-shadow: 6px 6px 15px rgba(0, 0, 0, 0.1);
-
-        .el-image {
-          transform: scale(1.1);
-          -ms-transform: scale(1.1); /* IE 9 */
-          -moz-transform: scale(1.1); /* Firefox */
-          -webkit-transform: scale(1.1); /* Safari 和 Chrome */
-          -o-transform: scale(1.1);
-        }
-      }
-    }
-
     .list_item {
       display: flex;
       flex-flow: row;
 
       .item_img {
         width: 30%;
+        height: 9.8vw;
+        min-height: 114px;
+        max-height: 198px;
         margin-right: 10%;
         overflow: hidden;
       }
@@ -143,11 +118,11 @@
 
           .sign {
             display: inline-block;
-            padding: 0 10px;
-            border-radius: 4px;
+            padding: 0 14px;
+            border-radius: 13px;
             background-color: #eeeeee;
             margin: 5px 10px 5px 0;
-            line-height: 25px;
+            line-height: 26px;
 
             &:last-child {
               margin-right: 0;
@@ -161,6 +136,33 @@
         }
       }
     }
+    ::v-deep .el-card {
+      cursor: pointer;
+
+      .el-image {
+        width: 100%;
+        height: 100%;
+        border-radius: 4px;
+        transition: all .5s;
+        -webkit-transition: all .5s;
+
+        .el-image__error {
+          background-color: #D8D8D8;
+        }
+      }
+
+      &:hover {
+        box-shadow: 6px 6px 15px rgba(0, 0, 0, 0.1);
+
+        .el-image {
+          transform: scale(1.1);
+          -ms-transform: scale(1.1); /* IE 9 */
+          -moz-transform: scale(1.1); /* Firefox */
+          -webkit-transform: scale(1.1); /* Safari 和 Chrome */
+          -o-transform: scale(1.1);
+        }
+      }
+    }
   }
 
   .noCamp {

src/views/base/active/ActiveInfo.vue

@@ -51,7 +51,10 @@
             </el-tooltip>
           </div>
         </div>
-        <div>
+        <div class="btn-area" v-if="(activeInfo.status==1)||
+(activeInfo.status==2 && activeInfo.source==2)||
+(activeInfo.status==3 || activeInfo.status==4)||
+(activeInfo.status==5)">
           <el-button v-if="activeInfo.status==1" :disabled="true">报名未开放</el-button>
           <el-button v-if="activeInfo.status==2 && activeInfo.source==2" @click="signUp">立即报名</el-button>
           <el-button v-if="activeInfo.status==3 || activeInfo.status==4" :disabled="true">报名已截止</el-button>
@@ -208,7 +211,7 @@
         anchorList: [],
         anchorList2: [],
         activeContent: 1,
-        minHeight: '339',
+        minHeight: '318',
       }
     },
     created() {
@@ -385,11 +388,12 @@
           display: flex;
           flex-flow: row;
           align-items: center;
+          margin-bottom: 10px;
 
           .label {
-            font-size: 16px;
-            padding: 0 10px;
-            border-radius: 8px;
+            font-size: 14px;
+            padding: 0 14px;
+            border-radius: 14px;
             color: #ffffff;
             background-color: var(--all_color);
             margin-right: 15px;
@@ -404,8 +408,8 @@
         }
 
         .active-info-cont-txt1 {
-          font-size: 16px;
-          line-height: 32px;
+          font-size: 14px;
+          line-height: 28px;
 
           .sign-box {
             display: inline-block;
@@ -417,8 +421,8 @@
 
             .sign {
               display: inline-block;
-              padding: 0 10px;
-              border-radius: 4px;
+              padding: 0 14px;
+              border-radius: 14px;
               background-color: #eeeeee;
               margin: 5px 10px 5px 0;
 
@@ -431,13 +435,13 @@
         }
 
         .active-info-cont-txt2 {
-          font-size: 16px;
+          font-size: 14px;
           color: #999999;
           line-height: 24px;
         }
 
         .active-info-cont-txt3 {
-          font-size: 16px;
+          font-size: 14px;
           color: #EC808D;
           line-height: 32px;
           display: flex;
@@ -452,6 +456,8 @@
           }
         }
 
+        .btn-area{
+          margin-top: 10px;
           .el-button {
           width: 150px;
           height: 40px;
@@ -472,6 +478,8 @@
           }
         }
         }
+
+      }
     }
 
     .active-area {
@@ -537,7 +545,7 @@
 
         .center-area-title {
           text-align: center;
-          font-size: 22px;
+          font-size: 18px;
           font-weight: 500;
           height: 50px;
           padding: 10px 20px 0;
@@ -568,7 +576,7 @@
 
         .center-area-cont {
           padding: 20px 30px;
-          min-height: 238px;
+          min-height: 218px;
         }
       }
 
@@ -580,7 +588,7 @@
 
           .question-area-title {
             text-align: center;
-            font-size: 22px;
+            font-size: 18px;
             font-weight: 500;
             line-height: 50px;
             padding: 10px 20px 0;
@@ -609,8 +617,8 @@
             }
 
             .question-email {
-              font-size: 14px;
-              line-height: 30px;
+              font-size: 12px;
+              line-height: 20px;
               margin-top: 20px;
             }
           }

src/views/base/home/Home.vue

@@ -254,7 +254,7 @@
           border-color: transparent transparent #ffffff;
         }
         .search_input {
-          font-size: 20px;
+          font-size: 18px;
           color: #AFAFAF;
           background-color: #fff;
           height: 54px;
@@ -268,7 +268,7 @@
         }
 
         i {
-          font-size: 26px;
+          font-size: 20px;
           font-weight: bold;
           color: #AFAFB0;
         }

src/views/base/myInfo/signUp.vue

@@ -72,7 +72,7 @@
       }
 
       .el-tabs__item {
-        font-size: 18px;
+        font-size: 16px;
 
         &:hover,
         &.is-active {

src/views/index/camp/Index.vue

@@ -317,10 +317,9 @@
             position: absolute;
             left: 10px;
             top: 10px;
-            color: #12141c;
-            font-size: 18px;
+            color: #666666;
+            font-size: 14px;
             line-height: 32px;
-            font-weight: bold;
             &:hover {
               color: var(--color);
               cursor: pointer;
@@ -328,8 +327,7 @@
 
             .el-icon-arrow-left {
               vertical-align: middle;
-              font-size: 28px;
-              font-weight: bold;
+              font-size: 18px;
             }
 
           }