diff --git a/apps/common/open-app.js b/apps/common/open-app.js index 7191e7c..11168d3 100644 --- a/apps/common/open-app.js +++ b/apps/common/open-app.js @@ -13,7 +13,9 @@ function queryString() { const getAppPath = () => { let params = queryString(); + let openbyYohobuy = params['openby:yohobuy'] || ''; + let appPath = ''; if (openbyYohobuy) { diff --git a/apps/components/comments/comment-placeholder-actionsheet.vue b/apps/components/comments/comment-placeholder-actionsheet.vue index 9b85d87..911d956 100644 --- a/apps/components/comments/comment-placeholder-actionsheet.vue +++ b/apps/components/comments/comment-placeholder-actionsheet.vue @@ -35,6 +35,7 @@ export default { const commentId = this.$attrs['dest-id']; const articleId = this.$attrs['article-id']; const commentType = this.$attrs.commentType; + let menu = []; if (authorUid === uid || commentUid === uid) { diff --git a/apps/pages/article/article-detail.vue b/apps/pages/article/article-detail.vue index 7dd3771..31dd3d5 100644 --- a/apps/pages/article/article-detail.vue +++ b/apps/pages/article/article-detail.vue @@ -402,6 +402,7 @@ export default { */ article = JSON.parse(JSON.stringify(article)); // 防止直接修改vuex数据,拷贝一份数据副本 let text = article.blockList[1].contentData, str = ''; + let atUserInfo = article.atUserInfo; Object.keys(atUserInfo).forEach((key) => { diff --git a/apps/pages/article/components/article/article-item2.vue b/apps/pages/article/components/article/article-item2.vue index d4bc297..a7f5fb7 100644 --- a/apps/pages/article/components/article/article-item2.vue +++ b/apps/pages/article/components/article/article-item2.vue @@ -145,6 +145,7 @@ export default { toArticlePage() { if (this.isMiniapp()) { let url = `http://m.yohobuy.com/grass/article/${this.data.articleId}`; + let h5url = `http://m.yohobuy.com?openby:yohobuy={"action":"go.h5","params":{"h5back":"${encodeURIComponent(url)}"}}`; /* eslint-disable-next-line */ diff --git a/apps/pages/userpage/components/author.vue b/apps/pages/userpage/components/author.vue index 65ea44b..9043ea1 100644 --- a/apps/pages/userpage/components/author.vue +++ b/apps/pages/userpage/components/author.vue @@ -380,6 +380,7 @@ export default { let destIndex = numString.length - 4; let destString = numString.substring(0, destIndex); + let subString = numString.substring(destIndex, destIndex + 1); if (subString !== '0') { diff --git a/apps/utils/share-handler.js b/apps/utils/share-handler.js index 1147edd..475a778 100644 --- a/apps/utils/share-handler.js +++ b/apps/utils/share-handler.js @@ -15,6 +15,7 @@ function _version2num(version) { // eslint-disable-next-line no-unused-vars function versionCompare(left, right) { let leftNum = _version2num(left); + let rightNum = _version2num(right); if (leftNum === rightNum) { @@ -50,6 +51,7 @@ const filterEmoji = text => { // eslint-disable-next-line no-unused-vars const getDetailShareData = (article, app_version = '6.9.11') => { let shareImage = ''; + let desc = ''; if (article.sort === 2) { @@ -81,6 +83,7 @@ const getDetailShareData = (article, app_version = '6.9.11') => { // eslint-disable-next-line no-unused-vars const requiredVersion = '6.9.11'; + let hideType = ['7', '8', '9']; if (versionCompare(app_version, requiredVersion) >= 0) { diff --git a/doraemon/middleware/ssr.js b/doraemon/middleware/ssr.js index 8f0a93b..44e96b9 100644 --- a/doraemon/middleware/ssr.js +++ b/doraemon/middleware/ssr.js @@ -16,7 +16,9 @@ const config = global.yoho.config; const isDev = process.env.NODE_ENV === 'development' || !process.env.NODE_ENV; let renderer; + let serverBundle; + let degradeHtml; const hbs = fs.readFileSync(path.join(__dirname, '../views/index.hbs'), 'utf-8'); @@ -123,6 +125,7 @@ const getChannel = (yoho) => { const getCacheKey = (req, route) => { const urlObj = url.parse(req.url); + let ck = urlObj.pathname; if (route.query) { @@ -177,10 +180,14 @@ const render = (route) => { return handlerError(err, req, res, next); } let styles = context.renderStyles(); + let scripts = context.renderScripts(); + let resources = context.renderResourceHints(); const states = context.renderState(); + let asyncScripts; + let zk = { asyncJs: _.get(req.app.locals.wap, 'webapp.ios-async-js', true) };