Merge remote-tracking branch 'origin/marywood-plus' into marywood-plus

pages/school/school3.vue

@@ -128,7 +128,11 @@
         <div class="h5-title m-t-10">课程设置</div>
         <div class="h5-course-set">
           <div class="h5-head">
-            <div @click="courseTab(0)" :class="!courseSetTab ? 'btn active' : 'btn'" style="margin:0 .42rem 0 .06rem;">
+            <div
+              @click="courseTab(0)"
+              :class="!courseSetTab ? 'btn active' : 'btn'"
+              style="margin: 0 0.42rem 0 0.06rem"
+            >
               <p>工商管理硕士</p>
               <p>Master of Business Administration</p>
             </div>
@@ -137,16 +141,14 @@
               <p>M.S. in Management Information Systems</p>
             </div>
           </div>
-        </div>
-        <!-- <div @click="courseTab(0)" :class="!courseSetTab ? 'btn active' : 'btn'">
-            <p>工商管理硕士</p>
-            <p>Master of Business Administration</p>
+          <div style="padding: 0.35rem 0.1rem">
+            <img src="https://webapp-pub.ezijing.com/project/marywood-plus/h5-curriculum1.png" />
+            <img
+              src="https://webapp-pub.ezijing.com/project/marywood-plus/h5-curriculum2.png"
+              style="margin-top: 0.43rem"
+            />
           </div>
-          <div @click="courseTab(1)" :class="courseSetTab ? 'btn active' : 'btn'">
-            <p>管理信息系统硕士</p>
-            <p>M.S. in Management Information Systems</p>
-          </div> -->
-        <!-- <img src="https://webapp-pub.ezijing.com/project/marywood/h5/school-img7.png" /> -->
+        </div>
         <div class="h5-title m-t-10">校园风光</div>
         <div class="swiper-content" @mouseenter="swiperStop" @mouseleave="swiperStart">
           <div v-swiper:mySwiper="swiperOption2" ref="mySwiper">