Merge branch 'master' into feature/share

# Conflicts:
#	package.json

 <template>
 <template>
   <Layout class="article-detail">
   <Layout class="article-detail">
-    <ArticleDetailHeader ref="header" class="article-detail-header" v-if="!share" :data="articleInfo" :step="headerAnimateStep" :title-step="headerTitleAnimateStep">
+    <ArticleDetailHeader ref="header" class="article-detail-header" v-show="!share" :data="articleInfo" :step="headerAnimateStep" :title-step="headerTitleAnimateStep">
       <div v-if="articleInfo.articleId && !articleInfo.empty" class="title-main">
       <div v-if="articleInfo.articleId && !articleInfo.empty" class="title-main">
         <div class="title-info" :style="`transform: translate3d(0, ${viewMoreArticles ? '-50%' : '0'}, 0)`">
         <div class="title-info" :style="`transform: translate3d(0, ${viewMoreArticles ? '-50%' : '0'}, 0)`">
           <ArticleItemHeader class="title-info-author" :share="share" :data="authorData" :more="false" @on-follow="onFollowAuthor"></ArticleItemHeader>
           <ArticleItemHeader class="title-info-author" :share="share" :data="authorData" :more="false" @on-follow="onFollowAuthor"></ArticleItemHeader>

 <template>
 <template>
   <div ref="intro" class="intro-wrap" :class="introClass" :style="introStyle" @click="onExpanding">
   <div ref="intro" class="intro-wrap" :class="introClass" :style="introStyle" @click="onExpanding">
-    <div class="context-title">{{this.data.articleTitle}}</div>
     <div v-if="trimIntro" class="intro-content">
     <div v-if="trimIntro" class="intro-content">
       <p class="pre-wrap" @click="toUserPage" v-html="introDecorator"></p>
       <p class="pre-wrap" @click="toUserPage" v-html="introDecorator"></p>
       <div ref="introPool" class="intro-pool pre-wrap" v-if="!introHeight" v-html="trimIntroDecorator" >
       <div ref="introPool" class="intro-pool pre-wrap" v-if="!introHeight" v-html="trimIntroDecorator" >
@@ -206,16 +205,6 @@ export default {
     overflow: hidden;
     overflow: hidden;
     transition: height 250ms cubic-bezier(0.165, 0.84, 0.44, 1);
     transition: height 250ms cubic-bezier(0.165, 0.84, 0.44, 1);
 
 
-    .context-title {
-      font-size: 36px;
-      color: #222;
-      line-height: 56px;
-      margin-top: 10px;
-      margin-bottom: 16px;
-      letter-spacing: 0.68px;
-      font-weight: bolder;
-    }
-
     .intro-content {
     .intro-content {
       line-height: 1.7;
       line-height: 1.7;
       font-size: 32px;
       font-size: 32px;

@@ -11,6 +11,8 @@
       <ArticleItemSlide v-else :thumb="thumb" :share="share" :data="slideData" :slide-index="slideIndex" :lazy="lazy" @on-praise="onPraise" @change="onChangeSlide"></ArticleItemSlide>
       <ArticleItemSlide v-else :thumb="thumb" :share="share" :data="slideData" :slide-index="slideIndex" :lazy="lazy" @on-praise="onPraise" @change="onChangeSlide"></ArticleItemSlide>
       <ProductGroup name="articleTwoColumn" :article-id="data.articleId" :pos-id="0" :index="0" :thumb="thumb" v-if="productListData.length" :share="share" :data="productListData" :lazy="lazy"></ProductGroup>
       <ProductGroup name="articleTwoColumn" :article-id="data.articleId" :pos-id="0" :index="0" :thumb="thumb" v-if="productListData.length" :share="share" :data="productListData" :lazy="lazy"></ProductGroup>
 
 
+      <div class="context-title">{{data.articleTitle}}</div>
+
       <ArticleDetailIntro :data="introData" :pos-id="posId"></ArticleDetailIntro>
       <ArticleDetailIntro :data="introData" :pos-id="posId"></ArticleDetailIntro>
       <ArticleItemTopics :data="topicsData" :share="share"></ArticleItemTopics>
       <ArticleItemTopics :data="topicsData" :share="share"></ArticleItemTopics>
 
 
@@ -168,6 +170,17 @@ export default {
   align-items: center;
   align-items: center;
 }
 }
 
 
+.context-title {
+  font-size: 36px;
+  color: #222;
+  line-height: 56px;
+  margin-top: 10px;
+  margin-bottom: 16px;
+  letter-spacing: 0.68px;
+  font-weight: bolder;
+  padding: 0 30px;
+}
+
 .publish-time {
 .publish-time {
   font-size: 24px;
   font-size: 24px;
   color: #b0b0b0;
   color: #b0b0b0;

 <template>
 <template>
   <div>
   <div>
     <Layout ref="layout" class="article">
     <Layout ref="layout" class="article">
-      <TopicHeader ref="header" :title="topicTitle" v-if="!share" :step="headerAnimateStep" :data="topicSimpleInfo" :share="share" @on-follow="onFollowTopic">
+      <TopicHeader ref="header" :title="topicTitle" v-show="!share" :step="headerAnimateStep" :data="topicSimpleInfo" :share="share" @on-follow="onFollowTopic">
         <template v-if="tabBlockSuctionTop" v-slot:suctionTop>
         <template v-if="tabBlockSuctionTop" v-slot:suctionTop>
           <TopicTabBlock :active-type="activeTopicListType"  @on-change-tab="onChangeTab"></TopicTabBlock>
           <TopicTabBlock :active-type="activeTopicListType"  @on-change-tab="onChangeTab"></TopicTabBlock>
         </template>
         </template>

@@ -13,5 +13,17 @@
     text-align: center;
     text-align: center;
     border-radius: 10px !important;
     border-radius: 10px !important;
     right: 20px !important;
     right: 20px !important;
+    animation: none !important;
+  }
+
+  .download-go {
+    height: 72px !important;
+    width: 180px !important;
+    font-size: 32px !important;
+    line-height: 72px !important;
+    text-align: center;
+    border-radius: 10px !important;
+    right: 20px !important;
+    animation: none !important;
   }
   }
 }
 }

@@ -80,7 +80,8 @@ const getContext = (req) => {
 function getAppPath(req) {
 function getAppPath(req) {
   let appPathUrl = req.originalUrl.split('?')[0] || '';
   let appPathUrl = req.originalUrl.split('?')[0] || '';
   const query = Object.assign(req.query, {
   const query = Object.assign(req.query, {
-    headerid: -1
+    headerid: -1,
+    toplayoutByH5: 'Y'
   });
   });
 
 
   let appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.h5",' +
   let appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.h5",' +
@@ -90,6 +91,14 @@ function getAppPath(req) {
   return encodeURI(appPath);
   return encodeURI(appPath);
 }
 }
 
 
+function getShare(req) {
+  if ('share' in req.query) {
+    return req.query.share === 'true' ? true : false;
+  } else {
+    return true;
+  }
+}
+
 const handlerError = (err = {}, req, res, next) => {
 const handlerError = (err = {}, req, res, next) => {
   if (err.code === 404) {
   if (err.code === 404) {
     return res.redirect('/grass/error/404');
     return res.redirect('/grass/error/404');
@@ -194,7 +203,7 @@ const render = (route) => {
           resources,
           resources,
           states,
           states,
           zk,
           zk,
-          download: req.query.share ? true : false,
+          download: getShare(req),
           routeHash: routeEncode.getRouter(req),
           routeHash: routeEncode.getRouter(req),
           appPath: getAppPath(req)
           appPath: getAppPath(req)
         });
         });
@@ -267,7 +276,7 @@ const devRender = (route) => {
             resources,
             resources,
             states,
             states,
             routeHash: routeEncode.getRouter(req),
             routeHash: routeEncode.getRouter(req),
-            download: req.query.share ? true : false,
+            download: getShare(req),
             appPath: getAppPath(req)
             appPath: getAppPath(req)
           });
           });
 
 

 {
 {
   "name": "yoho-community-web",
   "name": "yoho-community-web",
-  "version": "6.9.8-beta100",
+  "version": "6.9.10-beta2",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {