Merge remote-tracking branch 'origin/develop' into develop

@@ -10,20 +10,32 @@
         <ImgSize class="item-imge" :src="product.secondhand_image" :width="343" :height="343"/>
         <ImgSize class="item-imge" :src="product.secondhand_image" :width="343" :height="343"/>
       </div>
       </div>
 
 
-      <div class="item-name">
-        <p>
-          <span v-if="product.secondhandTypeName">{{product.secondhandTypeName}}</span>
-          <span>{{product.product_name}}</span>
-        </p>
+      <div v-if="product.fromSize">
+        <div class="item-bottom-wrapper">
+          <div class="price-flag">
+            <span class='price-flag'>{{product.skup_price && '¥'}}{{product.skup_price || ' '}}</span>
+            <span class='hand-type' v-if="product.secondhandTypeName">{{product.secondhandTypeName}}</span>
+          </div>
+          <div class="size-flag">{{product.size_name}}码</div>
+        </div>
       </div>
       </div>
 
 
-      <div class="item-bottom">
-        <div class="item-price">
-          <span>{{product.skup_price && '¥'}}</span><span>{{product.skup_price || ' '}}</span>
-          <span class='save-flag'>{{product.save_price && '已省¥'}}{{product.save_price || ' '}}</span>
+      <div v-else>
+        <div class="item-name">
+          <p>
+            <span v-if="product.secondhandTypeName">{{product.secondhandTypeName}}</span>
+            <span>{{product.product_name}}</span>
+          </p>
+        </div>
+
+          <div class="item-bottom">
+            <div class="item-price">
+              <span>{{product.skup_price && '¥'}}</span><span>{{product.skup_price || ' '}}</span>
+              <span class='save-flag'>{{product.save_price && '已省¥'}}{{product.save_price || ' '}}</span>
+            </div>
+            <div class="size-flag">{{product.size_name}}码</div>
+          </div>
         </div>
         </div>
-        <div class="size-flag">{{product.size_name}}码</div>
-      </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -191,6 +203,31 @@ export default {
     }
     }
   }
   }
 
 
+  .item-bottom-wrapper {
+    padding: 20px 14px 30px 20px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .hand-type {
+      margin-left: 5px;
+      color: #fff;
+      background: #000;
+      padding: 4px 8px;
+      text-align: center;
+      font-size: 24px;
+      line-height: 30px;
+      display: inline-block;
+    }
+  }
+
+  .sale_flag {
+    background: #000;
+    height: 40px;
+    padding: 0 8px;
+    border-radius: 4px;
+  }
+
   .item-bottom {
   .item-bottom {
     padding: 0 14px 30px 20px;
     padding: 0 14px 30px 20px;
     display: flex;
     display: flex;
@@ -208,6 +245,15 @@ export default {
     @include num
     @include num
   }
   }
 
 
+  .price-flag {
+    color: #000;
+    font-size: 32px;
+    vertical-align: center;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+
   .save-flag {
   .save-flag {
     margin-left: 5px;
     margin-left: 5px;
     color: #d0021d;
     color: #d0021d;