Merge branch 'feature/0515' into 'release/6.9.4'

Feature/0515



See merge request !76

@@ -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,

@@ -68,7 +68,7 @@ export default {
   props: {
     title: {
       type: String,
-      default: '逛'
+      default: '有货社区'
     },
     share: Boolean,
     type: String,

@@ -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}`);