SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

wangfei 6 years ago
parent
efc2219e70 ecf586d841
commit
c315f0b364
4 changed files with 22 additions and 16 deletions
Unified View Show Diff Stats
  1. 1
    1
      dist/index.html
  2. 6
    0
      src/pages/system/cardAndCouponManager/couponManager/edit.vue
  3. 1
    1
      src/pages/system/courseManager/courseList/index.vue
  4. 14
    14
      src/pages/system/page.js

+ 1
- 1
dist/index.html View File

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.8aa2dac72d3912673a3cbcb45c0b9b26.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.196328bf2a5080433653.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 View File

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

+ 1
- 1
src/pages/system/courseManager/courseList/index.vue View File

255 
     }
255 
     }
256 
   },
256 
   },
257 
   mounted () {
257 
   mounted () {
258 
-    this.updateLocationInfo({ pagesize: 100 })
258 
+    this.updateLocationInfo({ issys: 0, pagesize: 100 })
259 
     this.$nextTick(function () {
259 
     this.$nextTick(function () {
260 
       this.getList()
260 
       this.getList()
261 
     })
261 
     })

+ 14
- 14
src/pages/system/page.js View File

630 
             component: activateVip,
630 
             component: activateVip,
631 
             children: []
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 
       }, { // 健康管理