Merge branch 'feature/detailHeader' into 'release/6.9.6'
Feature/detail header See merge request !99
Showing
3 changed files
with
14 additions
and
1 deletions
@@ -60,6 +60,16 @@ export default { | @@ -60,6 +60,16 @@ export default { | ||
60 | followUid: this.authorUid, | 60 | followUid: this.authorUid, |
61 | status: this.followStatus ? 1 : 0, | 61 | status: this.followStatus ? 1 : 0, |
62 | authorType: this.authorType | 62 | authorType: this.authorType |
63 | + }).then(res => { | ||
64 | + if (res.code === 200 && !this.followStatus) { | ||
65 | + this.$createToast && this.$createToast({ | ||
66 | + txt: '关注成功', | ||
67 | + type: 'txt', | ||
68 | + time: 1000 | ||
69 | + }).show(); | ||
70 | + } | ||
71 | + | ||
72 | + return res; | ||
63 | }); | 73 | }); |
64 | } | 74 | } |
65 | }, | 75 | }, |
@@ -313,6 +313,7 @@ export default { | @@ -313,6 +313,7 @@ export default { | ||
313 | article.local = local; | 313 | article.local = local; |
314 | 314 | ||
315 | if (local) { | 315 | if (local) { |
316 | + article.hasComment = true; | ||
316 | article.authorHeadIco = article.authorHeadIco.replace(/^https?:/, ''); | 317 | article.authorHeadIco = article.authorHeadIco.replace(/^https?:/, ''); |
317 | } | 318 | } |
318 | 319 | ||
@@ -420,6 +421,9 @@ export default { | @@ -420,6 +421,9 @@ export default { | ||
420 | 421 | ||
421 | if (topicList.length) { | 422 | if (topicList.length) { |
422 | topicList.forEach(val => { | 423 | topicList.forEach(val => { |
424 | + if (/imageView/.test(val.topicImageUrl) && !/format/.test(val.topicImageUrl)) { | ||
425 | + val.topicImageUrl += '/format/jpg'; | ||
426 | + } | ||
423 | state.topicList.push(val); | 427 | state.topicList.push(val); |
424 | }) | 428 | }) |
425 | } | 429 | } |
@@ -24,7 +24,6 @@ function processArticleListData(listData) { | @@ -24,7 +24,6 @@ function processArticleListData(listData) { | ||
24 | templateKey: 'text', | 24 | templateKey: 'text', |
25 | } | 25 | } |
26 | ], | 26 | ], |
27 | - hasComment: true, | ||
28 | commentCount: 0, | 27 | commentCount: 0, |
29 | comments: [], | 28 | comments: [], |
30 | dataType: listData.dataType, | 29 | dataType: listData.dataType, |
-
Please register or login to post a comment