Merge branch 'feature/9月3.0迭代' of http://git.gicdev.com/gic-web/shareConfig

src/components/active-config/base-config.vue

@@ -134,7 +134,7 @@ import moment from 'moment'
 export default {
   name: 'base-config',
   props: {
-    endDate: {
+    dueDate: {
       type: Number,
       default: new Date().getTime()
     }
@@ -160,8 +160,8 @@ export default {
         callback(new Error('请选择开始日期'));
       } else if(!value[1]) {
         callback(new Error('请选择结束日期'));
-      } else if(value[1]&&new Date(this.activeInfoData.endDate).getTime()> this.endDate){
-        callback(new Error(`您的分享有礼功能${moment(this.endDate).format('YYYY年MM月DD日')}到期，活动结束时间无法超过该日期。`));
+      } else if(value[1]&&new Date(this.activeInfoData.endDate).getTime()> this.dueDate){
+        callback(new Error(`您的分享有礼功能${moment(this.dueDate).format('YYYY年MM月DD日')}到期，活动结束时间无法超过该日期。`));
       } else {
         callback();
       }
@@ -214,9 +214,6 @@ export default {
       pickerOptionsStart: {
         disabledDate: time => {
           let disabled = time.getTime() < Date.now() - 8.64e7;
-          // if(this.activeInfoData.endDate) {
-          //   disabled = disabled || (time.getTime() > new Date(this.activeInfoData.endDate).getTime());
-          // }
           return disabled;
         }
       },

src/view/activeConfig/index.vue

@@ -21,7 +21,7 @@
         <div class="step-body">
           <base-config
             v-if="activeStep == '1'"
-            :endDate="dueData.endDate"
+            :dueDate="dueData.endDate"
             @submitNext="submitNext"
           ></base-config>
           <center-config