Browse Source

更换为dayjs

jwyu 2 years ago
parent
commit
abe929642f
2 changed files with 7 additions and 7 deletions
  1. 3 3
      pages-report/reportForVariety/list.vue
  2. 4 4
      pages-user/myCollect.vue

+ 3 - 3
pages-report/reportForVariety/list.vue

@@ -54,7 +54,7 @@
 import {apiGetSceneToParams} from '@/api/common'
 import {apiGoodsPermissionList,apiReportListForVariety} from '@/api/report'
 import audioBox from '../components/audioBox.vue'
-const moment=require('@/utils/moment-with-locales.min')
+const dayjs=require('@/utils/dayjs.min')
 export default {
     computed:{
         showAudioPop(){//是否显示音频弹窗
@@ -84,14 +84,14 @@ export default {
                 obj.img_1=this.list[0].report_img_url
                 obj.title_1=this.list[0].title 
                 obj.abstract_1=this.list[0].classify_name_second
-                obj.time_1=`${this.list[0].stage}期 | ${moment(this.list[0].publish_time).format('YYYY.MM.DD')}`
+                obj.time_1=`${this.list[0].stage}期 | ${dayjs(this.list[0].publish_time).format('YYYY.MM.DD')}`
                 obj.abstract_1_style=this.list[0].classify_name_second?'':'display:none'
             }
             if(this.list[1]){
                 obj.img_2=this.list[1].report_img_url
                 obj.title_2=this.list[1].title 
                 obj.abstract_2=this.list[1].classify_name_second
-                obj.time_2=`${this.list[1].stage}期 | ${moment(this.list[1].publish_time).format('YYYY.MM.DD')}`
+                obj.time_2=`${this.list[1].stage}期 | ${dayjs(this.list[1].publish_time).format('YYYY.MM.DD')}`
                 obj.abstract_2_style=this.list[1].classify_name_second?'':'display:none'
             }
             return obj

+ 4 - 4
pages-user/myCollect.vue

@@ -50,17 +50,17 @@
 <script>
 import searchBox from "@/components/searchBox/searchBox.vue";
 import {apiMyCollectList,apiCancelCollect} from '@/api/user'
-const moment=require('@/utils/moment-with-locales.min')
+const dayjs=require('@/utils/dayjs.min')
 export default {
     components: {
         searchBox
     },
     filters: {
         formatCTime(e){
-            if(moment().isSame(e,'year')){//当年
-                return moment(e).format('MM-DD')
+            if(dayjs().isSame(e,'year')){//当年
+                return dayjs(e).format('MM-DD')
             }else{
-                return moment(e).format('YYYY-MM-DD')
+                return dayjs(e).format('YYYY-MM-DD')
             }
         }
     },