Merge branch 'master' of http://git.yoho.cn/fe/yoho-community-web

@@ -7,7 +7,7 @@
     </div>
     <div class="title flex" :style="{opacity}">
       <slot>
-        {{title}}
+        <span class="title-inner">{{title}}</span>
       </slot>
     </div>
     <div class="opts flex" :style="{opacity}">
@@ -120,6 +120,15 @@ export default {
     letter-spacing: 0.09PX;
     overflow: hidden;
     z-index: 1;
+
+    .title-inner {
+      display: inline-block;
+      max-width: 90%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: inline-block;
+    }
   }
 
   .opts {

@@ -105,7 +105,9 @@ export default {
       }
     },
     onClick() {
-      this.product.product_skn && this.$yoho.goProductDetail(this.product.product_skn);
+      let skn = this.product.product_skn || this.product.productSkn;
+
+      skn && this.$yoho.goProductDetail(skn);
     }
   }
 };

 <template>
-  <AuthComponent :auth="isAuth" class="icon-btn" :class="{'btn-selected': viewOption.selected}" @click="onClick" :style="btnStyle">
+  <AuthComponent :auth="isAuth" class="icon-btn" :class="{'btn-selected': viewOption.selected}" :style="btnStyle">
+    <div class="click-wrap" @click="onClick"></div>
     <i class="iconfont" :class="iconClass" :style="iconStyle"></i>
     <p v-if="viewText" class="icon-btn-text" :style="textStyle">
       <span class="view-text">{{Number(viewText) ? viewText : ''}}</span>
@@ -264,12 +265,22 @@ export default {
     display: inline-block;
     line-height: 1;
     vertical-align: middle;
+    position: relative;
 
     > * {
       display: inline-block;
       vertical-align: middle;
     }
 
+    .click-wrap {
+      width: 150%;
+      height: calc(100% + 30px);
+      position: absolute;
+      left: -25%;
+      top: -15px;
+      z-index: 1;
+    }
+
     .icon-btn-text {
       position: relative;
 

@@ -45,6 +45,7 @@ export default {
 
 .time {
   flex: 1;
+  font-size: 20px;
 }
 
 .text-right {

@@ -24,6 +24,7 @@
     <cube-scroll
       class="main-container"
       ref="scroll"
+      :options="scrollOpts"
       :scroll-events="['scroll', 'scroll-end']"
       @scroll="onScrollHandle"
       @scroll-end="onScrollEndHandle">
@@ -92,7 +93,10 @@
         fetchInfo: {},
         loadStatus: '',
         emptyTipHeight: '',
-        emptyTip: ''
+        emptyTip: '',
+        scrollOpts: {
+          bounce: false
+        }
       }
     },
     created() {
@@ -492,10 +496,12 @@
       }
 
       .num {
+        min-width: 30px;
         font-size: 28px;
         font-weight: 500;
         padding-bottom: 6px;
         display: block;
+        text-align: center;
       }
 
       .name {

 <template>
   <div class="tabs-wrap">
     <ul class="tabs-list">
-      <li v-for="(item, index) in tabList" :key="index" :class="{'active': active === index}" @click="changeType(index, true)">
-        {{item.name}}
-        <span v-if="item.num" class="t-num">({{item.num}})</span>
+      <li v-for="(item, index) in tabList" :key="index" @click="changeType(index, true)">
+        <div class="tabs-item" :class="{'active': active === index}">
+          {{item.name}}
+          <span v-if="item.num" class="t-num">({{item.num}})</span>
+        </div>
       </li>
     </ul>
   </div>
@@ -68,7 +70,7 @@ export default {
 
 <style>
   .tabs-wrap {
-    padding: 20px 30px 30px;
+    padding: 0 30px;
     background-color: #fff;
     display: flex;
     justify-content: space-between;
@@ -81,7 +83,7 @@ export default {
         font-size: 32px;
         color: #b0b0b0;
         font-weight: 300;
-        margin-right: 40px;
+        padding: 20px 40px 30px 0;
       }
 
       .active {