|
@@ -1,5 +1,6 @@
|
|
|
import {
|
|
|
- getStorage
|
|
|
+ getStorage,
|
|
|
+ setStorage
|
|
|
} from '@/utils/localStorage';
|
|
|
window.sessionTime = new Date();
|
|
|
var util = {
|
|
@@ -157,7 +158,6 @@ var util = {
|
|
|
return
|
|
|
}
|
|
|
try {
|
|
|
- var session = Number(getStorage('sessionNumber')) + 1;
|
|
|
|
|
|
if(typeof (para.clkParams) == 'object'){
|
|
|
let obj = {
|
|
@@ -172,13 +172,14 @@ var util = {
|
|
|
}else{
|
|
|
pvCurPageParams = {};
|
|
|
}
|
|
|
- let urlObj = util.getUrlParams(location.href) || {};
|
|
|
- let brandId = urlObj.special_ID || urlObj.brandId || ''
|
|
|
+ let queryObj = getStorage('queryObj') ? JSON.parse(getStorage('queryObj')) : null;
|
|
|
+ let urlObj = queryObj || util.getUrlParams(location.href) || {};
|
|
|
+ let brandId = urlObj.special_ID || $config.brandId || ''
|
|
|
//在页面参数里面手动添加path参数
|
|
|
pvCurPageParams.brandId = brandId;
|
|
|
- pvCurPageParams.locusBehaviorName = para.locusBehaviorName || '';
|
|
|
- pvCurPageParams.locusValue = para.locusValue || '';
|
|
|
- pvCurPageParams.locusName = para.locusName || '';
|
|
|
+ pvCurPageParams.locusBehaviorName = para.locusBehaviorName || currentPage.locusBehaviorName || '';
|
|
|
+ pvCurPageParams.locusValue = para.locusValue || currentPage.locusValue || '';
|
|
|
+ pvCurPageParams.locusName = para.locusName || currentPage.locusName || '';
|
|
|
let data = {
|
|
|
session: '',
|
|
|
userAgent: navigator.userAgent.substring(0, 255) || '',
|
|
@@ -194,7 +195,7 @@ var util = {
|
|
|
createTime: this.formatTime(new Date()),
|
|
|
uploadTime: this.formatTime(new Date()),
|
|
|
product: 'h5', //iframeUrl代表是顾问分享的外链
|
|
|
- project: para.project || urlObj.xcxHouseId || '',
|
|
|
+ project: para.project || urlObj.xcxHouseId || $config.xcxHouseId || '',
|
|
|
brandId: brandId,
|
|
|
expand: JSON.stringify(urlObj), //扩展字段
|
|
|
imTalkId: para.imTalkId || '', //IM对话编号
|
|
@@ -205,7 +206,7 @@ var util = {
|
|
|
clkName: para.clkName || '',
|
|
|
pvId: para.pvId || '', //PV埋点ID
|
|
|
clkParams: typeof para.clkParams === 'object' ? JSON.stringify(para.clkParams) : (para.clkParams || ''), //点击参数
|
|
|
- pvCurPageName: para.pvCurPageName || '', //当前页面名称
|
|
|
+ pvCurPageName: para.pvCurPageName || currentPage.pvCurPageName || '', //当前页面名称
|
|
|
pvCurPageParams: typeof pvCurPageParams === 'object' ? JSON.stringify(pvCurPageParams) : (pvCurPageParams ||''), //当前页面参数
|
|
|
pvLastPageName: para.pvLastPageName || '', //上一页页面名称
|
|
|
pvLastPageParams: para.pvLastPageParams || '', //上一页页面参数
|
|
@@ -213,13 +214,14 @@ var util = {
|
|
|
type: para.type || '', //埋点类型
|
|
|
}
|
|
|
let timeNow = new Date().getTime();
|
|
|
- if (timeNow - sessionTime > 180000 && !from_session) {
|
|
|
+ let session = getStorage('sessionNumber') ? Number(getStorage('sessionNumber')) : timeNow;
|
|
|
+ if (timeNow - sessionTime > 180000 && !urlObj.session) {
|
|
|
// session++;
|
|
|
- getStorage('sessionNumber', session)
|
|
|
+ session = timeNow;
|
|
|
+ setStorage('sessionNumber', session)
|
|
|
}
|
|
|
- session = Number(getStorage('sessionNumber')) + 1;
|
|
|
- data.session = from_session || getStorage("cookie_id") + "_" + session || '';
|
|
|
- sessionTime = timeNow
|
|
|
+ data.session = urlObj.session || data.userId + "_" + session || '';
|
|
|
+ sessionTime = timeNow;
|
|
|
// return data;
|
|
|
// app.globalData.session_id = data.session
|
|
|
// app.globalData.sessionTime = timeNow;
|