Showing
3 changed files
with
17 additions
and
6 deletions
@@ -47,7 +47,11 @@ const editor = (req, res, next) => { | @@ -47,7 +47,11 @@ const editor = (req, res, next) => { | ||
47 | 47 | ||
48 | if (articleListData.data && articleListData.data.list && articleListData.data.list.artList) { | 48 | if (articleListData.data && articleListData.data.list && articleListData.data.list.artList) { |
49 | articleListData.data.list.artList.forEach(articleData => { | 49 | articleListData.data.list.artList.forEach(articleData => { |
50 | - articleData.reqPath = `${req.path}?id=${id}`; | 50 | + articleData.colparam = { |
51 | + urlpath: req.path, | ||
52 | + param: `?id=${id}` | ||
53 | + } | ||
54 | + | ||
51 | build.push(guangProcess.formatArticle(articleData, true, isApp, false, uid)); | 55 | build.push(guangProcess.formatArticle(articleData, true, isApp, false, uid)); |
52 | }); | 56 | }); |
53 | res.render('index/list', Object.assign({ | 57 | res.render('index/list', Object.assign({ |
@@ -290,9 +290,12 @@ const getTagEditor = (param) => { | @@ -290,9 +290,12 @@ const getTagEditor = (param) => { | ||
290 | 290 | ||
291 | let infoList = result[0].data.list.artList; | 291 | let infoList = result[0].data.list.artList; |
292 | infoList.forEach(val => { | 292 | infoList.forEach(val => { |
293 | - val.reqPath = param.path; | 293 | + val.colparam = { |
294 | + urlpath: param.path, | ||
295 | + param: '' | ||
296 | + } | ||
294 | if (param.tag) { | 297 | if (param.tag) { |
295 | - val.reqPath = `${val.reqPath}?query=${param.tag}`; | 298 | + val.colparam.param = `?query=${param.tag}`; |
296 | } | 299 | } |
297 | inf.push(guangProcess.formatArticle(val, true, param.isApp, true)); | 300 | inf.push(guangProcess.formatArticle(val, true, param.isApp, true)); |
298 | }); | 301 | }); |
@@ -80,13 +80,17 @@ const formatArticle = (articleData, showTag, isApp, showAuthor, uid, reqQueryStr | @@ -80,13 +80,17 @@ const formatArticle = (articleData, showTag, isApp, showAuthor, uid, reqQueryStr | ||
80 | if (isApp) { | 80 | if (isApp) { |
81 | result.collect = {}; | 81 | result.collect = {}; |
82 | result.collect.isCollected = articleData.isFavor === true; | 82 | result.collect.isCollected = articleData.isFavor === true; |
83 | - let originUrl = helpers.urlFormat(articleData.reqPath || '/author/index', null, 'guang'); // 跳转回的链接 | 83 | + let colparam = articleData.colparam || { |
84 | + urlpath: '', | ||
85 | + param: '' | ||
86 | + } | ||
87 | + let originUrl = helpers.urlFormat(colparam.urlpath || '/author/index', null, 'guang'); // 跳转回的链接 | ||
84 | let collectUrl = 'javascript:;'; // 根据用户是否登录做处理的链接 | 88 | let collectUrl = 'javascript:;'; // 根据用户是否登录做处理的链接 |
85 | 89 | ||
86 | if (!uid) { | 90 | if (!uid) { |
87 | - let playUrlEncode = originUrl.replace(/\//g, '\\\/'); | 91 | + let playUrlEncode = `${originUrl}${colparam.param}`.replace(/\//g, '\\\/'); |
88 | 92 | ||
89 | - collectUrl = `${originUrl}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http:${playUrlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; | 93 | + collectUrl = `${originUrl}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"${playUrlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; |
90 | } | 94 | } |
91 | result.collect.url = collectUrl; | 95 | result.collect.url = collectUrl; |
92 | } else { // 点赞 | 96 | } else { // 点赞 |
-
Please register or login to post a comment