Authored by huzhiming

Merge branch 'feature/share' of http://git.yoho.cn/fe/xianyu-ufo-app-web into feature/share

1 <template> 1 <template>
2 - <div class="bg">  
3 - <div class="product-list-item" v-if="list.length" v-for="(product,index) in list" @click="goDetail(product, index)" 2 + <div class="bg" v-if="list.length">
  3 + <div class="product-list-item" v-for="(product,index) in list" @click="goDetail(product, index)"
4 :key="index" :class="(index) % 2 === 0 && 'magrin-right'"> 4 :key="index" :class="(index) % 2 === 0 && 'magrin-right'">
5 <div class="item-top"> 5 <div class="item-top">
6 <div class="item-price"> 6 <div class="item-price">
@@ -10,6 +10,14 @@ @@ -10,6 +10,14 @@
10 </div> 10 </div>
11 <ImgSize class="item-imge" :src="product.default_images" :width="274" :height="274"/> 11 <ImgSize class="item-imge" :src="product.default_images" :width="274" :height="274"/>
12 <div class="item-name">{{product.product_name}}</div> 12 <div class="item-name">{{product.product_name}}</div>
  13 +
  14 + <div
  15 + v-if="product.customize_tag && product.customize_tag.length"
  16 + class="tag-wrapper">
  17 +
  18 + <ImgSize class="item-tag" :src="product.customize_tag[0].url2" :width="200" :height="200"/>
  19 + </div>
  20 +
13 </div> 21 </div>
14 </div> 22 </div>
15 </template> 23 </template>
@@ -186,6 +194,18 @@ export default { @@ -186,6 +194,18 @@ export default {
186 margin: 0 10px; 194 margin: 0 10px;
187 } 195 }
188 196
  197 + .tag-wrapper {
  198 + width: 120px;
  199 + height: 40px;
  200 + position: absolute;
  201 + top: 72px;
  202 + }
  203 +
  204 + .item-tag {
  205 + width: 84px;
  206 + height: 26px;
  207 + }
  208 +
189 .item-name { 209 .item-name {
190 font-size: 24px; 210 font-size: 24px;
191 color: #000; 211 color: #000;
@@ -22,7 +22,7 @@ import SquareImg from './square-img'; @@ -22,7 +22,7 @@ import SquareImg from './square-img';
22 export default { 22 export default {
23 name: 'TopList', 23 name: 'TopList',
24 components: { 24 components: {
25 - SquareImg, 25 + SquareImg
26 }, 26 },
27 props: { 27 props: {
28 list: { 28 list: {
@@ -76,6 +76,17 @@ export default { @@ -76,6 +76,17 @@ export default {
76 width: 222px; 76 width: 222px;
77 padding: 0 8px; 77 padding: 0 8px;
78 float: left; 78 float: left;
  79 + position: relative;
  80 +
  81 + &:before {
  82 + content: "";
  83 + position: absolute;
  84 + left: 0;
  85 + right: 0;
  86 + top: 0;
  87 + bottom: 0;
  88 + z-index: 1;
  89 + }
79 } 90 }
80 } 91 }
81 92
1 { 1 {
2 "name": "xianyu-ufo-app-web", 2 "name": "xianyu-ufo-app-web",
3 - "version": "0.0.2-beta-2", 3 + "version": "0.0.2-beta-4",
4 "private": true, 4 "private": true,
5 "description": "Xianyu Project With Express", 5 "description": "Xianyu Project With Express",
6 "repository": { 6 "repository": {