lex-xin 3 anni fa
parent
commit
b9c4bc4337

+ 20 - 1
src/components/Search.vue

@@ -37,6 +37,7 @@ export default {
     display: flex;
     align-items: center;
     padding: 0 12px;
+
     /deep/.van-search {
         flex: 1;
         background-color: #fff !important;
@@ -60,7 +61,7 @@ export default {
     /deep/.van-search__action {
         color: @tFontColor;
         background-color: #f5f5f5;
-
+        padding: 0 5px;
     }
     /deep/.van-search__content {
         background-color: #f5f5f5;
@@ -77,5 +78,23 @@ export default {
         border-radius: 15px;
     }
 }
+input::-webkit-input-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
+
+input:-moz-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
+
+input::-moz-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
 
+input:-ms-input-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
 </style>

+ 8 - 6
src/views/trainStatistics/index.vue

@@ -20,7 +20,7 @@
             :immediate-check="false"
             @load="getList"
         >
-            <van-cell-group class="data-content" v-for="(item, index) in list" :key="index" @click="onHref(item)">
+            <van-cell-group class="data-content" :border="false" v-for="(item, index) in list" :key="index" @click="onHref(item)">
                 <van-cell style="padding: 16px 12px;" :center="true">
                     <template #title>
                         <div class="teacher_info">
@@ -29,7 +29,7 @@
                             <p style="color: #1a1a1a; font-size: .14rem;">{{ item.username }}</p>
                         </div>
                     </template>
-                    <p style="font-size: 14px; color: #808080;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.musicGroupName }}</p>
+                    <p style="font-size: 14px; color: #333;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.musicGroupName }}</p>
                 </van-cell>
                 <van-cell is-link :clickable="false" center style="padding: 12px 12px 16px">
                     <template #title>
@@ -41,10 +41,10 @@
                                 <template #icon><span style="color: #01C1B5">{{ item.trainNum }}次</span></template>
                             </van-grid-item>
                             <van-grid-item text="训练天数">
-                                <template #icon><span style="color: #01C1B5">{{ item.trainDay }}天</span></template>
+                                <template #icon><span style="color: #FF802C">{{ item.trainDay }}天</span></template>
                             </van-grid-item>
                             <van-grid-item text="评测次数">
-                                <template #icon><span style="color: #FF802C">{{ item.recordNum }}次</span></template>
+                                <template #icon><span style="color: #F79C00">{{ item.recordNum }}次</span></template>
                             </van-grid-item>
                         </van-grid>
                     </template>
@@ -188,7 +188,7 @@ export default {
 }
 
 .data-content {
-    margin: .15rem .15rem 0;
+    margin: .1rem .15rem 0;
     border-radius: .1rem;
     overflow: hidden;
     .logo {
@@ -212,10 +212,12 @@ export default {
     }
     /deep/.van-grid-item__icon-wrapper {
         font-size: .15rem;
+        font-weight: 500;
         color: #000;
     }
     /deep/.van-grid-item__text {
-        font-size: .14rem;
+        padding-top: .03rem;
+        font-size: .12rem;
         color: #808080;
     }
     .teacher_info {

+ 11 - 8
src/views/trainStatistics/trainDetail.vue

@@ -61,7 +61,7 @@
             finished-text="- 没有更多内容 -"
             :immediate-check="false"
             @load="getList()">
-            <van-cell-group class="data-content" v-for="(item, index) in dataList" :key="index" @click="showDetail(item)">
+            <van-cell-group class="data-content" :border="false" v-for="(item, index) in dataList" :key="index" @click="showDetail(item)">
                 <van-cell style="padding: 16px 12px; 12px" :center="true" title-style="flex-basis: 45%;">
                     <template #title>
                         <span style="font-size: .17rem; color:#333333; font-weight: 500; padding-right: .05rem;padding-bottom: .05rem;">{{ item.sysMusicScoreName }}</span>
@@ -83,10 +83,10 @@
                                 <template #icon><span style="color: #01C1B5">{{ item.intonation }}分</span></template>
                             </van-grid-item>
                             <van-grid-item text="节奏" class="van-hairline--right">
-                                <template #icon><span style="color: #01C1B5">{{ item.cadence }}分</span></template>
+                                <template #icon><span style="color: #FF802C">{{ item.cadence }}分</span></template>
                             </van-grid-item>
                             <van-grid-item text="完成度">
-                                <template #icon><span style="color: #FF802C">{{ item.integrity }}分</span></template>
+                                <template #icon><span style="color: #F79C00">{{ item.integrity }}分</span></template>
                             </van-grid-item>
                         </van-grid>
                     </template>
@@ -310,10 +310,12 @@ export default {
     }
     /deep/.van-grid-item__icon-wrapper {
         font-size: .15rem;
+        font-weight: 500;
         color: #000;
     }
     /deep/.van-grid-item__text {
-        font-size: .14rem;
+        padding-top: .03rem;
+        font-size: .12rem;
         color: #808080;
     }
     .teacher_info {
@@ -335,14 +337,15 @@ export default {
     }
 }
 .dataSearch {
-    padding: .12rem;
+    padding: .12rem .12rem .05rem;
     background-color: #F5F5F5;
     /deep/.van-cell {
         background: #fff;
-        padding: .05rem .16rem;
+        padding: .0rem .16rem;
         border-radius: 1rem;
         overflow: hidden;
-        height: .34rem;
+        height: .27rem;
+        line-height: .27rem;
     }
     /deep/.van-cell__value--alone {
         text-align: center;
@@ -356,7 +359,7 @@ export default {
         background: #01C1B5;
         font-size: 14px;
         color: #fff;
-        padding: 4px 9px;
+        padding: 3px 9px;
         border-radius: 15px;
     }
 }

+ 13 - 7
src/views/trainStatistics/trainModel.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="trainModel">
         <div class="visit-tips" v-show="activeType == 'visited'">
-            <span>学员上周训练时间不足80分钟或训练次数小于4次则需要回访</span>
+            <span>上周训练时长不足80分钟或训练次数小于4次的学员<br />
+            需在每周三24:00前完成回访</span>
         </div>
         <search @onSearch="onSearch" placeholder="学生姓名或手机号">
             <template #left>
@@ -16,28 +17,28 @@
             <van-col span="6" class="title-style" @click="onSort(0)">
                 训练时长
                 <div>
-                    <i class="box box-up" :class="{'active': searchArray[0] == 'ASC'}" style="margin-bottom: .02rem;"></i>
+                    <i class="box box-up" :class="{'active': searchArray[0] == 'ASC'}" style="margin-bottom: .03rem;"></i>
                     <i class="box box-down" :class="{'active': searchArray[0] == 'DESC'}"></i>
                 </div>
             </van-col>
             <van-col span="6" class="title-style" @click="onSort(1)">
                 训练次数
                 <div>
-                    <i class="box box-up" :class="{'active': searchArray[1] == 'ASC'}" style="margin-bottom: .02rem;"></i>
+                    <i class="box box-up" :class="{'active': searchArray[1] == 'ASC'}" style="margin-bottom: .03rem;"></i>
                     <i class="box box-down" :class="{'active': searchArray[1] == 'DESC'}"></i>
                 </div>
             </van-col>
             <van-col span="6" class="title-style" @click="onSort(2)">
                 训练天数
                 <div>
-                    <i class="box box-up" :class="{'active': searchArray[2] == 'ASC'}" style="margin-bottom: .02rem;"></i>
+                    <i class="box box-up" :class="{'active': searchArray[2] == 'ASC'}" style="margin-bottom: .03rem;"></i>
                     <i class="box box-down" :class="{'active': searchArray[2] == 'DESC'}"></i>
                 </div>
             </van-col>
             <van-col span="6" class="title-style" @click="onSort(3)">
                 评测次数
                 <div>
-                    <i class="box box-up" :class="{'active': searchArray[3] == 'ASC'}" style="margin-bottom: .02rem;"></i>
+                    <i class="box box-up" :class="{'active': searchArray[3] == 'ASC'}" style="margin-bottom: .03rem;"></i>
                     <i class="box box-down" :class="{'active': searchArray[3] == 'DESC'}"></i>
                 </div>
             </van-col>
@@ -225,20 +226,25 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.van-dropdown-menu__title::after {
+    border-color: transparent transparent #01C1B5 #01C1B5;
+}
 .calendarColor {
     color: #333;
     font-size: .14rem;
 }
 .visit-tips {
     background-color: #fff;
-    padding: 10px 10px 0;
+    // padding: 10px 10px 0;
+    padding: 10px 12px 0;
     text-align: center;
     span {
-        display: inline-block;
+        display: block;
         padding: 6px 12px;
         background-color: #FFF6DE;
         font-size: 12px;
         color: #FF802C;
+        text-align: left;
     }
 }
 .searchArray {