Merge branch 'dev'

This commit is contained in:
daihh
2022-06-21 00:42:05 +08:00
5 changed files with 94 additions and 21 deletions

View File

@@ -400,25 +400,25 @@
this.loadBoeData(true);
// this.getLearning(); //这里应该是切换时再调用
//检查是否显示弹窗
let curTime = new Date();
curTime = parseInt(curTime.getTime() / 1000);
//console.log(curTime,'curTime');
let hasDlgTime = uni.getStorageSync('user_dlg_temp');
if (hasDlgTime) {
let lastTime = parseInt(hasDlgTime);
//console.log(lastTime,'lastTime2');
if (curTime > (lastTime + 24 * 60 * 60)) {
this.xuanShow = true;
//console.log('显示');
uni.setStorageSync('user_dlg_temp', curTime);
} else {
this.xuanShow = false;
this.showOneStady();
}
} else {
this.xuanShow = true;
uni.setStorageSync('user_dlg_temp', curTime);
}
// let curTime = new Date();
// curTime = parseInt(curTime.getTime() / 1000);
// //console.log(curTime,'curTime');
// let hasDlgTime = uni.getStorageSync('user_dlg_temp');
// if (hasDlgTime) {
// let lastTime = parseInt(hasDlgTime);
// //console.log(lastTime,'lastTime2');
// if (curTime > (lastTime + 24 * 60 * 60)) {
// this.xuanShow = true;
// //console.log('显示');
// uni.setStorageSync('user_dlg_temp', curTime);
// } else {
// this.xuanShow = false;
// this.showOneStady();
// }
// } else {
// this.xuanShow = true;
// uni.setStorageSync('user_dlg_temp', curTime);
// }
let $this = this;