浏览代码

Merge branch 'LaoMo' into test

lex-xin 3 年之前
父节点
当前提交
2a746b76ab
共有 3 个文件被更改,包括 3 次插入31 次删除
  1. 2 4
      src/views/audition/ArrangeWork.vue
  2. 0 16
      src/views/teacher/order.vue
  3. 1 11
      src/views/teacher/specialDetail.vue

+ 2 - 4
src/views/audition/ArrangeWork.vue

@@ -105,11 +105,9 @@ export default {
       let params = {
         content: this.content,
         courseId: query.courseId,
-        expiryDate: this.dateSection.showStartDate
+        expiryDate: dayjs(this.dateSection.currentDate).format('YYYY-MM-DD')
       }
-      let visitTime = this.dateSection.showStartDate.replace(/[^\d]/g,'/');
-      let someDate = new Date(visitTime)
-      addHomeWork({...params,expiryDate:dayjs(someDate).format("YYYY-MM-DD")}).then(res => {
+      addHomeWork({...params}).then(res => {
         let result = res.data
         this.$toast.clear()
         if(result.code == 200) {

+ 0 - 16
src/views/teacher/order.vue

@@ -112,7 +112,6 @@
 <script>
 import { queryStudentApply, querySubByMusicGroupId, getRegisterOrPreList, updateSubject } from '@/api/teacher'
 import setLoading from '@/utils/loading'
-import moment from 'moment'
 import cleanDeep from 'clean-deep'
 export default {
     name: 'order',
@@ -266,21 +265,6 @@ export default {
             }
             await this.getRegisterOrPreList()
         }
-    },
-    filters: {
-        formatterTimes(second){
-            if (second < 60) {
-                return second + "秒";
-            } else if (60 < second && second < 3600) {
-                return moment(second * 1000).format("m分钟");
-            } else if (3600 < second && second < 86400) {
-                return moment(second * 1000).format("HH小时mm分钟");
-            } else if (second > 86400) {
-                return moment(second * 1000).format("DD天HH小时mm分钟");
-            } else {
-                return "--";
-            }
-        }
     }
 }
 </script>

+ 1 - 11
src/views/teacher/specialDetail.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="specialdetail">
-
     <div class="sd-container">
       <h2>{{ dataInfo.title }}</h2>
       <div class="msgWrap quill-editor ql-editor" v-html="dataInfo.content"></div>
@@ -32,6 +31,7 @@ export default {
         localStorage.removeItem('Authorization')
         localStorage.removeItem('userInfo')
     }
+    document.title = '公告详情';
     this.__init();
 
     // 图片预览
@@ -69,16 +69,6 @@ export default {
         this.$toast.clear();
         if (result.code == 200 && result.data) {
           this.dataInfo = result.data;
-          let tempTitle = {
-            1: "精彩活动详情",
-            2: "热门资讯详情",
-            3: "活动列表详情",
-            4: "专项训练详情",
-            7: "知识库详情",
-            9: "系统通知"
-          };
-          document.title = tempTitle[result.data.type];
-
           let metaList = document.querySelectorAll("meta");
           metaList.forEach(item => {
             if (item.name == "description") {