Authored by 杨延青

Merge branch 'feature/0430' into 'release/6.9.2'

ssr immersed head



See merge request !66
... ... @@ -121,13 +121,11 @@ export default {
setWxShareData();
}
setTimeout(function() {
window.setShareInfo({
title: shareData.title,
summary: shareData.desc,
pic: shareData.imgUrl,
url: shareData.link
});
}, window.setShareInfo ? 0 : 300);
window.setShareInfo && window.setShareInfo({
title: shareData.title,
summary: shareData.desc,
pic: shareData.imgUrl,
url: shareData.link
});
}
}
... ...
... ... @@ -700,4 +700,12 @@ button {
.invisible {
visibility: hidden;
}
\ No newline at end of file
}
.immerse-body .layout-header-wrap {
padding-top: 22PX;
}
.immerse-body-high .layout-header-wrap {
padding-top: 44PX;
}
... ...
... ... @@ -81,6 +81,31 @@ const getUserProfile = async(req, res, next) => {
next();
}
const versionToNumber = (str, len = 3) => {
let verNum = 0;
const ver = str.split('.').map(i => Number(i));
for (let i = 0; i < len; i++) {
verNum += (ver[i] || 0) * Math.pow(100, len - i - 1);
}
return verNum;
}
const getImmersedStatus = (req) => {
let status = false;
if (req.yoho.isYohoApp && req.yoho.isiOS) {
let appVersion = req.cookies.app_version || req.query.app_version;
if (appVersion && versionToNumber(appVersion) >= versionToNumber('6.9.2')) {
status = true;
}
}
return status;
}
const getContext = (req) => {
return {
url: req.url,
... ... @@ -190,7 +215,8 @@ const render = (route) => {
resources,
states,
zk,
routeHash: routeEncode.getRouter(req)
routeHash: routeEncode.getRouter(req),
needImmersed: getImmersedStatus(req)
});
if (config.useCache && route.cache && ck) {
... ... @@ -262,7 +288,8 @@ const devRender = (route) => {
scripts,
resources,
states,
routeHash: routeEncode.getRouter(req)
routeHash: routeEncode.getRouter(req),
needImmersed: getImmersedStatus(req)
});
if (config.useCache && route.cache && ck) {
... ...
... ... @@ -23,6 +23,11 @@
</script>
</head>
<body>
{{#if needImmersed}}
<script type="text/javascript">
(function(d){var e=d.documentElement,n=(e.clientHeight/e.clientWidth)>2.1?'-high':'';d.getElementsByTagName("body")[0].className="immerse-body" + n})(document);
</script>
{{/if}}
{{{html}}}
<div id="degrade-app"></div>
<div id="main-wrap">
... ...