Commit 6a318166 authored by xd's avatar xd

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

parents ce33d802 df8a7032
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
autosize autosize
type="textarea" type="textarea"
show-word-limit show-word-limit
:disabled="false" :disabled="true"
/> />
</div> </div>
<div class="time-line"> <div class="time-line">
...@@ -277,8 +277,8 @@ export default { ...@@ -277,8 +277,8 @@ export default {
} }
if (this.active_type === "wheel") { if (this.active_type === "wheel") {
let cur_date = new Date(); let cur_date = new Date();
let end_time = new Date(this.timeLine); let end_time = new Date(this.timeLine)|| Date.parse(this.timeLine.replace(/-/g, '/'));
if (end_time - cur_date > 0) { if (end_time > cur_date) {
this.timer = setInterval(() => { this.timer = setInterval(() => {
CoutDown(this.timeLine); CoutDown(this.timeLine);
}, 1000); }, 1000);
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
v-model="basicInfo.startTime1" v-model="basicInfo.startTime1"
placeholder="请选择开始时间" placeholder="请选择开始时间"
readonly="readonly" readonly="readonly"
@click="basicInfo.startShow = true" @click="openStartTime"
/> />
<van-popup v-model="basicInfo.startShow" position="bottom" :overlay="true"> <van-popup v-model="basicInfo.startShow" position="bottom" :overlay="true">
<van-datetime-picker <van-datetime-picker
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
v-model="basicInfo.endTime1" v-model="basicInfo.endTime1"
placeholder="请选择结束时间" placeholder="请选择结束时间"
readonly="readonly" readonly="readonly"
@click="basicInfo.endShow = true" @click="openEndTime"
/> />
<van-popup v-model="basicInfo.endShow" position="bottom" :overlay="true"> <van-popup v-model="basicInfo.endShow" position="bottom" :overlay="true">
<van-datetime-picker <van-datetime-picker
...@@ -351,10 +351,16 @@ export default { ...@@ -351,10 +351,16 @@ export default {
}; };
}, },
created() { created() {
},
methods: {
openStartTime() {
this.basicInfo.startShow = true;
this.minStartDate = new Date(); this.minStartDate = new Date();
},
openEndTime() {
this.basicInfo.endShow = true;
this.minEndDate = new Date(); this.minEndDate = new Date();
}, },
methods: {
// 获取模板数据 // 获取模板数据
getTemplateDate(id) { getTemplateDate(id) {
API_Active.getTemplateData(id).then(res => { API_Active.getTemplateData(id).then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment