Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_om4uj5994af.css');
+@import url('//at.alicdn.com/t/font_2077629_2ushkr6o1zh.css');
 
 html,
 body,
@@ -101,8 +101,8 @@ body,
 .q-table__top {
     padding: 0 0 12px 0px !important;
 }
-.q-btn__wrapper .row, 
-.q-btn__wrapper .column, 
+.q-btn__wrapper .row,
+.q-btn__wrapper .column,
 .q-btn__wrapper .flex{
     flex-wrap: nowrap !important;
 }
@@ -114,7 +114,7 @@ button.bg-accent{
 }
 button.bg-accent:active{
     background: linear-gradient(270deg, #37ADF7, #2961FE) !important;
-    
+
 }
 .q-avatar__content{
     font-family: perfectFont !important;

src/pages/sale/japaneseTrain.vue

@@ -52,7 +52,7 @@
               <div class="d2">
                 <div> <span class="d2-n">带课老师</span><img :src="item.TeacherHead" alt="" style="width: 26px;height: 26px;border-radius: 4px;margin-right: 5px;color: #2961FE">{{item.TeacherName}}</div>
                 <div><span class="d2-n">上课教室</span>{{item.RoomName}}</div>
-                <div><span class="d2-n">上课时间</span><span style="text-decoration:underline;color:#111111;">{{item.ClassStyleName}}</span>
+                <div><span class="d2-n">上课时间</span><span style="text-decoration:underline;color:#111111;">{{item.ClassStyleName}}   </span><span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
                   <q-popup-proxy>
                     <q-banner>
                       <div class="price-popup" style="padding: 10px">
@@ -106,7 +106,7 @@
                 <div><span class="d2-n">原价</span><span>{{item.OriginalPrice}}</span></div>
                 <div><span class="d2-n">售价</span><span style="color:#2961FE;">{{item.SellPrice}}</span></div>
                 <div v-if="item.IsStepPrice==1 && item.ClassStepPriceList.length>0">
-                  更多优惠价格
+                  更多优惠价格<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" ></span>
                   <q-popup-proxy>
                     <q-banner>
                       <div class="price-popup">
@@ -126,6 +126,7 @@
               <div class="d7">
                 <q-btn   color="primary" label="立即下单"  v-if="item.IsCanApply==1" @click="placeAnorder(item)"/>
                 <div  v-if="item.IsCanApply==0">
+<!--                  TODO 这里是图片-->
                    <span v-if="item.SurplusNum==0">报名已满</span>
                    <span v-if="getEXPDate(item.OpenTime)==true">已过期</span>
                 </div>
@@ -464,5 +465,13 @@
   .japaneseTrain li .d4 div{font-size: 14px;color: #111111;margin: 10px 0 ;font-weight: 600}
   .japaneseTrain li .d5 div{font-size: 14px;color: #111111;margin: 10px 0 ;font-weight: 600}
   .japaneseTrain .price-popup{border-radius: 4px;}
-
+  .japaneseTrain .el-range-editor .el-range-input {
+    background: none;
+  }
+  .japaneseTrain .el-range-editor.el-input__inner {
+    background-color: transparent;
+  }
+  .japaneseTrain .q-mb-md{
+    margin-bottom: 0;
+  }
 </style>