Commit ba63b1c1 authored by Xuguangxing's avatar Xuguangxing

feat: 获取服务器时间改为接口获取,并对比活动时间

parent b427abc1
...@@ -39,5 +39,8 @@ export default { ...@@ -39,5 +39,8 @@ export default {
}, { }, {
customHeader customHeader
}); });
} },
getServerTime() {
return http.get(`${config.apiHost}/editor/getServerTime`);
},
}; };
\ No newline at end of file
...@@ -145,21 +145,22 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -145,21 +145,22 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
} }
async created() { async created() {
const [res, ] = await editorApi.getFinanceSetting(); const [res, ] = await editorApi.getFinanceSetting();
const [serverTime, ] = await editorApi.getServerTime();
console.log(res, 'finance result'); console.log(res, 'finance result');
console.log(serverTime, 'time');
if (res && res.showFlag === 0) { if (res && res.showFlag === 0) {
this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'freedom-container' || !v.props.isFinance); this.pageData.elements = this.pageData.elements.filter(v => v.name !== 'freedom-container' || !v.props.isFinance);
} }
this.comparePageTime(); // 验证活动是否在设定的有效期范围内 this.comparePageTime(serverTime); // 验证活动是否在设定的有效期范围内
} }
comparePageTime() { comparePageTime(serverTime) {
const { validStartTime, validEndTime } = this.pageInfo; const { validStartTime, validEndTime } = this.pageInfo;
// 获取服务器端当前时间,用于与页面有效期做对比 // 获取服务器端当前时间,用于与页面有效期做对比
const currentTime = new Date().getTime();
if (validStartTime && validEndTime) { if (validStartTime && validEndTime) {
// todo 当设置了页面的有效时间起止,用当前服务器返回的时间作对比,判断页面是否在有效期内 // 当设置了页面的有效时间起止,用当前服务器返回的时间作对比,判断页面是否在有效期内
const startTime = new Date(validStartTime).getTime(); // const startTime = new Date(validStartTime).getTime();
const endTime = new Date(validEndTime).getTime(); const endTime = new Date(validEndTime).getTime();
if (currentTime < startTime || currentTime > endTime) { if (serverTime > endTime) {
this.pageInvalid = true; this.pageInvalid = true;
} }
} }
......
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