Merge branch 'LaoMo' into test

src/assets/commonLess/variable.less

@@ -34,8 +34,18 @@
   color: #c0c0c0;
 }
 
-.van-dropdown-menu__title--down::after {
-  border-color: transparent transparent @mColor @mColor;
+.van-dropdown-menu__title--down {
+  &::after{border-color: transparent transparent @mColor @mColor;}
+  
+}
+/deep/.van-dropdown-menu__title {
+  font-size: 0.17rem;
+  color: #1a1a1a;
+  line-height: inherit;
+  height: auto;
+  &::after{
+    border-color: transparent transparent @mColor @mColor;
+  }
 }
 /deep/ .van-rate__item:not(:last-child) {
   padding-right: .15rem;

src/components/MCalendar.vue

@@ -3,8 +3,10 @@
         <div class="c__hd">
             <div class="c__date" @click="onToggleType">{{ curDays.year }}年<span>{{ curDays.month.toString().length >= 2 ? curDays.month : '0' + curDays.month }}月</span></div>
             <div class="c__change" v-if="calendarType !== 'small'">
-                <van-icon @touchstart.stop.prevent="slidePrev" name="arrow-left" />
-                <van-icon @touchstart.stop.prevent="slideNext" name="arrow" />
+                <!-- <van-icon  name="arrow-left" />
+                <van-icon name="arrow" /> -->
+                <img :src="imgs.arrow1" alt="" @touchstart.stop.prevent="slidePrev"  @touchend.stop.prevent="endTouch" class="arrow arrow-left">
+                 <img :src="imgs.arrow2" alt=""  @touchstart.stop.prevent="slideNext" @touchend.stop.prevent="endTouch" class="arrow">
             </div>
         </div>
         <div class="week-title">
@@ -94,6 +96,10 @@ export default {
                 endY: 0
             },
             selectElement: null, // 选中的元素 根据日期来判断是否一致
+            imgs:{
+                arrow1:require('@/assets/images/arrow.png'),
+                arrow2: require('@/assets/images/arrow.png')
+            }
         }
     },
     methods: {
@@ -276,10 +282,18 @@ export default {
             this.$emit('onChangeMonth', checkDate)
         },
         slidePrev() { // 上一页
+         this.imgs.arrow1 = require('@/assets/images/arrow-active.png')
             this.swiper.slidePrev()
         },
         slideNext() { // 下一页
+            this.imgs.arrow2 =require('@/assets/images/arrow-active.png')
             this.swiper.slideNext()
+     
+        },
+        endTouch(){
+            this.imgs.arrow1 = require('@/assets/images/arrow.png')
+            this.imgs.arrow2 = require('@/assets/images/arrow.png')
+
         },
         touchStart() { 
             let touch = event.touches[0]
@@ -542,5 +556,14 @@ export default {
     .swiper-slide {
         transition: all .5s ease;
     }
+    .arrow {
+        width: .22rem;
+        height: .22rem;
+
+    }
+    .arrow-left {
+        transform: rotate(180deg);
+        margin-right: .12rem;
+    }
 }
 </style>

src/views/audition/ManageEvaluation.vue

@@ -5,24 +5,24 @@
       <div class="searchDate">
         <div class="date startDate" @click="dateSection.status = true">
           开始
-          <span>{{ dateSection.showStartDate }}</span>
+          <span class="squrt">{{ dateSection.showStartDate }}</span>
         </div>
         -
         <div class="date endDate" @click="dateEndSection.status = true">
           结束
-          <span>{{ dateEndSection.showEndDate }}</span>
+          <span class="squrt">{{ dateEndSection.showEndDate }}</span>
         </div>
       </div>
       <!-- <div class="searchMore">
                 筛选<i class="arrowDown"></i>
       </div>-->
-      <van-dropdown-menu active-color="#01C1B5">
-       <div class="susqurt">|</div>
+      <van-dropdown-menu>
+        <div class="susqurt">|</div>
         <van-dropdown-item title="筛选" ref="item" v-model="search.status">
           <div class="dropList">
             <div class="dropItem">
               <p class="dropTitle">课程类型</p>
-              <div class="radioGroup" id='courseType'>
+              <div class="radioGroup" id="courseType">
                 <span
                   :class="search.type == 'PRACTICE' ? 'actived' : ''"
                   @click="search.type = 'PRACTICE'"
@@ -393,7 +393,6 @@ export default {
         COMM: this.iconList.wIcon,
       };
 
-      
       return obj[type] || this.iconList.vIcon;
     },
   },
@@ -423,7 +422,7 @@ export default {
   margin-bottom: 0.12rem;
   padding: 0.1rem 0.16rem;
   align-items: center;
-
+  height: 50px;
   .searchDate {
     display: flex;
     align-items: center;
@@ -436,16 +435,30 @@ export default {
       margin-left: 0.05rem;
     }
     .date {
-      background-color: #F5F5F5;
-      padding: 0.02rem 0.06rem;
+      background-color: #f5f5f5;
+      padding: 0.02rem 0.15rem;
       // border: 1px solid #e5e5e5;
-      border-radius: .12rem;
+      border-radius: 0.12rem;
       font-size: 0.14rem;
       color: #999999;
+
       span {
         padding-left: 0.04rem;
         font-size: 0.15rem;
         color: #666666;
+        position: relative;
+        &::after {
+          position: absolute;
+          top: 50%;
+          right: -10px;
+          margin-top: -5px;
+          border: 3px solid;
+          border-color: transparent transparent @mColor @mColor;
+          -webkit-transform: rotate(-45deg);
+          transform: rotate(-45deg);
+          opacity: 0.8;
+          content: "";
+        }
       }
     }
   }
@@ -457,8 +470,10 @@ export default {
   /deep/.van-dropdown-menu__title {
     font-size: 0.17rem;
     color: #1a1a1a;
-    line-height: inherit;
     height: auto;
+    &::after{
+      border-color: transparent transparent @mColor @mColor;
+    }
   }
 
   .btnGroup {
@@ -475,7 +490,7 @@ export default {
       padding: 0.12rem 0;
     }
     .btn-reset {
-      background-color: #EEEFF3;
+      background-color: #eeeff3;
       color: @mColor;
     }
     .btn-sure {
@@ -509,7 +524,7 @@ export default {
         padding: 0.08rem 0;
         text-align: center;
         border-radius: 2px;
-         border: 1px solid #E2E0E0;
+        border: 1px solid #e2e0e0;
         &.actived {
           color: @mColor;
           // background: url("../../assets/images/audition/icon_check.png")
@@ -553,7 +568,7 @@ export default {
     }
   }
 }
-/deep/.van-cell{
+/deep/.van-cell {
   padding: 17px 16px;
 }
 /deep/.van-cell__title {
@@ -628,12 +643,10 @@ export default {
 //   color: @mColor;
 // }
 
-
 .susqurt {
   position: absolute;
-  color: #D3D3D3;
-  left: -.1rem;
-  top: .11rem;
+  color: #d3d3d3;
+  left: -5px;
+  top:11px;
 }
-
 </style>

src/views/teacher/VIP00Apply.vue

@@ -393,6 +393,7 @@
       :lock-scroll="true"
       position="bottom"
       :style="{ height: '180%' }"
+      class="studentChiose"
     >
       <van-sticky>
         <van-search
@@ -461,7 +462,7 @@
       </div>
     </van-popup>
     <!-- 课表展示 -->
-    <van-popup v-model="statusList.classTime" position="bottom">
+    <van-popup v-model="statusList.classTime" position="bottom" >
       <van-row>
         <van-col span="12">上课类型</van-col>
         <van-col span="12">上课时间</van-col>
@@ -2073,4 +2074,8 @@ export default {
 	font-size: 0.16rem; 
   }
 }
+/deep/.studentChiose {
+  border-radius: 0 0 0px 0px;
+  overflow: auto;
+}
 </style>

src/views/teacher/VIP11Apply.vue

@@ -276,6 +276,7 @@
     </van-popup>
     <!-- 选择上课学生 -->
     <van-popup
+    class="studentChiose"
       v-model="statusList.studentStatus"
       :lock-scroll="true"
       position="bottom"
@@ -1765,4 +1766,8 @@ export default {
     font-size: 0.16rem;
   }
 }
+/deep/.studentChiose {
+  border-radius: 0 0 0px 0px;
+  overflow: auto;
+}
 </style>

src/views/teacher/VIPApply.vue

@@ -39,4 +39,5 @@ export default {
 	min-height: 100vh;
 	overflow: hidden;
 }
+
 </style>

src/views/teacher/tobeReport.vue

@@ -14,7 +14,7 @@
 
       <!-- 空 -->
 
-      <MEmpty v-if="!reportList.length" msg='暂无待完成月报' :full='true'/>
+      <MEmpty v-if="!reportList.length" msg='暂无待评价月报' :full='true'/>
     </div>
   </div>
 </template>

src/views/visitManager/visitList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="visitList">
     <m-header v-if="headerStatus" />
-    <van-dropdown-menu active-color="#01C1B5" :close-on-click-outside="false">
+    <van-dropdown-menu  :close-on-click-outside="false">
       <van-dropdown-item v-model="value1" @change="onTypeChange" title="回访类型" :options="option1" />
       <van-dropdown-item
         v-model="value2"