训练营调整

application/wap/view/first/activity/activity_list.html

@@ -38,6 +38,9 @@
 {/block}
 {block name="content"}
 <div v-cloak id="app">
+    <div class="page-title">
+        训练营
+    </div>
     <div class="activity_list">
         <div class="list">
             <a v-for="(item, index) in activityList" :key="index" :href="activityDetails(item.id)" class="item">
@@ -64,8 +67,7 @@
         <div v-if="loadend" class="loaded">{{loadTitle}}</div>
         <div v-if="!activityList.length && !loading" class="nothing"></div>
     </div>
-    <quick-menu></quick-menu>
-</div>
+    {include file="public/store_menu"}
 <script>
     require(['vue', 'store', 'helper', '{__WAP_PATH}zsff/js/quick.js'], function (Vue, store, $h) {
         var app = new Vue({

application/wap/view/first/activity/index.html

@@ -27,6 +27,7 @@
 {/block}
 {block name="content"}
 <div v-cloak id="app">
+    
     <div class="activity">
         <div class="header">
             <div class="image">

application/wap/view/first/merchant/teacher_list.html

@@ -55,8 +55,9 @@
 
     .list .item {
         position: relative;
-        display: flex;
-        padding: .3rem .3rem .35rem;
+        padding: .1rem .1rem .1rem;
+        width: 33.333%;
+        float: left;
     }
 
     .list .item::before {
@@ -78,9 +79,9 @@
     }
 
     .list .image {
-        width: 1.3rem;
-        height: 1.3rem;
-        border-radius: 50%;
+        width: 100%;
+        height: 34vw;
+        border-radius: 5%;
         background-color: #9D8585;
         overflow: hidden;
     }
@@ -94,7 +95,6 @@
         flex: 1;
         display: flex;
         align-items: center;
-        margin-left: .22rem;
     }
 
     .list .text-content {
@@ -132,6 +132,8 @@
         margin-top: .1rem;
         font-size: .26rem;
         line-height: .37rem;
+        height: 1.2rem;
+        overflow: hidden;
         color: #666666;
     }
 
@@ -164,13 +166,22 @@
 {/block}
 {block name="content"}
 <div v-cloak id="app">
-    <form class="form" @submit.prevent="get_lecturer_list">
+    <!-- <form class="form" @submit.prevent="get_lecturer_list">
         <label class="label">
             <i class="iconfont iconsousuo"></i>
             <input v-model.trim="search" type="search" placeholder="输入要搜索的讲师" required class="input">
         </label>
         <i v-show="search" class="iconfont iconguanbi1" @click="search = ''"></i>
-    </form>
+    </form> -->
+    <div class="page-title">
+        师资
+    </div>
+    <div class="public_title">
+        <div class="name">
+            <div class="title-circular"></div>
+            <div class="title-text">权威师资</div>
+        </div> 
+    </div>
     <div v-if="lecturerList.length" class="list">
         <a v-for="item in lecturerList" :key="item.id" :href="'{:url('merchant/teacher_detail')}?id=' + item.id" class="item">
             <div class="image">
@@ -179,10 +190,11 @@
             <div class="text">
                 <div class="text-content">
                     <div class="name">{{ item.lecturer_name }}</div>
-                    <div class="tags">
+                    <!-- <div class="tags">
                         <div v-for="label in item.label" :key="label" class="tag">{{ label }}</div>
-                    </div>
-                    <div class="attr">{{ item.study }}人学习 | {{ item.curriculum }}课时</div>
+                        {{ item.study }}人学习 | {{ item.curriculum }}课时
+                    </div> -->
+                    <div class="attr">{{ item.explain }}</div>
                 </div>
                 <!-- <button :class="{ followed: item.is_follow }" @click.prevent="follow(item)"><i v-show="!item.is_follow"
                        class="iconfont icontianjia"></i>{{ item.is_follow ? '取消关注' : '关注' }}</button> -->

public/wap/first/zsff/css/style.css

@@ -9955,9 +9955,6 @@ input:-webkit-autofill:focus {
     font-size: .32rem;
 }
 
-.activity_list {
-    padding-top: .96rem;
-}
 
 .activity_list .nav-bar {
     position: fixed;
@@ -21473,7 +21470,8 @@ input:-webkit-autofill:focus {
 /* 讲师详情 */
 .teacher-detail {
     padding-top: 1.39rem;
-    background: url("../images/teacher-detail1.png") left top/100% 3rem no-repeat;
+    background:#191C6E;
+    /* background: url("../images/teacher-detail1.png") left top/100% 3rem no-repeat; */
     overflow: hidden;
 }
 
@@ -21664,6 +21662,7 @@ input:-webkit-autofill:focus {
 
 .teacher-detail .main {
     border-top: .14rem solid #F5F5F5;
+    background: #fff;
 }
 
 .teacher-detail .nav {
@@ -21728,6 +21727,7 @@ input:-webkit-autofill:focus {
 }
 
 .teacher-detail .panel1 {
+    background: #fff;
     padding: .4rem .3rem;
     line-height: normal;
 }
@@ -22168,6 +22168,7 @@ input:-webkit-autofill:focus {
     -o-object-fit: contain;
     object-fit: contain;
     vertical-align: middle;
+    background: #fff;
 }
 
 .teacher-detail .empty {