许成详 6 年之前
父節點
當前提交
ecf586d841
共有 3 個檔案被更改,包括 21 行新增15 行删除
  1. 1
    1
      dist/index.html
  2. 6
    0
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  3. 14
    14
      src/pages/system/page.js

+ 1
- 1
dist/index.html 查看文件

@@ -1 +1 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.77252a6453e789a9834853d35fb711a7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.32151ec313c47e5594e8.js></script></body></html>
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><link rel="shortcut icon" href=favorite.ico><title>城的空间后台管理系统</title><link href=./static/css/app.24281c9dce9b5911b24df59ed26b4e33.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.5e77cc572b0a79633d6e.js></script></body></html>

+ 6
- 0
src/pages/system/cardAndCouponManager/couponManager/edit.vue 查看文件

@@ -453,6 +453,9 @@ export default {
453 453
                   this.couponInfo = aRes.coupon
454 454
                   if (aRes.coupon.StartDate === '0001-01-01T00:00:00Z' || aRes.coupon.StartDate === '') {
455 455
                     this.couponInfo.StartDate = ''
456
+                    this.TimeType = 2
457
+                  } else {
458
+                    this.TimeType = 1
456 459
                   }
457 460
                   if (aRes.coupon.EndDate === '0001-01-01T00:00:00Z' || aRes.coupon.EndDate === '') {
458 461
                     this.couponInfo.EndDate = ''
@@ -465,6 +468,9 @@ export default {
465 468
                 this.couponInfo = res.coupon
466 469
                 if (aRes.coupon.StartDate === '0001-01-01T00:00:00Z' || aRes.coupon.StartDate === '') {
467 470
                   this.couponInfo.StartDate = ''
471
+                  this.TimeType = 2
472
+                } else {
473
+                  this.TimeType = 1
468 474
                 }
469 475
                 if (aRes.coupon.EndDate === '0001-01-01T00:00:00Z' || aRes.coupon.EndDate === '') {
470 476
                   this.couponInfo.EndDate = ''

+ 14
- 14
src/pages/system/page.js 查看文件

@@ -630,20 +630,20 @@ export default {
630 630
             component: activateVip,
631 631
             children: []
632 632
           }]
633
-        }, { // 营销活动
634
-          path: 'marketingActivities',
635
-          name: 'marketingActivities',
636
-          component: marketingActivities,
637
-          children: [{
638
-            path: 'activitiesList',
639
-            name: 'activitiesList',
640
-            component: activitiesList,
641
-            children: [{ // 添加活动
642
-              path: 'addActivities',
643
-              name: 'addActivities',
644
-              component: addActivities,
645
-              children: []
646
-            }]
633
+        }]
634
+      }, { // 营销活动
635
+        path: 'marketingActivities',
636
+        name: 'marketingActivities',
637
+        component: marketingActivities,
638
+        children: [{
639
+          path: 'activitiesList',
640
+          name: 'activitiesList',
641
+          component: activitiesList,
642
+          children: [{ // 添加活动
643
+            path: 'addActivities',
644
+            name: 'addActivities',
645
+            component: addActivities,
646
+            children: []
647 647
           }]
648 648
         }]
649 649
       }, { // 健康管理