Merge branch 'feature/0430' into 'release/6.9.2'

Feature/0430



See merge request !48

@@ -102,9 +102,9 @@ export default {
   height: 180px;
   height: 180px;
   width: 580px;
   width: 580px;
   background-color: #fff;
   background-color: #fff;
-  border: 1px solid #f0f0f0;
   display: inline-block;
   display: inline-block;
   white-space: initial;
   white-space: initial;
+  overflow: hidden;
 
 
   &:last-child {
   &:last-child {
     margin-right: 50px;
     margin-right: 50px;
@@ -120,12 +120,12 @@ export default {
   align-items: center;
   align-items: center;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  overflow: hidden;
+  border: 1px solid #f0f0f0;
 }
 }
 
 
 .product-image {
 .product-image {
   width: 136px;
   width: 136px;
-  height: 180px;
+  height: 100%;
 }
 }
 
 
 .product-info {
 .product-info {
@@ -167,6 +167,7 @@ export default {
   align-items: center;
   align-items: center;
   color: #fff;
   color: #fff;
   letter-spacing: 0.2PX;
   letter-spacing: 0.2PX;
+  margin-right: -1px;
 }
 }
 
 
 .btn-buy {
 .btn-buy {

@@ -24,6 +24,10 @@ export default {
   props: ['data'],
   props: ['data'],
   computed: {
   computed: {
     headStyle() {
     headStyle() {
+      if (!this.data.topicImageUrl) {
+        return {};
+      }
+
       return {
       return {
         'background-image': `url(//${this.data.topicImageUrl.split('//')[1]})`
         'background-image': `url(//${this.data.topicImageUrl.split('//')[1]})`
       };
       };

@@ -66,7 +66,7 @@ export default {
     },
     },
     onShare() {
     onShare() {
       this.$yoho.share({
       this.$yoho.share({
-        title: this.data.topicName,
+        title: '#' + this.data.topicName,
         imgUrl: this.data.topicImageUrl,
         imgUrl: this.data.topicImageUrl,
         link: window.location.href.split('?')[0],
         link: window.location.href.split('?')[0],
         desc: this.data.topicDesc,
         desc: this.data.topicDesc,

@@ -49,6 +49,13 @@
         </template>
         </template>
       </LayoutRecycleList>
       </LayoutRecycleList>
 
 
+      <a v-if="publishUrl" class="publish-btn" :href="publishUrl">
+        <span class="avatar-block">
+          <WidgetAvatar class="avatar" :width="70" :height="70"></WidgetAvatar>
+        </span>
+        立即参与
+      </a>
+
     </Layout>
     </Layout>
     <ArticleActionSheet v-if="showArticleDetailAction" ref="actionSheet"></ArticleActionSheet>
     <ArticleActionSheet v-if="showArticleDetailAction" ref="actionSheet"></ArticleActionSheet>
     <YohoActionSheet transfer v-if="showCommentAction" ref="commentAction" :full="true">
     <YohoActionSheet transfer v-if="showCommentAction" ref="commentAction" :full="true">
@@ -124,11 +131,14 @@ export default {
       showMoreAction: true,
       showMoreAction: true,
       scrollTop: 0,
       scrollTop: 0,
       currentId: 0,
       currentId: 0,
-      colWidthForTwo: 0
+      colWidthForTwo: 0,
     };
     };
   },
   },
   computed: {
   computed: {
     ...mapState(['topicInfo']),
     ...mapState(['topicInfo']),
+    publishUrl() {
+      return this.topicId ? `?openby:yohobuy＝{"action":"go.grasspublish","params":{"topicId":"${this.topicId}","topicName":"${this.topicName}"}}` : '';
+    },
     topicTitle() {
     topicTitle() {
       return this.topicName || this.topicInfo.topicName || '';
       return this.topicName || this.topicInfo.topicName || '';
     },
     },
@@ -352,4 +362,33 @@ export default {
     z-index: 1;
     z-index: 1;
   }
   }
 
 
+  .publish-btn {
+    width: 260px;
+    height: 80px;
+    border-radius: 42px;
+    font-size: 30px;
+    color: #fff;
+    background: #D0021B;
+    position: absolute;
+    bottom: 100px;
+    left: calc(50% - 130px);
+    z-index: 1;
+    display: flex;
+    align-items: center;
+
+    .avatar-block {
+      width: 52px;
+      height: 52px;
+      margin: 14px 30px 14px 14px;
+      border-radius: 50%;
+      overflow: hidden;
+    }
+
+    .avatar {
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
+  }
+
 </style>
 </style>