Authored by 陈峰

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

@@ -81,7 +81,6 @@ export default { @@ -81,7 +81,6 @@ export default {
81 font-size: 20px; 81 font-size: 20px;
82 color: #444; 82 color: #444;
83 /*height: 58px;*/ 83 /*height: 58px;*/
84 - word-break: break-all;  
85 white-space: normal; 84 white-space: normal;
86 } 85 }
87 } 86 }
@@ -27,8 +27,10 @@ export default { @@ -27,8 +27,10 @@ export default {
27 27
28 .product-list { 28 .product-list {
29 width: 100%; 29 width: 100%;
30 - overflow: scroll; 30 + overflow-x: scroll;
  31 + overflow-y: hidden;
31 white-space: nowrap; 32 white-space: nowrap;
  33 + display: flex;
32 } 34 }
33 35
34 .item + .item { 36 .item + .item {
1 <template> 1 <template>
2 <div class="flex"> 2 <div class="flex">
3 <WidgetAvatarGroup :avatars="praiseHeadIco"></WidgetAvatarGroup> 3 <WidgetAvatarGroup :avatars="praiseHeadIco"></WidgetAvatarGroup>
4 - <span class="v-center">{{praiseCount}}人喜欢</span> 4 + <span class="v-center" v-if="praiseCount">{{praiseCount}}人喜欢</span>
5 <span class="time v-center text-right">{{publish_time | formatTime}}</span> 5 <span class="time v-center text-right">{{publish_time | formatTime}}</span>
6 </div> 6 </div>
7 </template> 7 </template>
@@ -113,6 +113,7 @@ module.exports = { @@ -113,6 +113,7 @@ module.exports = {
113 }, 113 },
114 '/api/guang/article/queryGoods': { 114 '/api/guang/article/queryGoods': {
115 api: 'app.search.recomandLi', 115 api: 'app.search.recomandLi',
  116 + cache: true,
116 params: { 117 params: {
117 query: {type: String, require: false}, 118 query: {type: String, require: false},
118 order: {type: String, require: false}, 119 order: {type: String, require: false},