fe / yohobuywap-node · Commits

Go to a project

Authored by 陈峰
Commit d523f1e8848dd726227799427e0be9cdb711f092 2 parents 9aaab5d5 cef43e74

Merge branch 'release/5.1' of http://git.yoho.cn/fe/yohobuywap-node into release/5.1

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -285,8 +285,8 @@ setTimeout(function() { @@ -285,8 +285,8 @@ setTimeout(function() {
285 SRC_ID: 5, 285 SRC_ID: 5,
286 ATTCT_RES: 1, 286 ATTCT_RES: 1,
287 FAILURE_CAUSE: '', 287 FAILURE_CAUSE: '',
288 - ATTCT_INFO: '{{info}}',  
289 - }).replace('{{info}}', localStorage.STUDENTCOOKIES), 288 + ATTCT_INFO: JSON.parse(localStorage.STUDENTCOOKIES),
  289 + }),
290 }, true); 290 }, true);
291 } 291 }
292 } else { 292 } else {
@@ -110,7 +110,7 @@ const formatArticle = (articleData, showTag, isApp, showAuthor, uid, reqQueryStr @@ -110,7 +110,7 @@ const formatArticle = (articleData, showTag, isApp, showAuthor, uid, reqQueryStr
110 // 编辑人员 app跳转url处理 20160601 110 // 编辑人员 app跳转url处理 20160601
111 let isLogin = uid ? true : false; 111 let isLogin = uid ? true : false;
112 112
113 - articleData.author.url = `${helpers.https(articleData.author.url)}&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"${articleData.author.author_id}"},"share":"","id":${articleData.author.author_id},"type":0,"islogin":"${isLogin} ","url":"https:${helpers.urlFormat('/author/index', {uid: uid}, 'guang')} "}}&uid=${uid}`; 113 + articleData.author.url = `${helpers.https(articleData.author.url)}&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"${articleData.author.author_id}"},"share":"","id":${articleData.author.author_id},"type":0,"islogin":"${isLogin}","url":"https:${helpers.urlFormat('/author/index', {uid: uid}, 'guang')} "}}&uid=${uid}`;
114 result.author = articleData.author; 114 result.author = articleData.author;
115 if (result.author.avatar) { 115 if (result.author.avatar) {
116 result.author.avatar = result.author.avatar.replace('http://', '//'); 116 result.author.avatar = result.author.avatar.replace('http://', '//');