Merge branch 'release/6.9.4' into 'master'

Release/6.9.4



See merge request !78

@@ -90,7 +90,7 @@ export default {
           if (!this.title) {
             let first = get(result, 'data.detailList[0]');
 
-            this.title = `@${first.authorName} 在有货逛上发了一篇笔记，快点开看看！`;
+            this.title = `@${first.authorName} 在有货社区上发了一篇笔记，快点开看看！`;
 
             if (!this.$yoho.isApp) {
               let shareImage = '';

@@ -172,7 +172,7 @@ export default {
     },
     onShare() {
       this.$yoho.share({
-        title: `@${this.data.authorName} 在有货逛上发了一篇笔记，快点开看看！`,
+        title: `@${this.data.authorName} 在有货社区上发了一篇笔记，快点开看看！`,
         imgUrl: this.data.shareImage,
         link: `${location.origin}/grass/article/share/${this.data.articleId}`,
         desc: this.data.intro,

 <template>
   <div>
     <Layout class="article">
-      <LayoutHeader v-if="!noHeader" theme="white" slot='header' :title="title">
+      <LayoutHeader v-if="!noHeader" theme="white" slot='header'>
         <template v-if="showHeader">
           <div class="avatar-wrapper" @click="toUserPage">
             <WidgetAvatar class="widget-avatar" :src="currentAuthor.authorHeadIco" :width="70" :height="70"></WidgetAvatar>
             <span class="user-name">{{currentAuthor.authorName}}</span>
           </div>
         </template>
+        <template v-else>
+          <div class="article-title">{{title}}</div>
+        </template>
         <template v-if="showHeader" v-slot:opts>
           <WidgetFollow :share="share" class="widget-follow" :class="headerFollowClass" :author-uid="currentAuthor.authorUid" :follow="currentAuthor.hasAttention === 'Y'" @on-follow="follow => onFollow(currentAuthor, follow)" :pos-id="posId"></WidgetFollow>
           <i class="iconfont icon-more1" @click="onShowMore(currentAuthor)"></i>
@@ -68,7 +71,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: '逛'
+      default: '有货社区'
     },
     share: Boolean,
     type: String,
@@ -201,6 +204,10 @@ export default {
     onDounceScroll({item, scrollTop, startIndex}) {
       this.scrollTop = scrollTop;
 
+      if (item) {
+        this.reportShow(startIndex, item);
+      }
+
       // 产品要求去掉头部交互
       return;
 
@@ -230,8 +237,6 @@ export default {
         this.currentAuthor.index = item.index;
 
         this.showHeader = true;
-
-        this.reportShow(startIndex, item);
       }
     },
     init() {
@@ -358,6 +363,11 @@ export default {
   white-space: nowrap;
 }
 
+.article-title {
+  font-size: 34px;
+  font-weight: 500;
+}
+
 .icon-more1 {
   font-size: 40px!important;
   margin-right: 6px;

@@ -13,7 +13,9 @@ const checkRefer = helpers.urlFormat('/3party/check', {refer: replaceKey});
  * 服务器错误
  * @return {[type]}
  */
-exports.serverError = (err = {}, req, res, next) => { // eslint-disable-line
+exports.serverError = (err, req, res, next) => { // eslint-disable-line
+  err = err || {};
+
   logger.error(`error at path: ${req.url}`);
   logger.error(`${req.url},${typeof err === 'object' ? JSON.stringify(err) : err}`);