templates
/
mall-admin-web
mirror of https://gitee.com/macrozheng/mall-admin-web.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

活动列表活动状态问题修复

master
macro 6 months ago
parent
e347d088f1
commit
687598e27c
4 changed files with 8 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/icons/svg/cms-subject.svg
  2. 1
      src/icons/svg/cms-topic.svg
  3. 1
      src/icons/svg/cms.svg
  4. 8
      src/views/sms/flash/index.vue

1
src/icons/svg/cms-subject.svg
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711961148008" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6146" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M147.2 489.6l73.6-44.8 291.2 176 291.2-176 73.6 44.8L512 710.4 147.2 489.6z m0-144L512 147.2l364.8 198.4L512 544 147.2 345.6zM512 787.2l291.2-176 73.6 44.8L512 876.8 147.2 656l73.6-44.8 291.2 176z" p-id="6147"></path></svg>

1
src/icons/svg/cms-topic.svg
File diff suppressed because it is too large
View File

1
src/icons/svg/cms.svg
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1711961668062" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8320" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M809.90296081 933.875H214.09703919c-66.61184189 0-122.12171026-55.50986838-122.12171027-122.12171026V212.24671027C91.97532892 145.63486838 147.4851973 90.125 214.09703919 90.125h595.80592162c66.61184189 0 122.12171026 55.50986838 122.12171027 122.12171026v599.50657947c0 66.61184189-51.80921054 122.12171026-122.12171027 122.12171027zM214.09703919 141.93421054c-40.70723703 0-70.31249973 33.30592136-70.31249973 70.31249972v599.50657947c0 40.70723703 33.30592136 70.31249973 70.31249973 70.31249973h595.80592162c40.70723703 0 70.31249973-33.30592136 70.31249973-70.31249973V212.24671027c0-40.70723703-33.30592136-70.31249973-70.31249973-70.31249973H214.09703919z" p-id="8321"></path><path d="M750.6924346 323.26644702H277.00822407c-14.80263135 0-25.90460486-11.10197351-25.90460569-25.90460486s11.10197351-25.90460486 25.90460568-25.90460568h473.68421054c14.80263135 0 25.90460486 11.10197351 25.90460486 25.90460568s-11.10197351 25.90460486-25.90460486 25.90460487zM580.46217081 515.70065784H277.00822407c-14.80263135 0-25.90460486-11.10197351-25.90460569-25.90460486s11.10197351-25.90460486 25.90460568-25.90460568h307.15460458c14.80263135 0 25.90460486 11.10197351 25.90460568 25.90460567s-14.80263135 25.90460486-29.60526351 25.90460487zM750.6924346 711.83552649H277.00822407c-14.80263135 0-25.90460486-11.10197351-25.90460569-25.90460568s11.10197351-25.90460486 25.90460568-25.90460486h473.68421054c14.80263135 0 25.90460486 11.10197351 25.90460486 25.90460486s-11.10197351 25.90460486-25.90460486 25.90460568z" p-id="8322"></path></svg>

8
src/views/sms/flash/index.vue
View File

@ -166,10 +166,12 @@
},
filters: {
formatActiveStatus(row) {
let nowTime = new Date().getTime();
if (nowTime >= row.startDate && nowTime <= row.endDate) {
let nowDate = new Date();
let startDate = new Date(row.startDate);
let endDate = new Date(row.endDate);
if (nowDate.getTime() >= startDate.getTime() && nowDate.getTime() <= endDate.getTime()) {
return '活动进行中';
} else if (nowTime > row.endDate) {
} else if (nowDate.getTime() > endDate.getTime()) {
return '活动已结束';
} else {
return '活动未开始';

Write Preview
Loading…
Cancel
Save