Merge branch 'master' of http://114.67.93.201/xulili/ybf

wx_application/src/views/active/activeDetail.vue

@@ -62,7 +62,7 @@
             autosize
             type="textarea"
             show-word-limit
-            :disabled="false"
+            :disabled="true"
           />
         </div>
         <div class="time-line">
@@ -277,8 +277,8 @@ export default {
         }
         if (this.active_type === "wheel") {
           let cur_date = new Date();
-          let end_time = new Date(this.timeLine);
-          if (end_time - cur_date > 0) {
+          let end_time = new Date(this.timeLine)|| Date.parse(this.timeLine.replace(/-/g, '/'));
+          if (end_time > cur_date) {
             this.timer = setInterval(() => {
               CoutDown(this.timeLine);
             }, 1000);

wx_application/src/views/active/createBigWheelActive.vue

@@ -20,7 +20,7 @@
               v-model="basicInfo.startTime1"
               placeholder="请选择开始时间"
               readonly="readonly"
-              @click="basicInfo.startShow = true"
+              @click="openStartTime"
             />
             <van-popup v-model="basicInfo.startShow" position="bottom" :overlay="true">
               <van-datetime-picker
@@ -43,7 +43,7 @@
               v-model="basicInfo.endTime1"
               placeholder="请选择结束时间"
               readonly="readonly"
-              @click="basicInfo.endShow = true"
+              @click="openEndTime"
             />
             <van-popup v-model="basicInfo.endShow" position="bottom" :overlay="true">
               <van-datetime-picker
@@ -351,10 +351,16 @@ export default {
     };
   },
   created() {
+  },
+  methods: {
+    openStartTime() {
+      this.basicInfo.startShow = true;
       this.minStartDate = new Date();
+    },
+    openEndTime() {
+      this.basicInfo.endShow = true;
       this.minEndDate = new Date();
     },
-  methods: {
     // 获取模板数据
     getTemplateDate(id) {
       API_Active.getTemplateData(id).then(res => {