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

src/pages/course/classHourReward.vue

@@ -49,6 +49,7 @@
                 @change="resetSearch"
                 type="month"
                 clearable
+                value-format="yyyy-MM"
                 @clear="resetSearch"
               >
               </el-date-picker

src/pages/sale/reserveClass.vue

@@ -13,15 +13,12 @@
           <div class="col-4 Sysuser_Date">
             <q-field filled>
                <template v-slot:control>
-                <el-date-picker v-model="dateList" @change="resetSearch()" size="mini" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                 range-separator="至"  start-placeholder="开始时间" format="yyyy-MM-dd" end-placeholder="结束时间">
-                 </el-date-picker>       
-                <!-- <el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
+                <el-date-picker v-model="msg.StartClassDate" value-format="yyyy-MM-dd" type="date" placeholder="开始时间"
                   size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
                 </el-date-picker>至
                 <el-date-picker v-model="msg.EndClassDate" value-format="yyyy-MM-dd" type="date" placeholder="结束时间"
                   size="small" style="width:47%;" @change="resetSearch" clear-icon="iconfont icon-guanbi">
-                </el-date-picker> -->
+                </el-date-picker>
               </template>
             </q-field>
           </div>
@@ -205,7 +202,6 @@
         ClassRoomList: [],
         isShowReserve: false,
         reserveObj: {},
-        dateList:[],
       }
     },
     mounted() {
@@ -213,10 +209,7 @@
       var year = nowDay.getFullYear(); //年
       var month = nowDay.getMonth() + 1; //月
       var day = nowDay.getDate(); //日
-      let time1 = year + '-' + month + '-' + day
-      this.dateList[0]= time1.toString();
-      this.dateList[1]= '';
-      console.log(this.dateList,'this.dateList');
+      this.msg.StartClassDate = year + '-' + month + '-' + day
 
       this.GetTeacherList();
       this.getClassRoomList();
@@ -234,13 +227,6 @@
       },
       //获取课程系列分页列表
       getList() {
-        if (this.dateList && this.dateList.length > 0) {
-          this.msg.StartClassDate = this.dateList[0];
-          this.msg.EndClassDate = this.dateList[1];
-        } else {
-          this.msg.StartClassDate = '';
-          this.msg.EndClassDate = '';
-        }
         GetReserveClassPage(this.msg).then(res => {
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;

src/pages/teacher/relationOrder.vue

@@ -29,10 +29,10 @@
         <div class="col-3">
           <q-field filled>
              <template v-slot:control>
-             <el-date-picker v-model="msg.StartTime" type="date" placeholder="报名开始时间" size="small" style="width:47%;"
+             <el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="报名开始时间" size="small" style="width:47%;"
               @change="resetSearch" clear-icon="iconfont icon-guanbi">
              </el-date-picker>至
-             <el-date-picker v-model="msg.EndTime" type="date" placeholder="报名结束时间" size="small" style="width:47%;"
+             <el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="报名结束时间" size="small" style="width:47%;"
               @change="resetSearch" clear-icon="iconfont icon-guanbi">
              </el-date-picker>
               <!-- <el-date-picker v-model="dateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"