Merge branch 'release/6.8.7' of http://git.yoho.cn/fe/yoho-community-web into release/6.8.7

@@ -36,7 +36,7 @@ export default {
       const user = await this.$sdk.getUser();
 
       if (user && user.uid) {
-        const hint = this.user ? `回复${this.user}:` : '评论:';
+        const hint = this.user ? `回复 ${this.user}:` : '写评论...';
 
         if (this.$yoho.isYohoBuy) {
           this.$yoho.getInput({hint}, (content) => {

@@ -8,10 +8,9 @@
         <p class="product-name">{{product.productName}}</p>
         <div class="price">
           ￥{{product.salesPrice}}
-          <AuthComponent
-            class="btn-fav hover-opacity"
-            @click="onFav"
-            :class="favClass">{{favText}}</AuthComponent>
+          <div class="btn-right btn-buy hover-opacity">
+            <span class="iconfont icon-cart"></span>购买
+          </div>
         </div>
       </div>
     </div>
@@ -206,19 +205,32 @@ export default {
   }
 }
 
-.btn-fav {
+.btn-right {
   float: right;
   margin-right: -40px;
   width: 120px;
   height: 50px;
   padding: 0;
   font-size: 24px;
-  background-color: #444;
   background-size: contain;
   display: flex;
   justify-content: center;
   align-items: center;
   color: #fff;
+  letter-spacing: 0.2PX;
+}
+
+.btn-buy {
+  background-color: #ce0a24;
+
+  .iconfont {
+    font-size: 30px;
+    margin-right: 5px;
+  }
+}
+
+.btn-fav {
+  background-color: #444;
 
   &.btn-is-fav {
     background-color: #b0b0b0;

@@ -25,7 +25,7 @@
         :pos-id="posId"
         :column-type="1001"
         @on-comment="onComment">
-        添加评论
+        添加评论...
       </CommentPlaceholder>
     </div>
     <div class="total-comment">
@@ -61,7 +61,7 @@ export default {
     },
     invisibleClass() {
       return {
-        invisible: this.thumb || (this.articleState.commentCount < 2)
+        invisible: this.thumb || (this.articleState.commentCount <= 2)
       };
     },
   },

 <template>
   <div class="article-item-intro">
     <div ref="intro" v-if="intro" class="intro" :class="introClass" :style="introStyle" @click="onExpanding">
-      {{intro}}
-      <div ref="introPool" class="intro-pool" v-if="!data.introHeight && isEllipsis">{{data.intro}}</div>
+      <p class="pre-wrap">{{intro}}</p>
+      <div ref="introPool" class="intro-pool pre-wrap" v-if="!data.introHeight && isEllipsis">{{data.intro}}</div>
       <span class="expand" v-if="showExpandTxt">…展开</span>
       <div class="collapse" v-if="showCollapseTxt">收起</div>
     </div>
@@ -211,15 +211,16 @@ export default {
     color: #4a4a4a;
     letter-spacing: 0.06PX;
     overflow: hidden;
-    display: -webkit-box;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
     position: relative;
     line-height: 40px;
-    height: 124px;
     box-sizing: content-box;
-    transition: height 300ms cubic-bezier(0.165, 0.84, 0.44, 1);
+    transition: height 250ms cubic-bezier(0.165, 0.84, 0.44, 1);
+
+    .pre-wrap {
+      white-space: pre-wrap;
+      word-wrap: break-word;
+      display: inline;
+    }
 
     &.intro-will-change {
       will-change: height;

@@ -138,13 +138,13 @@ export default {
       });
     },
     async onShowMore({article, index}) {
-      if (this.yoho && this.yoho.context.isLogin && !this._uid) {
+      if (this.yoho && this.yoho.context.isLogin && !this._userUid) {
         let user = await this.$sdk.getUser();
 
-        this._uid = user.uid;
+        this._userUid = user.uid;
       }
 
-      this.$refs.moreAction.show(article, this._uid, index);
+      this.$refs.moreAction.show(article, this._userUid, index);
     },
     onDelete(index) {
       this.$refs.scroll.delete(index);

@@ -53,7 +53,7 @@ export default {
       params = params || {};
 
       this.list[0].hide = params.hasAttention !== 'Y';
-      this.list[2].hide = params.authorUid !== uid || params.authorUid !== 1;
+      this.list[2].hide = params.authorUid !== uid || params.authorType !== 1;
       this.list = [...this.list];
 
       this._params = params;
@@ -101,9 +101,9 @@ export default {
           href: 'javascript:;'
         },
         onConfirm: () => {
-          this.deleteArticle(this._params.articleId).then(res => {
+          this.deleteArticle(this._params).then(res => {
             if (res.code === 200) {
-              this.$emit('on-delete', this._params.articleId);
+              this.$emit('on-delete', this.index);
             } else {
               this.$createToast({
                 type: 'warn',

@@ -79,8 +79,9 @@ export default {
   .title {
     width: 100%;
     font-size: 20px;
+    line-height: 25px;
     color: #444;
-    /*height: 58px;*/
+    height: 50px;
     white-space: normal;
   }
 }

@@ -11,7 +11,7 @@
             <WidgetAvatar class="h-headico" :src="authorBaseData.headIco" :width="100" :height="100"></WidgetAvatar>
           </div>
           <div v-if="!isOwner" class="h-follow flex">
-            <WidgetFollow class="widget-follow" :author-uid="autherInfo.authorUid" :follow="authorBaseData.hasAttention === 'Y'" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
+            <WidgetFollow class="widget-follow" :author-uid="autherInfo.authorUid" :follow="authorBaseData.isAttention" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
           </div>
         </div>
       </div>
@@ -42,7 +42,7 @@
           </ul>
           <div class="operate-wrap">
             <a v-if="isOwner" class="operate-btn btn-user-edit" :href="mineInfoUrl">编辑个人资料</a>
-            <WidgetFollow v-if="!isOwner && authorBaseData.hasAttention" class="operate-btn" :author-uid="autherInfo.authorUid" :follow="authorBaseData.hasAttention === 'Y'" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
+            <WidgetFollow v-if="!isOwner" class="operate-btn" :author-uid="autherInfo.authorUid" :follow="authorBaseData.isAttention" @on-follow="follow => onFollow(follow)" :pos-id="sceneId"></WidgetFollow>
           </div>
         </div>
       </div>

 @font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1551944025614'); /* IE9 */
-  src: url('iconfont.eot?t=1551944025614#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
-  url('iconfont.woff?t=1551944025614') format('woff'),
-  url('iconfont.ttf?t=1551944025614') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1551944025614#iconfont') format('svg'); /* iOS 4.1- */
+  src: url('iconfont.eot?t=1552375801770'); /* IE9 */
+  src: url('iconfont.eot?t=1552375801770#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'),
+  url('iconfont.woff?t=1552375801770') format('woff'),
+  url('iconfont.ttf?t=1552375801770') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+  url('iconfont.svg?t=1552375801770#iconfont') format('svg'); /* iOS 4.1- */
 }
 
 .iconfont {
@@ -111,3 +111,7 @@
   content: "\e7ba";
 }
 
+.icon-cart:before {
+  content: "\e7bb";
+}
+

@@ -92,6 +92,9 @@ Created by iconfont
     <glyph glyph-name="delete" unicode="&#59322;" d="M128 640h768a42.666667 42.666667 0 0 0 0-85.333333H128a42.666667 42.666667 0 1 0 0 85.333333zM725.333333 624.2133329999999h-85.333333c0 57.514667-56.149333 106.666667-128 106.666667s-128-49.152-128-106.666667H298.666667c0 107.392 96.682667 192 213.333333 192s213.333333-84.608 213.333333-192zM256 554.666667v-512h512V554.666667H256z m0 85.333333h512a85.333333 85.333333 0 0 0 85.333333-85.333333v-512a85.333333 85.333333 0 0 0-85.333333-85.333334H256a85.333333 85.333333 0 0 0-85.333333 85.333334V554.666667a85.333333 85.333333 0 0 0 85.333333 85.333333zM341.333333 426.666667m42.666667 0l0 0q42.666667 0 42.666667-42.666667l0-170.666667q0-42.666667-42.666667-42.666666l0 0q-42.666667 0-42.666667 42.666666l0 170.666667q0 42.666667 42.666667 42.666667ZM469.333333 426.666667m42.666667 0l0 0q42.666667 0 42.666667-42.666667l0-170.666667q0-42.666667-42.666667-42.666666l0 0q-42.666667 0-42.666667 42.666666l0 170.666667q0 42.666667 42.666667 42.666667ZM597.333333 426.666667m42.666667 0l0 0q42.666667 0 42.666667-42.666667l0-170.666667q0-42.666667-42.666667-42.666666l0 0q-42.666667 0-42.666667 42.666666l0 170.666667q0 42.666667 42.666667 42.666667Z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="cart" unicode="&#59323;" d="M138.73333363 737.6666669599999H94.33333305a37.50000029 37.50000029 0 0 0 0 74.99999971h75.00000058a37.50000029 37.50000029 0 0 0 36.74999971-29.99999971l24.525-120.00000058H881.83333305a37.50000029 37.50000029 0 0 0 36.75000058-45l-92.025-450a37.50000029 37.50000029 0 0 0-36.75000058-29.99999971H292.03333334a37.50000029 37.50000029 0 0 0-36.74999971 29.99999971z m183.89999971-525.00000058h436.5l76.725 375.00000029H245.98333305zM356.83333334 62.66666696000004m56.25 0l0 0q56.25 0 56.25-56.25l0 0q0-56.25-56.25-56.25l0 0q-56.25 0-56.25 56.25l0 0q0 56.25 56.25 56.25ZM619.33333363 62.66666696000004m56.25 0l0 0q56.25 0 56.25-56.25l0 0q0-56.25-56.25-56.25l0 0q-56.25 0-56.25 56.25l0 0q0 56.25 56.25 56.25Z"  horiz-adv-x="1024" />
+
+    
 
 
   </font>

@@ -73,11 +73,6 @@ const getCacheKey = (urlPath, cacheKey = '') => {
 const render = (route) => {
   return async(req, res, next) => {
     try {
-      res.set({
-        'Cache-Control': 'no-cache',
-        Pragma: 'no-cache',
-        Expires: (new Date(1900, 0, 1, 0, 0, 0, 0)).toUTCString()
-      });
       res.setHeader('X-YOHO-Version', pkg.version);
       const isDegrade = _.get(req.app.locals.wap, 'webapp.degrade', false);
 
@@ -89,12 +84,21 @@ const render = (route) => {
       if (config.useCache && route.cache && ck) {
         const html = await redis.getAsync(ck);
 
+        res.set({
+          'Cache-Control': 'max-age=' + route.cacheTime || 60
+        });
         if (html) {
           logger.debug(`cached ${req.url}`);
           res.setHeader('X-YOHO-Cached', 'HIT');
           return res.send(html);
         }
         res.setHeader('X-YOHO-Cached', 'MISS');
+      } else {
+        res.set({
+          'Cache-Control': 'no-cache',
+          Pragma: 'no-cache',
+          Expires: (new Date(1900, 0, 1, 0, 0, 0, 0)).toUTCString()
+        });
       }
       let context = getContext(req);
 
@@ -124,12 +128,21 @@ const devRender = (route) => {
       if (config.useCache && route.cache && ck) {
         const html = await redis.getAsync(ck);
 
+        res.set({
+          'Cache-Control': 'max-age=' + route.cacheTime || 60
+        });
         if (html) {
           logger.debug(`cached ${req.url}`);
           res.setHeader('X-YOHO-Cached', 'HIT');
           return res.send(html);
         }
         res.setHeader('X-YOHO-Cached', 'MISS');
+      } else {
+        res.set({
+          'Cache-Control': 'no-cache',
+          Pragma: 'no-cache',
+          Expires: (new Date(1900, 0, 1, 0, 0, 0, 0)).toUTCString()
+        });
       }
       let context = getContext(req);