Merge branch 'feature/pro_tag' into feature/share

# Conflicts:
#	package.json

 <template>
-  <div class="bg">
-    <div class="product-list-item" v-if="list.length" v-for="(product,index) in list" @click="goDetail(product, index)"
+  <div class="bg" v-if="list.length">
+    <div class="product-list-item" v-for="(product,index) in list" @click="goDetail(product, index)"
          :key="index" :class="(index) % 2 === 0 && 'magrin-right'">
       <div class="item-top">
         <div class="item-price">
@@ -10,6 +10,14 @@
       </div>
       <ImgSize class="item-imge" :src="product.default_images" :width="274" :height="274"/>
       <div class="item-name">{{product.product_name}}</div>
+
+      <div
+        v-if="product.customize_tag && product.customize_tag.length"
+        class="tag-wrapper">
+
+        <ImgSize class="item-tag" :src="product.customize_tag[0].url2" :width="200" :height="200"/>
+      </div>
+
     </div>
   </div>
 </template>
@@ -186,6 +194,18 @@ export default {
     margin: 0 10px;
   }
 
+  .tag-wrapper {
+    width: 120px;
+    height: 40px;
+    position: absolute;
+    top: 72px;
+  }
+
+  .item-tag {
+    width: 84px;
+    height: 26px;
+  }
+
   .item-name {
     font-size: 24px;
     color: #000;

@@ -22,7 +22,7 @@ import SquareImg from './square-img';
 export default {
   name: 'TopList',
   components: {
-    SquareImg,
+    SquareImg
   },
   props: {
     list: {
@@ -76,6 +76,17 @@ export default {
         width: 222px;
         padding: 0 8px;
         float: left;
+        position: relative;
+
+        &:before {
+          content: "";
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          z-index: 1;
+        }
       }
     }
 

 {
   "name": "xianyu-ufo-app-web",
-  "version": "0.0.2-beta-2",
+  "version": "0.0.2-beta-4",
   "private": true,
   "description": "Xianyu Project With Express",
   "repository": {