🐞 fix: 时间解析问题处理，把dayjs换成moment

hookehuyr
Commit 95efbb94beaf8c4f34416df0c619479bc7c2316f 95efbb94 1 parent d0a01b45
Showing 10 changed files with 45 additions and 46 deletions
src/components/activity-card.vue
src/pages/activityDetail/index.vue
src/pages/createActivity/index.vue
src/pages/joinList/index.vue
src/pages/my/index.vue
src/pages/myCreateActivity/index.vue
src/pages/myFollowUser/index.vue
src/pages/userInfo/index.vue
src/utils/moment.min.js
src/utils/tools.js
--- a/src/components/activity-card.vue
View file @95efbb9
+++ b/src/components/activity-card.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-20 15:39:37
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-28 13:32:41
+ * @LastEditTime: 2022-10-31 17:13:44
  * @FilePath: /swx/src/components/activity-card.vue
  * @Description: 活动卡片组件
 -->
@@ -66,7 +66,7 @@
 import { ref, defineProps, computed } from 'vue'
 import icon_address from '@/images/icon/address@2x.png'
 import Taro from '@tarojs/taro'
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 const props = defineProps({
   data: Object,
@@ -78,7 +78,7 @@ const props = defineProps({
 // })
 const formatDate = (date) => {
-  return dayjs(date).format('YYYY-MM-DD HH:mm')
+  return moment(date).format('YYYY-MM-DD HH:mm')
 }
 const formatStatus = (item) => {
@@ -86,13 +86,13 @@ const formatStatus = (item) => {
     return '已结束';
   } else if (item?.status === 'disable') {
     return '未发布';
-  } else if (dayjs(item.server_time).isBefore(dayjs(item.reg_begin_time))) {
+  } else if (moment(item.server_time).isBefore(moment(item.reg_begin_time))) {
     return '报名未开始';
-  } else if (dayjs(item.reg_begin_time).isBefore(dayjs(item.server_time)) && dayjs(item.server_time).isBefore(dayjs(item.reg_end_time))) {
+  } else if (moment(item.reg_begin_time).isBefore(moment(item.server_time)) && moment(item.server_time).isBefore(moment(item.reg_end_time))) {
     return '报名中';
-  } else if (dayjs(item.reg_end_time).isBefore(dayjs(item.server_time)) && dayjs(item.server_time).isBefore(dayjs(item.activity_time))) {
+  } else if (moment(item.reg_end_time).isBefore(moment(item.server_time)) && moment(item.server_time).isBefore(moment(item.activity_time))) {
     return '报名结束';
-  } else if (dayjs(item.activity_time).isBefore(dayjs(item.server_time))) {
+  } else if (moment(item.activity_time).isBefore(moment(item.server_time))) {
     return '活动进行中';
   }
 }
--- a/src/pages/activityDetail/index.vue
View file @95efbb9
+++ b/src/pages/activityDetail/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-26 14:36:57
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 11:28:15
+ * @LastEditTime: 2022-10-31 17:17:34
  * @FilePath: /swx/src/pages/activityDetail/index.vue
  * @Description: 活动详情页
 -->
@@ -150,7 +150,7 @@ import activityBar from '@/components/activity-bar.vue'
 import Taro from '@tarojs/taro'
 import PosterBuilder from '@/components/PosterBuilder/index.vue';
 import { ref, onMounted } from "vue";
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 import { infoUserAPI } from '@/api/User/index';
 import { qrCodeActivityAPI } from '@/api/Activity/index';
 import icon_share from '@/images/icon/share.png'
@@ -167,7 +167,7 @@ onMounted(async () => {
 })
 const formatDate = (date) => {
-  return dayjs(date).format('YYYY-MM-DD HH:mm')
+  return moment(date).format('YYYY-MM-DD HH:mm')
 }
 const show_share = ref(false);
--- a/src/pages/createActivity/index.vue
View file @95efbb9
+++ b/src/pages/createActivity/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-21 16:04:10
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 14:20:36
+ * @LastEditTime: 2022-10-31 17:26:24
  * @FilePath: /swx/src/pages/createActivity/index.vue
  * @Description: 创建活动页面
 -->
@@ -277,10 +277,8 @@ import mixin from '@/utils/mixin';
 import BASE_URL from '@/utils/config';
 import Toast from '@/components/vant-weapp/toast/toast';
 import { randomId } from '@/utils/tools'
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 import { activityInfoAPI } from '@/api/Host/index';
-var isBetween = require('dayjs/plugin/isBetween')
-dayjs.extend(isBetween);
 const activity_name = ref('');
 const onChange = ({ detail }) => {
@@ -695,11 +693,11 @@ const validForm = () => { // 校验表单
     Toast('报名截止时间不能为空');
     return false;
   }
-  if (!dayjs(reg_begin_time.value).isBefore(dayjs(reg_end_time.value))) {
+  if (!moment(reg_begin_time.value).isBefore(moment(reg_end_time.value))) {
     Toast('报名开始时间不能晚于报名截止时间');
     return false;
   }
-  if (!dayjs(activity_time.value).isBetween(dayjs(reg_begin_time.value), dayjs(reg_end_time.value), null, '[]')) {
+  if (!moment(activity_time.value).isBetween(moment(reg_begin_time.value), moment(reg_end_time.value), null, '[]')) {
     Toast('活动时间请在报名时间之间');
     return false;
   }
@@ -764,11 +762,11 @@ const onSubmit = async () => {
 // 格式化活动时间
 const formatInfoDate = (date) => {
-  const formatYear = dayjs(date).$y;
+  const formatYear = moment(date).year();
-  const formatMonth = dayjs(date).$M;
+  const formatMonth = moment(date).month();
-  const formatDay = dayjs(date).$D;
+  const formatDay = moment(date).dates();
-  const formatHour = dayjs(date).$H;
+  const formatHour = moment(date).hour();
-  const formatMin = dayjs(date).$m;
+  const formatMin = moment(date).minute()
   return new Date(formatYear, formatMonth, formatDay, formatHour, formatMin);
 }
@@ -811,13 +809,14 @@ const updateActivityInfo = async ({ activity, host }) => {
       signInfo.value = signInfo.value.concat(activity.fields);
     }
     // 活动时间
-    activity_time.value = dayjs(activity.activity_time).format('YYYY-MM-DD HH:mm');
+    activity_time.value = moment(activity.activity_time).format('YYYY-MM-DD HH:mm');
     // 开始时间
-    reg_begin_time.value = dayjs(activity.reg_begin_time).format('YYYY-MM-DD HH:mm');
+    reg_begin_time.value = moment(activity.reg_begin_time).format('YYYY-MM-DD HH:mm');
     // 结束时间
-    reg_end_time.value = dayjs(activity.reg_end_time).format('YYYY-MM-DD HH:mm');
+    reg_end_time.value = moment(activity.reg_end_time).format('YYYY-MM-DD HH:mm');
     // 默认弹框活动时间
     defaultActivityTime = formatInfoDate(activity.activity_time);
+    console.warn(defaultActivityTime);
     defaultStartTime = formatInfoDate(activity.reg_begin_time);
     defaultEndTime = formatInfoDate(activity.reg_end_time);
     // 人数限制字段
--- a/src/pages/joinList/index.vue
View file @95efbb9
+++ b/src/pages/joinList/index.vue
View file @95efbb9
@@ -119,7 +119,7 @@ setTimeout(() => {
 <script>
 import "./index.less";
 import { listRegAPI, statusRegAPI } from '@/api/Reg/index';
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 import { activityInfoAPI } from '@/api/Host/index';
 import { $ } from '@tarojs/extend'
 import Dialog from '@/components/vant-weapp/dialog/dialog';
@@ -159,7 +159,7 @@ export default {
     const info = await activityInfoAPI({ i: getCurrentPageParam().id });
     if (info.code) {
       // 判断是否超过活动时间
-      if (dayjs(info.data.activity.activity_time).isBefore(dayjs(info.data.server_time))) {
+      if (moment(info.data.activity.activity_time).isBefore(moment(info.data.server_time))) {
         this.absent = true;
       }
     }
--- a/src/pages/my/index.vue
View file @95efbb9
+++ b/src/pages/my/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-21 14:51:44
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-28 18:01:09
+ * @LastEditTime: 2022-10-31 17:17:07
  * @FilePath: /swx/src/pages/my/index.vue
  * @Description: 我的页面
 -->
@@ -145,7 +145,7 @@ import "./index.less";
 import { $ } from '@tarojs/extend'
 import mixin from '@/utils/mixin';
 import { infoUserAPI } from '@/api/User/index';
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 export default {
   name: "myPage",
@@ -175,7 +175,7 @@ export default {
   },
   methods: {
     formatDate (date) {
-      return dayjs(date).format('YYYY-MM-DD HH:mm')
+      return moment(date).format('YYYY-MM-DD HH:mm')
     },
   }
 };
--- a/src/pages/myCreateActivity/index.vue
View file @95efbb9
+++ b/src/pages/myCreateActivity/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 15:17:17
+ * @LastEditTime: 2022-10-31 17:16:06
  * @FilePath: /swx/src/pages/myCreateActivity/index.vue
  * @Description: 创建的活动页面
 -->
@@ -118,7 +118,7 @@ import { $ } from '@tarojs/extend'
 import mixin from '@/utils/mixin';
 import { getCurrentPageParam } from "@/utils/weapp";
 import { hostListAPI } from '@/api/Host/index'
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 import { addListAPI, endActivityAPI, delActivityAPI, copyActivityAPI } from '@/api/Activity/index';
 import { hostStore } from '@/stores/host'
@@ -217,7 +217,7 @@ export default {
   },
   methods: {
     formatDate (date) {
-      return dayjs(date).format('YYYY-MM-DD HH:mm')
+      return moment(date).format('YYYY-MM-DD HH:mm')
     },
     onScrollToLower () {
       if(!this.flag){
@@ -258,21 +258,21 @@ export default {
       // '一个月之内', '三个月之内', '一年之内'
       let yearMonthDay = '';
       if (this.filter_time === '一个月之内') {
-        yearMonthDay = dayjs(this.server_time).subtract(1, 'month');
+        yearMonthDay = moment(this.server_time).subtract(1, 'month');
         this.defaultIndex = 1;
         this.status_type = '一个月之内';
       }
       if (this.filter_time === '三个月之内') {
-        yearMonthDay = dayjs(this.server_time).subtract(3, 'month');
+        yearMonthDay = moment(this.server_time).subtract(3, 'month');
         this.defaultIndex = 2;
         this.status_type = '三个月之内';
       }
       if (this.filter_time === '一年之内') {
-        yearMonthDay = dayjs(this.server_time).subtract(1, 'year');
+        yearMonthDay = moment(this.server_time).subtract(1, 'year');
         this.defaultIndex = 3;
         this.status_type = '一年之内';
       }
-      this.time_begin = `${dayjs(yearMonthDay).format('YYYY-MM-DD')} ${dayjs(this.server_time).format('HH:mm')}`;
+      this.time_begin = `${moment(yearMonthDay).format('YYYY-MM-DD')} ${moment(this.server_time).format('HH:mm')}`;
       this.time_end = this.server_time;
       if (this.filter_time === '全部') {
         this.time_begin = '';
--- a/src/pages/myFollowUser/index.vue
View file @95efbb9
+++ b/src/pages/myFollowUser/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-19 14:11:06
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-31 15:19:15
+ * @LastEditTime: 2022-10-31 17:15:17
  * @FilePath: /swx/src/pages/myFollowUser/index.vue
  * @Description: 陪伴的用户页面
 -->
@@ -122,10 +122,10 @@ import { $ } from '@tarojs/extend'
 import mixin from '@/utils/mixin';
 import { getCurrentPageParam } from "@/utils/weapp";
 import { hostListAPI } from '@/api/Host/index'
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 const formatDate = (date) => {
-  return dayjs(date).format('YYYY-MM-DD HH:mm')
+  return moment(date).format('YYYY-MM-DD HH:mm')
 }
 const onPhoneClick = (number) => {
@@ -229,7 +229,7 @@ export default {
   },
   methods: {
     formatDate (date) {
-      return dayjs(date).format('YYYY-MM-DD HH:mm')
+      return moment(date).format('YYYY-MM-DD HH:mm')
     },
     onScrollToLower () {
       if(!this.flag){
--- a/src/pages/userInfo/index.vue
View file @95efbb9
+++ b/src/pages/userInfo/index.vue
View file @95efbb9
 <!--
  * @Date: 2022-09-29 16:32:03
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-26 15:52:36
+ * @LastEditTime: 2022-10-31 17:16:24
  * @FilePath: /swx/src/pages/userInfo/index.vue
  * @Description: 用户资料
 -->
@@ -119,7 +119,7 @@ import "./index.less";
 import { infoMemberAPI } from '@/api/Member/index';
 import { getCurrentPageParam } from "@/utils/weapp";
 import mixin from '@/utils/mixin';
-import * as dayjs from 'dayjs'
+import moment from '@/utils/moment.min.js'
 export default {
   name: "userInfoPage",
@@ -182,7 +182,7 @@ export default {
       this.show_partner_popup = false;
     },
     formatDate (date) {
-      return dayjs(date).format('YYYY-MM-DD HH:mm')
+      return moment(date).format('YYYY-MM-DD HH:mm')
     }
   }
 };
--- a/src/utils/moment.min.js 0 → 100644
View file @95efbb9
+++ b/src/utils/moment.min.js 0 → 100644
View file @95efbb9
--- a/src/utils/tools.js
View file @95efbb9
+++ b/src/utils/tools.js
View file @95efbb9
 /*
  * @Date: 2022-04-18 15:59:42
  * @LastEditors: hookehuyr hookehuyr@gmail.com
- * @LastEditTime: 2022-10-18 14:55:28
+ * @LastEditTime: 2022-10-31 17:26:32
  * @FilePath: /swx/src/utils/tools.js
  * @Description: 文件描述
  */
-import dayjs from 'dayjs';
 import Taro from '@tarojs/taro'
+import moment from '@/utils/moment.min.js'
 // 格式化时间
 const formatDate = (date) => {
-  return dayjs(date).format('YYYY-MM-DD HH:mm');
+  return moment(date).format('YYYY-MM-DD HH:mm')
 };
 /**