Kaynağa Gözat

ui改版完成

1
mo 3 yıl önce
ebeveyn
işleme
b88b2b2fcb

+ 18 - 8
src/assets/commonLess/variable.less

@@ -17,22 +17,32 @@
 // 基本背景色
 @bgColor: #F3F4F8;
 
-/deep/.van-popup {
+/deep/.van-popup--bottom {
   border-radius: .1rem .1rem 0px 0px;
   overflow: hidden;
 }
 
-/deep/.van-picker__cancel{
+/deep/.van-picker__cancel {
   color: #666;
 }
 
-/deep/.van-picker__confirm{
-  color: #00736C;
+/deep/.van-picker__confirm {
+  color: @mColor;
+}
+
+/deep/.van-list__finished-text {
+  color: #c0c0c0;
+}
+
+.van-dropdown-menu__title--down::after {
+  border-color: transparent transparent @mColor @mColor;
+}
+/deep/ .van-rate__item:not(:last-child) {
+  padding-right: .15rem;
 }
 
 
 
-    
 // Basic Colors
 // @black: #000;
 // @white: #fff;
@@ -54,6 +64,6 @@
 // @background-color: #f8f8f8;
 // @background-color-light: #fafafa;
 .van-button--primary {
-    background: @mColor;
-    border: 1px solid @mColor;
-  }
+  background: @mColor;
+  border: 1px solid @mColor;
+}

BIN
src/assets/images/icon_student.png


BIN
src/assets/images/wx_icon.png


+ 1 - 0
src/components/MCalendar.vue

@@ -469,6 +469,7 @@ export default {
         justify-content: space-between;
         text-align: center;
         padding: .2rem 0 .1rem;
+        color: #777;
         span {
             flex: 1;
             font-size: .16rem;

+ 3 - 1
src/components/MEmpty.vue

@@ -22,7 +22,7 @@ export default {
 
 .icon {
     width: 2rem;
-    height: 2rem;
+    height: 1.7rem;
     margin: .5rem auto .05rem;
 }
 .icon_nodata {
@@ -34,6 +34,8 @@ export default {
     font-size: .16rem;
     text-align: center;
     line-height: .22rem;
+    position: relative;
+    top: -.2rem;
 }
 .full {
     height: 100vh;

+ 6 - 6
src/components/MPayment.vue

@@ -139,10 +139,10 @@ export default {
     color: #cccccc;
     font-size: .22rem;
 }
-/deep/.van-popup--bottom.van-popup--round {
-    border-radius: .06rem .06rem 0 0;
-    // background-color: rgba(0, 0, 0, 0.06);
-}
+// /deep/.van-popup--bottom.van-popup--round {
+//     border-radius: .06rem .06rem 0 0;
+//     // background-color: rgba(0, 0, 0, 0.06);
+// }
 /deep/.van-hairline--bottom::after {
     border-bottom-color: #F0F0F0;
 }
@@ -210,12 +210,12 @@ export default {
 }
 
 /deep/.van-button--primary {
-    background-color: #14928A;
+    background-color:  @mColor;
     color: #ffffff;
     font-size: .16rem;
     height: .52rem;
     line-height: .50rem;
     border-radius: 0;
-    border-color: #14928A;
+    border-color:  @mColor;
 }
 </style>

+ 3 - 1
src/components/MSearch.vue

@@ -36,5 +36,7 @@ export default {
 /deep/.van-search__action {
     color: @tFontColor;
 }
-
+.van-icon-search {
+  color: @mColor;
+}
 </style>

+ 1 - 1
src/views/app/Account.vue

@@ -134,7 +134,7 @@ export default {
     display: inline-block;
     width: 0.2rem;
     height: 0.22rem;
-    margin-right: .05rem;
+    margin-right: .15rem;
     // margin-top: -0.02rem;
 }
 .icon_times {

+ 4 - 4
src/views/app/CourseApply.vue

@@ -643,10 +643,10 @@ export default {
     min-height: 100vh;
 }
 .vip-title {
-    padding: .06rem 0 .04rem;
-    font-size: .12rem;
-    color: @mFontColor;
-    text-align: center;
+    padding: .06rem .14rem .04rem;
+    font-size: .14rem;
+    color: #808080;
+
 }
 
 .add-plan {

+ 1 - 1
src/views/app/ExchangeRecord.vue

@@ -4,7 +4,7 @@
 
         <van-list v-model="loading" v-if="dataShow" key="data"
             :finished="finished"
-            finished-text="没有更多数据了"
+            finished-text="- 没有更多数据了 -"
             @load="getAccountDetail">
             <van-cell-group>
                 <van-cell  v-for="(item, index) in dataList" :key="index" :center="true">

+ 3 - 2
src/views/app/PeriodExchange.vue

@@ -6,7 +6,7 @@
             <van-cell :center="true">
                 <template slot="icon">
                     <img class="logo" v-if="userInfo.avatar" :src="userInfo.avatar" alt="">
-                    <img class="logo" v-else src="@/assets/images/icon_teacher.png" alt="">
+                    <img class="logo" v-else src="@/assets/images/icon_student.png" alt="">
                 </template>
                 <template slot="title">
                     <p class="exchangeText">{{ userInfo.realName }}</p>
@@ -238,6 +238,7 @@ export default {
     .exchangeText {
         font-size: .21rem;
         color: #1A1A1A;
+        font-weight: 500;
     }
     .info {
         font-size: .14rem;
@@ -301,7 +302,7 @@ export default {
     min-width: 1rem;
 }
 .pay_btn {
-    background: #14928A;
+    background: @mColor;
     line-height: 0.45rem;
     color: #fff;
     font-size: 0.18rem;

+ 1 - 1
src/views/app/PeriodRecord.vue

@@ -4,7 +4,7 @@
 
         <van-list v-model="loading" v-if="dataShow" key="data"
             :finished="finished"
-            finished-text="没有更多数据了"
+            finished-text="- 没有更多数据了 -"
             @load="getTeacherCourse">
             <van-cell-group>
                 <van-cell  v-for="(item, index) in dataList" :key="index" :center="true">

+ 25 - 1
src/views/audition/CourseEvaluation.vue

@@ -431,7 +431,7 @@ export default {
   }
 }
 /deep/.van-radio__icon .van-icon {
-  border-color: @sFontColor;
+  border-color:#d3d3d3;
 }
 /deep/.van-radio__icon--checked {
   .van-icon {
@@ -529,4 +529,28 @@ export default {
     color:transparent;
   }
 }
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #777 !important;
+  font-size: .14rem;
+}
 </style>

+ 21 - 11
src/views/audition/ManageEvaluation.vue

@@ -17,6 +17,7 @@
                 筛选<i class="arrowDown"></i>
       </div>-->
       <van-dropdown-menu active-color="#01C1B5">
+       <div class="susqurt">|</div>
         <van-dropdown-item title="筛选" ref="item" v-model="search.status">
           <div class="dropList">
             <div class="dropItem">
@@ -111,7 +112,7 @@
       <van-list
         v-model="loading"
         :finished="finished"
-        finished-text="没有更多了"
+        finished-text="- 没有更多了 -"
         @load="getList"
       >
         <van-cell
@@ -163,7 +164,7 @@
     <m-empty class="empty" msg="暂无数据" v-else key="data" />
 
     <!-- 日期开始弹窗 -->
-    <van-popup position="bottom" v-model="dateSection.status">
+    <van-popup position="bottom" v-model="dateSection.status" class="radius">
       <van-datetime-picker
         v-model="dateSection.currentDate"
         type="date"
@@ -175,7 +176,7 @@
       />
     </van-popup>
     <!-- 日期结束弹窗 -->
-    <van-popup position="bottom" v-model="dateEndSection.status">
+    <van-popup position="bottom" v-model="dateEndSection.status" class="radius">
       <van-datetime-picker
         v-model="dateEndSection.currentDate"
         type="date"
@@ -435,8 +436,10 @@ export default {
       margin-left: 0.05rem;
     }
     .date {
+      background-color: #F5F5F5;
       padding: 0.02rem 0.06rem;
-      border: 1px solid #e5e5e5;
+      // border: 1px solid #e5e5e5;
+      border-radius: .12rem;
       font-size: 0.14rem;
       color: #999999;
       span {
@@ -486,7 +489,7 @@ export default {
   .dropItem {
     padding: 0.1rem 0.16rem;
     .dropTitle {
-      font-size: 0.17rem;
+      font-size: 0.14rem;
       color: #1a1a1a;
     }
     #courseType {
@@ -550,6 +553,9 @@ export default {
     }
   }
 }
+/deep/.van-cell{
+  padding: 17px 16px;
+}
 /deep/.van-cell__title {
   font-size: 0.14rem;
   color: @mFontColor;
@@ -617,13 +623,17 @@ export default {
   height: 0.42rem;
   margin-right: 0.1rem;
 }
-/deep/.van-picker__cancel,
-/deep/.van-picker__confirm {
-  color: @mColor;
-}
+// /deep/.van-picker__cancel,
+// /deep/.van-picker__confirm {
+//   color: @mColor;
+// }
+
 
-/deep/.van-popup {
-  border-radius:0;
+.susqurt {
+  position: absolute;
+  color: #D3D3D3;
+  left: -.1rem;
+  top: .11rem;
 }
 
 </style>

+ 2 - 2
src/views/teacher/Approval.vue

@@ -5,7 +5,7 @@
             <van-tab title="待处理">
                 <van-list v-model="dataSection.loading" v-if="dataSection.show" key="data"
                     :finished="dataSection.finished"
-                    finished-text="没有更多数据了"
+                    finished-text="- 没有更多数据了 -"
                     @load="getClassGroupList">
                     <div v-for="(item, index) in dataSection.dataList" :key="index" class="app-item">
                         <div class="hd">
@@ -26,7 +26,7 @@
             <van-tab title="已处理">
                 <van-list v-model="recordSection.loading"  v-if="recordSection.show" key="records"
                     :finished="recordSection.finished"
-                    finished-text="没有更多数据了"
+                    finished-text="- 没有更多数据了 -"
                     @load="getStudentAttendanceList">
                     <div v-for="i in 6" :key="i" class="app-item">
                         <div class="hd">

+ 3 - 3
src/views/teacher/Attendance.vue

@@ -10,7 +10,7 @@
                         v-model="currentRate"
                         :rate="dataInfo.rate"
                         :speed="100"
-                        color="#14928A"
+                        color="#01c1b5"
                         :stroke-width="65"
                         layer-color="#EEEEEE">
                         <p><span>{{ dataInfo.alreadyInClass[0] }}</span>/{{ dataInfo.alreadyInClass[1] }}</p>
@@ -32,12 +32,12 @@
         </div>
         <van-list v-model="loading"  v-if="show" key="records"
                     :finished="finished"
-                    finished-text="没有更多数据了"
+                    finished-text="- 没有更多数据了 -"
                     @load="statisticsList">
             <div class="stu_info" v-for="(item, index) in dataList" :key="index">
                 <van-cell :center="true">
                     <template slot="icon">
-                        <img class="logo" src="@/assets/images/default_head_img.png" alt="">
+                        <img class="logo" src="@/assets/images/icon_student.png" alt="">
                     </template>
                     <template slot="default">到课(天):{{ item.normalDay }}<br/>旷课(天):{{ item.truantDay }}<br/>请假(天):{{ item.leaveDay }}</template>
                     <template slot="title">

+ 1 - 1
src/views/teacher/IStarted.vue

@@ -5,7 +5,7 @@
         <div class="section">
             <van-list v-model="loading"  v-if="dataShow" key="data"
                 :finished="finished"
-                finished-text="没有更多数据了"
+                finished-text="- 没有更多数据了 -"
                 @load="getBindList">
                 <router-link :to="{ path: '/starteddetail' }" v-for="i in 6" :key="i" class="app-item">
                     <div class="hd">

+ 3 - 4
src/views/teacher/VIP00Apply.vue

@@ -1895,10 +1895,9 @@ export default {
 @import url("../../assets/commonLess/variable.less");
 
 .vip-title {
-  padding: 0.06rem 0 0.04rem;
-  font-size: 0.12rem;
-  color: @mFontColor;
-  text-align: center;
+   padding: .06rem .14rem .04rem;
+    font-size: .14rem;
+    color: #808080;
 }
 
 .courseTips {

+ 3 - 4
src/views/teacher/VIP11Apply.vue

@@ -1597,10 +1597,9 @@ export default {
 @import url("../../assets/commonLess/variable.less");
 
 .vip-title {
-  padding: 0.06rem 0 0.04rem;
-  font-size: 0.12rem;
-  color: @mFontColor;
-  text-align: center;
+   padding: .06rem .14rem .04rem;
+    font-size: .14rem;
+    color: #808080;
 }
 
 .add-plan {

+ 2 - 2
src/views/teacher/special.vue

@@ -1,12 +1,12 @@
 <template>
     <div class="special">
         <van-sticky>
-          <m-search @onSearch="onSearch" />
+          <m-search @onSearch="onSearch" /> 
         </van-sticky>
         <div class="specialList">
             <van-list v-model="loading"  v-if="show" key="teachcer"
                 :finished="finished"
-                finished-text="没有更多数据了"
+                finished-text="- 没有更多数据了 -"
                 :immediate-check="false"
                 @load="getNewsList()">
                 <!-- :href="origin + '/#/specialdetail/' + item.id" -->

+ 3 - 0
src/views/teacher/specialDetail.vue

@@ -92,6 +92,8 @@ export default {
   overflow: hidden;
 }
 .sd-container {
+  font-size: .14rem;
+    color: #333;
   padding: 0.15rem;
   h2 {
     font-weight: 500;
@@ -100,6 +102,7 @@ export default {
     font-size: 0.22rem;
     margin-bottom: 0.1rem;
   }
+
 }
 
 .titleInfo {

+ 1 - 1
src/views/teacher/tobeReport.vue

@@ -39,7 +39,7 @@ export default {
     }
   },
   mounted() {
-     document.title = "待完成月报";
+     document.title = "待评价月报的";
     getNeedPost().then((res) => {
       if (res.data.code == 200) {
         if (res.data.data.length > 0) {

+ 8 - 5
src/views/visitManager/addVisit.vue

@@ -452,14 +452,17 @@ export default {
 </script>
 <style lang='less' scoped>
 @import url("../../assets/commonLess/variable.less");
+/deep/.van-popup--bottom {
+  border-radius: 0px 0px 0px 0px!important;
+  overflow: auto!important;
+}
 .addVisit {
   min-height: 100vh;
 }
 .vip-title {
-  padding: 0.06rem 0 0.04rem;
-  font-size: 0.12rem;
-  color: @mFontColor;
-  text-align: center;
+   padding: .06rem .14rem .04rem;
+    font-size: .14rem;
+    color: #808080;
 }
 /deep/.van-cell-group {
   margin-bottom: 0.1rem;
@@ -534,7 +537,7 @@ export default {
   }
 
   /deep/.van-radio__icon .van-icon {
-    border-color: @sFontColor;
+    border-color: #d3d3d3;
   }
 
   /deep/.van-radio__icon--checked {

+ 4 - 2
src/views/visitManager/visitList.vue

@@ -34,7 +34,7 @@
       v-model="loading"
       v-if="dataShow"
       :finished="finished"
-      finished-text="没有更多了"
+      finished-text="- 没有更多了 -"
       @load="getList"
     >
       <van-cell
@@ -261,6 +261,7 @@ export default {
 </script>
 <style lang="less" scoped>
 @import url("../../assets/commonLess/variable.less");
+
 .visitList {
   min-height: 100vh;
   .visitTime {
@@ -332,7 +333,7 @@ export default {
   .cancelBtn {
     height: 48px;
     line-height: 48px;
-    background: #e1f6f4;
+    background: #eeeff3;
     color: @mColor;
     text-align: center;
     width: 100%;
@@ -362,4 +363,5 @@ export default {
     line-height: .48rem!important;
     font-size: .16rem;
 }
+
 </style>