|
@@ -194,7 +194,8 @@ var vm = new Vue({
|
|
}
|
|
}
|
|
this.subPageMove()
|
|
this.subPageMove()
|
|
if(firstTime) {
|
|
if(firstTime) {
|
|
- firstTime = firstTime / 1000 +'_'+ firstTime / 1000;
|
|
|
|
|
|
+ const pushtime = this.calcDateTime(firstTime / 1000)
|
|
|
|
+ firstTime = pushtime.start / 1000 + '_' + pushtime.end / 1000
|
|
this.time = firstTime
|
|
this.time = firstTime
|
|
this.setPushTime(firstTime)
|
|
this.setPushTime(firstTime)
|
|
}else {
|
|
}else {
|
|
@@ -203,10 +204,10 @@ var vm = new Vue({
|
|
// console.log(this.selectPro, '用户身份');
|
|
// console.log(this.selectPro, '用户身份');
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
- var recover = this.recover()
|
|
|
|
// 判断是否推送消息进入,清空缓存值,显示底部导航
|
|
// 判断是否推送消息进入,清空缓存值,显示底部导航
|
|
try {
|
|
try {
|
|
if (pushUrlTime) {
|
|
if (pushUrlTime) {
|
|
|
|
+ sessionStorage.removeItem(this.sessStorageKey)
|
|
this.setPushTime(pushUrlTime + '_' + pushUrlTime)
|
|
this.setPushTime(pushUrlTime + '_' + pushUrlTime)
|
|
this.revorceOtherData()
|
|
this.revorceOtherData()
|
|
JyObj.hiddenBottom("1")
|
|
JyObj.hiddenBottom("1")
|
|
@@ -214,6 +215,7 @@ var vm = new Vue({
|
|
} catch (e) {
|
|
} catch (e) {
|
|
console.log(e)
|
|
console.log(e)
|
|
}
|
|
}
|
|
|
|
+ var recover = this.recover()
|
|
if (!recover) {
|
|
if (!recover) {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
// 如果订阅消息进来时间不为空
|
|
// 如果订阅消息进来时间不为空
|
|
@@ -523,13 +525,22 @@ var vm = new Vue({
|
|
this.showSuperVipDialog()
|
|
this.showSuperVipDialog()
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- // 订阅推送消息展示数据
|
|
|
|
- setPushTime: function(time) {
|
|
|
|
- // console.log(time)
|
|
|
|
|
|
+ calcDateTime: function (time) {
|
|
|
|
+ // @tip 调用时间选择组件函数格式化时间
|
|
|
|
+ const endTime = parseInt(String(time).split('_')[0] * 1000)
|
|
|
|
+
|
|
let pushtime = {
|
|
let pushtime = {
|
|
- start: parseInt(time.split('_')[0] * 1000),
|
|
|
|
- end: parseInt(time.split('_')[0] * 1000),
|
|
|
|
|
|
+ start: endTime,
|
|
|
|
+ end: endTime,
|
|
|
|
+ }
|
|
|
|
+ if (typeof dateComponent.methods.calcNotExactTime === 'function') {
|
|
|
|
+ pushtime = dateComponent.methods.calcNotExactTime('today', endTime)
|
|
}
|
|
}
|
|
|
|
+ return pushtime
|
|
|
|
+ },
|
|
|
|
+ // 订阅推送消息展示数据
|
|
|
|
+ setPushTime: function(time) {
|
|
|
|
+ const pushtime = this.calcDateTime(time)
|
|
this.tagText.timeText = new Date(pushtime.end).pattern('yyyy.MM.dd')
|
|
this.tagText.timeText = new Date(pushtime.end).pattern('yyyy.MM.dd')
|
|
this.selectDate.startDate = pushtime.start
|
|
this.selectDate.startDate = pushtime.start
|
|
this.selectDate.endDate= pushtime.end
|
|
this.selectDate.endDate= pushtime.end
|