Commit ae59bdda authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com

Merge branch 'V1.6.9_feature' into develop

parents d3b0f5df 61fb9e96
...@@ -450,14 +450,15 @@ ...@@ -450,14 +450,15 @@
} }
}, },
mounted() { mounted() {
if(new Date().getTime()<=new Date('2022/06/30').getTime()){ // if(new Date().getTime()<=new Date('2022/06/30').getTime()){
this.isOpen=true; // this.isOpen=true;
this.memberInfo.invalidDateStr='2022年6月30日'; // this.memberInfo.invalidDateStr='2022年6月30日';
this.memberInfo.differDay=dayjs('2022/06/30').diff(dayjs(),'day'); // this.memberInfo.differDay=dayjs('2022/06/30').diff(dayjs(),'day');
this.containerHeight = 4200; // this.containerHeight = 4200;
}else{ // }else{
// this.queryIsDredgeMember();
// }
this.queryIsDredgeMember(); this.queryIsDredgeMember();
}
let tmpArr = [] let tmpArr = []
// 获取时间 // 获取时间
for (let i = 0; i <= 11; i++) { for (let i = 0; i <= 11; i++) {
......
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