Merge branch 'master' into luohl

src/pages/zhjy/index.vue

@@ -251,7 +251,7 @@ export default {
             text-align: left;
             color: #050026;
             line-height: 22px;
-            margin: 25px 14px 5px 12px;
+            margin: 25px 14px 0 12px;
           }
           p:last-of-type {
             display: inline-block;
@@ -261,7 +261,7 @@ export default {
             text-align: left;
             color: #949494;
             line-height: 20px;
-            margin: 0px 14px 5px 12px;
+            margin: 0px 14px 15px 12px;
           }
         }
       }

src/pages/zhjy/zhjytbjy/index.vue

@@ -21,14 +21,15 @@
           <el-tab-pane label="二年级" name="d"></el-tab-pane>
           <el-tab-pane label="三年级" name="e"></el-tab-pane>
           <el-tab-pane label="四年级" name="f"></el-tab-pane>
-          <el-tab-pane label="五年级" name="third"></el-tab-pane>
-          <el-tab-pane label="六年级" name="g"></el-tab-pane>
-          <el-tab-pane label="初一" name="h"></el-tab-pane>
-          <el-tab-pane label="初二" name="i"></el-tab-pane>
-          <el-tab-pane label="初三" name="g"></el-tab-pane>
-          <el-tab-pane label="高一" name="k"></el-tab-pane>
-          <el-tab-pane label="高二" name="l"></el-tab-pane>
-          <el-tab-pane label="高三" name="m"></el-tab-pane>
+          <el-tab-pane label="五年级" name="g"></el-tab-pane>
+          <el-tab-pane label="六年级" name="h"></el-tab-pane>
+          <el-tab-pane label="初一" name="i"></el-tab-pane>
+          <el-tab-pane label="初二" name="j"></el-tab-pane>
+          <el-tab-pane label="初三" name="k"></el-tab-pane>
+          <el-tab-pane label="高一" name="l"></el-tab-pane>
+          <el-tab-pane label="高二" name="m"></el-tab-pane>
+          <el-tab-pane label="高三" name="n"></el-tab-pane>
+          <el-tab-pane label="其他" name="o"></el-tab-pane>
         </el-tabs>
       </div>
 
@@ -47,31 +48,52 @@
 
     <div class="list-right">
       <div>
-        <img src="@/assets/img/zhjy/img_1.png" alt="" />
+        <img src="@/assets/img/zhjy/img_11.png" alt="" />
         <div>
-          <p>五育并举的学校课程体系建设与实施</p>
-          <p>
-            溯源学校制定课程规划的初衷，合理规划学校课程，通过培训促使教师参与课程规划，并编制三年整体的教学计划，明确课程实施的重点难点，
-          </p>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
         </div>
       </div>
-
       <div>
         <img src="@/assets/img/zhjy/img_2.png" alt="" />
         <div>
-          <p>信息技术与学科教学的深度融合</p>
-          <p>
-            溯源学校制定课程规划的初衷，合理规划学校课程，通过培训促使教师参与课程规划，并编制三年整体的教学计划，明确课程实施的重点难点，
-          </p>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
         </div>
       </div>
       <div>
+        <img src="@/assets/img/zhjy/img_1.png" alt="" />
+        <div>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
+        </div>
+      </div>
+      <div>
+        <img src="@/assets/img/zhjy/img_7.png" alt="" />
+        <div>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
+        </div>
+      </div>
+
+      <div>
         <img src="@/assets/img/zhjy/img_3.png" alt="" />
         <div>
-          <p>五育并举的学校课程体系建设与实施</p>
-          <p>
-            溯源学校制定课程规划的初衷，合理规划学校课程，通过培训促使教师参与课程规划，并编制三年整体的教学计划，明确课程实施的重点难点，
-          </p>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
+        </div>
+      </div>
+      <div>
+        <img src="@/assets/img/zhjy/img_8.png" alt="" />
+        <div>
+          <p>走进生肖文化——寅虎卯兔</p>
+          <p>领略生肖传奇，品味传统文化！</p>
+          <div><img src="@/assets/img/zhjy/img_3.png" alt="" />尚老师</div>
         </div>
       </div>
     </div>
@@ -101,7 +123,6 @@ export default {
 }
 .title {
   width: 1280px;
-
   height: 55px;
   line-height: 55px;
   font-size: 18px;
@@ -118,7 +139,7 @@ export default {
     text-align: left;
     color: #949494;
     line-height: 20px;
-    margin-left: 10px;
+    margin-left: 30px;
   }
   span:last-of-type {
     width: 56px;
@@ -172,7 +193,7 @@ export default {
       position: absolute;
       top: 11px;
       right: 10px;
-      background-image: url("@/assets/img/zhjyzxxx/搜索.png");
+      background-image: url("@/assets/img/zhjyzxxx/search.png");
       background-size: 60%;
       background-position: center;
       background-repeat: no-repeat;
@@ -184,9 +205,9 @@ export default {
   margin: 0 auto;
   display: flex;
   flex-direction: column;
+  margin-bottom: 50px;
   div {
     display: flex;
-
     span {
       padding-top: 10px;
       display: inline-block;
@@ -202,24 +223,26 @@ export default {
   }
 }
 .list-right {
-  width: 654px;
-  height: 381px;
-  margin-left: 10px;
-
+  width: 1280px;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 auto;
   div {
+    width: 50%;
+    height: 150px;
     display: flex;
-    justify-content: space-between;
+    margin-bottom: 20px;
     img {
-      width: 204px;
-      height: 120px;
-      display: inline-block;
-      box-sizing: border-box;
-      margin-bottom: 10px;
+      height: 150px;
+      margin-right: 12px;
     }
-
-    div {
+    & > div {
+      display: inline-block;
       display: flex;
       flex-direction: column;
+
+      margin-top: 10px;
+      position: relative;
       p:first-of-type {
         display: inline-block;
         vertical-align: top;
@@ -229,7 +252,6 @@ export default {
         text-align: left;
         color: #050026;
         line-height: 22px;
-        margin: 25px 14px 5px 12px;
       }
       p:last-of-type {
         display: inline-block;
@@ -239,7 +261,25 @@ export default {
         text-align: left;
         color: #949494;
         line-height: 20px;
-        margin: 0px 14px 5px 12px;
+      }
+      div {
+        width: 186px;
+        height: 20px;
+        display: inline-block;
+        font-size: 14px;
+        font-family: PingFangSC, PingFangSC-Medium;
+        font-weight: 500;
+        text-align: left;
+        color: #050026;
+        line-height: 20px;
+        margin-top: 60px;
+        img {
+          display: inline-block;
+          width: 24px;
+          height: 24px;
+          border-radius: 50%;
+          margin-right: 8px;
+        }
       }
     }
   }

src/pages/zhjy/zhjyxtbk/index.vue

@@ -21,14 +21,16 @@
           <el-tab-pane label="二年级" name="d"></el-tab-pane>
           <el-tab-pane label="三年级" name="e"></el-tab-pane>
           <el-tab-pane label="四年级" name="f"></el-tab-pane>
-          <el-tab-pane label="五年级" name="third"></el-tab-pane>
-          <el-tab-pane label="六年级" name="g"></el-tab-pane>
-          <el-tab-pane label="初一" name="h"></el-tab-pane>
-          <el-tab-pane label="初二" name="i"></el-tab-pane>
-          <el-tab-pane label="初三" name="g"></el-tab-pane>
-          <el-tab-pane label="高一" name="k"></el-tab-pane>
-          <el-tab-pane label="高二" name="l"></el-tab-pane>
-          <el-tab-pane label="高三" name="m"></el-tab-pane>
+           <el-tab-pane label="五年级" name="g"></el-tab-pane>
+          <el-tab-pane label="六年级" name="h"></el-tab-pane>
+          <el-tab-pane label="初一" name="i"></el-tab-pane>
+          <el-tab-pane label="初二" name="j"></el-tab-pane>
+          <el-tab-pane label="初三" name="k"></el-tab-pane>
+          <el-tab-pane label="高一" name="l"></el-tab-pane>
+          <el-tab-pane label="高二" name="m"></el-tab-pane>
+          <el-tab-pane label="高三" name="n"></el-tab-pane>
+          <el-tab-pane label="其他" name="o"></el-tab-pane>
+
         </el-tabs>
       </div>
 
@@ -154,7 +156,7 @@ export default {
     text-align: left;
     color: #949494;
     line-height: 20px;
-    margin-left: 10px;
+  margin-left: 30px;
   }
   span:last-of-type {
     width: 56px;

src/pages/zhjy/zhjyzxxx/index.vue

@@ -21,14 +21,15 @@
           <el-tab-pane label="二年级" name="d"></el-tab-pane>
           <el-tab-pane label="三年级" name="e"></el-tab-pane>
           <el-tab-pane label="四年级" name="f"></el-tab-pane>
-          <el-tab-pane label="五年级" name="third"></el-tab-pane>
-          <el-tab-pane label="六年级" name="g"></el-tab-pane>
-          <el-tab-pane label="初一" name="h"></el-tab-pane>
-          <el-tab-pane label="初二" name="i"></el-tab-pane>
-          <el-tab-pane label="初三" name="g"></el-tab-pane>
-          <el-tab-pane label="高一" name="k"></el-tab-pane>
-          <el-tab-pane label="高二" name="l"></el-tab-pane>
-          <el-tab-pane label="高三" name="m"></el-tab-pane>
+          <el-tab-pane label="五年级" name="g"></el-tab-pane>
+          <el-tab-pane label="六年级" name="h"></el-tab-pane>
+          <el-tab-pane label="初一" name="i"></el-tab-pane>
+          <el-tab-pane label="初二" name="j"></el-tab-pane>
+          <el-tab-pane label="初三" name="k"></el-tab-pane>
+          <el-tab-pane label="高一" name="l"></el-tab-pane>
+          <el-tab-pane label="高二" name="m"></el-tab-pane>
+          <el-tab-pane label="高三" name="n"></el-tab-pane>
+          <el-tab-pane label="其他" name="o"></el-tab-pane>
         </el-tabs>
       </div>
 
@@ -48,11 +49,7 @@
     <div class="ysgc-kind">
       <ul class="specail">
         <li class="kc" v-for="kc in 4" :key="kc">
-          <img
-            class="kc-back"
-            src="@/assets/img/zhjyzxxx/img_3.png"
-            alt=""
-          />
+          <img class="kc-back" src="@/assets/img/zhjyzxxx/img_3.png" alt="" />
           <div class="kc-des">
             <p class="kc-name">安徒生世界插画</p>
             <div class="rate">
@@ -74,11 +71,7 @@
     <div class="ysgc-kind">
       <ul class="specail">
         <li class="kc" v-for="kc in 4" :key="kc">
-          <img
-            class="kc-back"
-            src="@/assets/img/zhjyzxxx/img_4.png"
-            alt=""
-          />
+          <img class="kc-back" src="@/assets/img/zhjyzxxx/img_4.png" alt="" />
           <div class="kc-des">
             <p class="kc-name">安徒生世界插画</p>
             <div class="rate">
@@ -100,11 +93,7 @@
     <div class="ysgc-kind">
       <ul class="specail">
         <li class="kc" v-for="kc in 4" :key="kc">
-          <img
-            class="kc-back"
-            src="@/assets/img/zhjyzxxx/img_5.png"
-            alt=""
-          />
+          <img class="kc-back" src="@/assets/img/zhjyzxxx/img_5.png" alt="" />
           <div class="kc-des">
             <p class="kc-name">安徒生世界插画</p>
             <div class="rate">
@@ -166,7 +155,7 @@ export default {
     text-align: left;
     color: #949494;
     line-height: 20px;
-    margin-left: 10px;
+    margin-left: 30px;
   }
   span:last-of-type {
     width: 56px;