1

src/components/sale/orderlist.vue

@@ -43,12 +43,12 @@
           </td>
           <td style="border:none">{{item.GuestNum}}人</td>
           <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
-          <td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}">
+          <td :style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
             {{item.Unit_Price.toFixed(2)}}
           </td>
           <td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
           <td style="border:none">{{item.Income.toFixed(2)}}</td>
-          <td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td>
+          <td style="color:var(--q-color-negative);border:none">{{item.DiscountMoney.toFixed(2)}}</td>
           <td style="border:none">{{item.Refund.toFixed(2)}}</td>
           <td style="color:#2961FE;border:none">{{item.DueInMoney.toFixed(2)}}</td>
           <td style="border:none">
@@ -137,7 +137,7 @@
             <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
               退课名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
-                style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
+                style="color:var(--q-color-negative);margin-right: 5px">{{x.GuestName}} </span>
             </div>
             <span v-if="item.GuestList.length==0">暂无</span>
           </td>
@@ -299,12 +299,12 @@
           </td>
           <td style="border:none">{{item.GuestNum}}人</td>
           <td style="border:none">{{item.Class_Price.toFixed(2)}}</td>
-          <td :style="{color:item.Class_Price!=item.Unit_Price?'#f5576c':'','border':'none'}">
+          <td :style="{color:item.Class_Price!=item.Unit_Price?'var(--q-color-negative)':'','border':'none'}">
             {{item.Unit_Price.toFixed(2)}}
           </td>
           <td style="border:none">{{item.PreferPrice.toFixed(2)}}</td>
           <td style="border:none">{{item.Income.toFixed(2)}}</td>
-          <td style="color:#f5576c;border:none">{{item.DiscountMoney.toFixed(2)}}</td>
+          <td style="color:var(--q-color-negative);border:none">{{item.DiscountMoney.toFixed(2)}}</td>
           <td style="border:none">{{item.Refund.toFixed(2)}}</td>
           <td style="color:#2961FE;border:none">{{item.DueInMoney.toFixed(2)}}</td>
           <td style="border:none">
@@ -336,7 +336,7 @@
             <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
               退课名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
-                style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
+                style="color:var(--q-color-negative);margin-right: 5px">{{x.GuestName}} </span>
             </div>
             <span v-if="item.GuestList.length==0">暂无</span>
           </td>
@@ -724,7 +724,7 @@
         let that = this
         this.$q.dialog({
           title: '提示信息',
-          message: '<span style="color: #f5576c">是否取消此订单</span>',
+          message: '<span style="color: var(--q-color-negative)">是否取消此订单</span>',
           cancel: true,
           persistent: true,
           html: true,

src/pages/course/achievements.vue

@@ -649,7 +649,7 @@
   }
 
   .achievements li .d3 .d3-s {
-    color: #f5576c;
+    color: var(--q-color-negative);
     font-weight: bold;
     font-family: perfectFont
   }

src/pages/course/classHourReward.vue

@@ -67,7 +67,7 @@
         </template>
         <template v-slot:body-cell-Money="props">
           <q-td :props="props">
-            <span style="color:#f5576c">￥{{props.row.Money.toFixed(2)}}</span>
+            <span style="color:var(--q-color-negative)">￥{{props.row.Money.toFixed(2)}}</span>
           </q-td>
         </template>
         <template v-slot:body-cell-FrIdList="props">

src/pages/course/prepareclassDetails.vue

@@ -149,7 +149,7 @@
             <div class="text12-n width70">{{item.CourseName}}：</div>
             <div class="text12-o" style="flex:1">
               <div class="column"  v-for="(x,y) in item.LessonPlanDetailsList" :key="y">
-                <div class="text14-l">{{x.Duration}}分</div>
+                <div class="text14-l">{{x.Duration}}分钟-{{x.DurationEndTime}}</div>
                 <div class="text12-o">{{x.ProjectContent}}</div>
                 <div style="width: 100%;background: #F0F5FB;border-radius: 5px;margin: 10px 0">
 

src/pages/course/rewardDetailed.vue

@@ -24,12 +24,12 @@
         </template>
         <template v-slot:body-cell-UnitPrice="props">
           <q-td :props="props" color="negative">
-            <span style="color: #f5576c">￥{{props.row.UnitPrice.toFixed(2)}}</span>
+            <span style="color: var(--q-color-negative)">￥{{props.row.UnitPrice.toFixed(2)}}</span>
           </q-td>
         </template>
         <template v-slot:body-cell-Money="props">
           <q-td :props="props" color="negative">
-            <span style="color: #f5576c">￥{{props.row.Money.toFixed(2)}}</span>
+            <span style="color: var(--q-color-negative)">￥{{props.row.Money.toFixed(2)}}</span>
           </q-td>
         </template>
         <template v-slot:body-cell-Type="props">
@@ -48,12 +48,12 @@
         </template>
         <template v-slot:body-cell-UnitPrice="props">
           <q-td :props="props" color="negative">
-            <span style="color: #f5576c">￥{{props.row.UnitPrice.toFixed(2)}}</span>
+            <span style="color: var(--q-color-negative)">￥{{props.row.UnitPrice.toFixed(2)}}</span>
           </q-td>
         </template>
         <template v-slot:body-cell-Money="props">
           <q-td :props="props" color="negative">
-            <span style="color: #f5576c">￥{{props.row.Money.toFixed(2)}}</span>
+            <span style="color: var(--q-color-negative)">￥{{props.row.Money.toFixed(2)}}</span>
           </q-td>
         </template>
         <template v-slot:body-cell-Type="props">

src/pages/course/teacherLesson.vue

@@ -184,9 +184,18 @@
     background-color: #2961FE!important;
     color:#fff!important;
   }
-  .checkedPlan .beikeStatus{
-    background-color: #fff;
-    color:#2961FE!important;
+  /*.checkedPlan .beikeStatus{*/
+  /*  background-color: #fff;*/
+  /*  color:#2961FE!important;*/
+  /*}*/
+ .Cal_Content .beike1{
+    background: var(--q-color-negative);
+  }
+ .Cal_Content .beike2{
+    background: var(--q-color-warning);
+  }
+ .Cal_Content .beike3{
+    background: var(--q-color-dark);
   }
 </style>
 <template>
@@ -201,20 +210,26 @@
       <div class="Cal_List">
         <div class="Cal_Qiehuan" @click="getBeforeMonth()">
           <div class="Cal_Icon">
-            <<</div> <div>上个月
+            <i class="el-icon-arrow-left"></i></div> <div>上个月
           </div>
         </div>
         <div class="Cal_Content">
           <div class="Cal_Inner" v-for="(item,index) in dataNum" :class="{'checkedPlan':ckedIndex==item}" @click="getItem(item)">
               {{item}}
-              <div class="beikeStatus">
+            <div class="beikeStatus beike1"  v-if="getLessonStatus(item)=='未备课'">
+              <span>{{getLessonStatus(item)}}</span>
+            </div>
+            <div class="beikeStatus beike2"  v-if="getLessonStatus(item)=='部分'">
+              <span>{{getLessonStatus(item)}}</span>
+            </div>
+            <div class="beikeStatus beike3"  v-if="getLessonStatus(item)=='已备课'">
               <span>{{getLessonStatus(item)}}</span>
             </div>
           </div>
         </div>
         <div class="Cal_Qiehuan" @click="getNextMonth()">
           <div class="Cal_Icon">
-            >></div>
+            <i class="el-icon-arrow-right"></i></div>
           <div>下个月
           </div>
         </div>

src/pages/sale/japaneseTrain.vue

@@ -139,7 +139,7 @@
                 <div style="margin: 0">价格信息</div>
                 <div><span class="d2-n">原价</span><span>{{item.OriginalPrice.toFixed(2)}}</span></div>
                 <div><span class="d2-n">售价</span><span
-                    style="color:#f5576c;font-weight: bold">{{item.SellPrice.toFixed(2)}}</span></div>
+                    style="color:var(--q-color-negative);font-weight: bold">{{item.SellPrice.toFixed(2)}}</span></div>
                 <div v-if="item.IsStepPrice==1 && item.ClassStepPriceList.length>0" style="cursor: pointer">
                   更多优惠价格<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px"></span>
                   <q-popup-proxy>
@@ -159,7 +159,7 @@
                 <div style="margin: 0">名额信息</div>
                 <div><span class="d2-n">计划招生人数</span><span>{{item.ClassPersion}}人</span></div>
                 <div><span class="d2-n">剩余招生名额</span><span
-                    style="color:#f5576c;font-weight: bold">{{item.SurplusNum}}人</span></div>
+                    style="color:var(--q-color-negative);font-weight: bold">{{item.SurplusNum}}人</span></div>
               </div>
               <div class="d7">
                 <q-btn color="primary" label="立即下单" v-if="item.IsCanApply==1" @click="placeAnorder(item)" />
@@ -172,7 +172,7 @@
               </div>
             </div>
             <div class="d6 row">
-              <p style="color:#f5576c;font-weight: bold"><span style="color:#2D2D2D;">OP备注：</span>{{item.OutRemark}}</p>
+              <p style="color:var(--q-color-negative);font-weight: bold"><span style="color:#2D2D2D;">OP备注：</span>{{item.OutRemark}}</p>
               <div class="progress">
                 <q-linear-progress size="5px" color="#3FC4FF" :value="(item.OrderStudentCount/item.ClassPersion)"
                   rounded />
@@ -613,7 +613,7 @@
   }
 
   .japaneseTrain li .d3 .d3-s {
-    color: #f5576c;
+    color: var(--q-color-negative);
     font-weight: bold
   }