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

src/components/sale/orderlist.vue

@@ -341,7 +341,7 @@
                       <q-item-label>销售备注</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <q-item clickable v-close-popup v-if="AuthorityObj.isShowEducationRemark">
+                  <!-- <q-item clickable v-close-popup v-if="AuthorityObj.isShowEducationRemark">
                     <q-item-section @click="editOrderRemark(item, 2)">
                       <q-item-label>教务备注</q-item-label>
                     </q-item-section>
@@ -350,7 +350,7 @@
                     <q-item-section @click="editOrderRemark(item, 3)">
                       <q-item-label>校长备注</q-item-label>
                     </q-item-section>
-                  </q-item>
+                  </q-item> -->
                   <q-item clickable v-close-popup v-if="isEditOrder && comefrom == 0">
                     <q-item-section @click="editOrder(item)">
                       <q-item-label>总经理修改</q-item-label>
@@ -1532,7 +1532,6 @@
             this.authObj.isShowStudyRebate) {
             this.AuthorityObj.isShowStudyRebate = this.authObj.isShowStudyRebate;
           }
-
         }
       },
       //回归原班

src/pages/h5page/components/audition.vue

@@ -4,6 +4,10 @@
     border: 0;
   }
 
+  .divP p {
+    margin: 0px !important;
+  }
+
 </style>
 
 <template>
@@ -12,7 +16,10 @@
     <div class="row wrap">
       <div style="width:100%;margin-bottom:15px;">试听时间：<span
           style="color:red;">{{timeFormatSeconds(setClassMsg.ReservationDate)}}</span></div>
-      <div style="width:100%;margin-bottom:15px;">试听需求：<font style="color:red;" v-html="setClassMsg.Demand"></font></div>
+      <div style="width:100%;margin-bottom:15px;"> <span style="float:left;"> 试听需求：</span>
+        <div style="color:red;" class="divP" v-html="setClassMsg.Demand">
+        </div>
+      </div>
     </div>
     <q-card class="bg-white q-pa-md" flat>
       <div class="row studentDate">
@@ -197,24 +204,8 @@
           });
           return;
         }
-        if (!this.setClassMsg.ClassRoomId) {
-          this.$q.notify({
-            type: "negative",
-            position: "top",
-            timeout: 2000,
-            message: "请选择教室！"
-          });
-          return;
-        }
-        if (!this.setClassMsg.TrialLessonId) {
-          this.$q.notify({
-            type: "negative",
-            position: "top",
-            timeout: 2000,
-            message: "请选择课程！"
-          });
-          return;
-        }
+
+
         SetVisitorReserveClass(this.setClassMsg).then(res => {
           if (res.Code == 1) {
             if (this.type) {