update

src/views/course_details/index.vue

@@ -13,7 +13,7 @@
           <p>
             {{ CourseData.teacher_list.length > 0 ? CourseData.teacher_list[0].teacher_name : '' }}
           </p>
-          <p>
+          <p class="intro">
             {{ CourseData.intro }}
           </p>
           <p>
@@ -557,9 +557,11 @@ export default {
   created() {
     // 获取课程详情
     this.loading = true;
-    CheckMyGoodsBuyStatus({ goods_type: this.goodsType, goods_id: this.id }).then(({ is_buy }) => {
-      this.is_buy = is_buy === 'true';
-    });
+    CheckMyGoodsBuyStatus({ goods_type: Number(this.goodsType), goods_id: this.id }).then(
+      ({ is_buy }) => {
+        this.is_buy = is_buy === 'true';
+      }
+    );
     GetCourseInfoBox({ id: this.id })
       .then(res => {
         this.CourseData = res;
@@ -718,6 +720,15 @@ export default {
           margin-top: 16px;
         }
 
+        .intro {
+          height: 36px;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
+          text-overflow: ellipsis;
+          overflow: hidden;
+        }
+
         > :not(.p1) {
           margin-top: 20px;
         }

src/views/teacher/create_course/step_table/AddItem.vue

@@ -4,7 +4,7 @@
     class="add-item"
     :visible.sync="dialogVisible"
     title="课节信息"
-    width="525px"
+    width="770px"
     top="25vh"
     :close-on-click-modal="false"
     :show-close="false"
@@ -21,13 +21,23 @@
         <el-input v-model="itemForm.name" class="item-name" />
       </el-form-item>
       <el-form-item label="课节周期" prop="date">
-        <el-date-picker
-          v-model="itemForm.date"
-          type="datetimerange"
-          range-separator="~"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          unlink-panels
-        />
+        <el-date-picker v-model="itemForm.begin_date" type="date" value-format="yyyy-MM-dd" />&nbsp;
+        <el-select v-model="itemForm.begin_date_hour" class="date-hour">
+          <el-option v-for="item in hourArr" :key="item" :label="item" :value="item" />
+        </el-select>
+        <span> : </span>
+        <el-select v-model="itemForm.begin_date_minute" class="date-minute">
+          <el-option v-for="item in minuteArr" :key="item" :label="item" :value="item" />
+        </el-select>
+        <span> ~ </span>
+        <el-date-picker v-model="itemForm.end_date" type="date" value-format="yyyy-MM-dd" />&nbsp;
+        <el-select v-model="itemForm.end_date_hour" class="date-hour">
+          <el-option v-for="item in hourArr" :key="item" :label="item" :value="item" />
+        </el-select>
+        <span> : </span>
+        <el-select v-model="itemForm.end_date_minute" class="date-minute">
+          <el-option v-for="item in minuteArr" :key="item" :label="item" :value="item" />
+        </el-select>
       </el-form-item>
     </el-form>
 
@@ -65,11 +75,17 @@ export default {
       loading: false,
       itemForm: {
         name: '',
-        date: []
+        begin_date: '',
+        begin_date_hour: '00',
+        begin_date_minute: '00',
+        end_date: '',
+        end_date_hour: '00',
+        end_date_minute: '00'
       },
+      hourArr: [],
+      minuteArr: [],
       itemRules: {
-        name: { required: true, message: '课节名称不能为空', trigger: 'blur' },
-        date: { required: true, message: '课节周期不能为空', trigger: 'blur' }
+        name: { required: true, message: '课节名称不能为空', trigger: 'blur' }
       }
     };
   },
@@ -78,10 +94,18 @@ export default {
       if (newVal === 'edit') {
         this.getCSItem();
       } else {
-        this.itemForm = { name: '', date: [] };
+        this.itemForm = { name: '', begin_time: '', end_time: '' };
       }
     }
   },
+  created() {
+    for (let i = 0; i < 60; i++) {
+      let item = String(i);
+      if (i < 10) item = '0' + item;
+      if (i < 24) this.hourArr.push(item);
+      this.minuteArr.push(item);
+    }
+  },
   methods: {
     addCSItem() {
       this.$refs.itemForm.validate(valid => {
@@ -89,8 +113,8 @@ export default {
 
         let data = {
           name: this.itemForm.name,
-          begin_time: this.itemForm.date[0],
-          end_time: this.itemForm.date[1]
+          begin_time: `${this.itemForm.begin_date} ${this.itemForm.begin_date_hour}:${this.itemForm.begin_date_minute}`,
+          end_time: `${this.itemForm.end_date} ${this.itemForm.end_date_hour}:${this.itemForm.end_date_minute}`
         };
         this.loading = true;
 
@@ -122,8 +146,21 @@ export default {
 
     getCSItem() {
       GetCSItem({ id: this.id }).then(({ begin_time, end_time, name }) => {
+        if (begin_time.length > 0) {
+          let begin = begin_time.split(' ');
+          this.itemForm.begin_date = begin[0];
+          let bTime = begin[1].split(':');
+          this.itemForm.begin_date_hour = bTime[0];
+          this.itemForm.begin_date_minute = bTime[1];
+        }
+        if (end_time.length > 0) {
+          let end = end_time.split(' ');
+          this.itemForm.end_date = end[0];
+          let eTime = end[1].split(':');
+          this.itemForm.end_date_hour = eTime[0];
+          this.itemForm.end_date_minute = eTime[1];
+        }
         this.itemForm.name = name;
-        this.itemForm.date = [begin_time, end_time];
       });
     },
 
@@ -143,10 +180,19 @@ export default {
   .el-dialog {
     &__body {
       height: 100%;
-    }
 
-    .item-name {
-      width: 400px;
+      .date-minute,
+      .date-hour {
+        width: 78px;
+
+        > .el-input {
+          width: 100%;
+        }
+      }
+
+      .el-date-editor.el-input {
+        width: 140px;
+      }
     }
   }
 }

src/views/teacher/create_course/step_table/CourseInfo.vue

@@ -81,7 +81,7 @@
 
         <el-form-item label="价格">
           <el-input v-model="form.price" class="price" @input="price">
-            <svg-icon slot="prepend" icon-class="dollar" />
+            <span slot="prepend">¥</span>
           </el-input>
         </el-form-item>
 

src/views/teacher/main/TaskList.vue

@@ -44,7 +44,9 @@
                   {{ teachingType(list.teaching_type) }}
                 </el-link>
               </div>
-              <div class="tasks-group-list-info-item-name">{{ list.cs_item_name }}</div>
+              <div class="tasks-group-list-info-item-name">
+                {{ list.course_name }} - {{ list.cs_item_name }}
+              </div>
               <div class="tasks-group-list-info-time">{{ list.time_space_view_txt }}</div>
               <div></div>
             </div>