From f247da098ec3a5541c3f793f7a889de9367486a7 Mon Sep 17 00:00:00 2001
From: wangkesi <wangkesi@3ncto.com>
Date: Thu, 11 Oct 2018 16:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/goods-classify.vue | 10 +++++---
 src/view/home.vue           | 47 +++++++++++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/view/goods-classify.vue b/src/view/goods-classify.vue
index 4741a11..7ca2ea0 100644
--- a/src/view/goods-classify.vue
+++ b/src/view/goods-classify.vue
@@ -383,17 +383,21 @@ export default {
                         }
                     }
                     .price {
-                        min-width: 1.1rem;
+                        font-size: 0;
+                        min-width: 1.5rem;
+                        span {
+							display: inline-block;
+                            font-size: 0.34rem;
+                        }
                         .money {
                             font-size: 0.22rem;
                         }
                         color: #249e6c;
-                        font-size: 0.34rem;
                     }
                     .cost {
                         color: #bbbbbb;
                         font-size: 0.24rem;
-                        margin-left: 0.18rem;
+                        margin-left: 0.1rem;
                         text-decoration: line-through;
                     }
                 }
diff --git a/src/view/home.vue b/src/view/home.vue
index d2add4b..50a8101 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -79,8 +79,10 @@
 									</div>
 									<div class="btn-box">
 										<!--originalPrice原价price优惠价 -->
-										<span class="price">￥ <em>{{item1.price ? item1.price/100:item1.originalPrice/100}}</em></span>
-										<span class="original-price" v-if="item1.price&&item1.price!=item1.originalPrice"><em>￥{{ item1.originalPrice/100}}</em></span>
+										<div class="btn-box-left">
+											<span class="price">￥ <em>{{item1.price ? item1.price/100:item1.originalPrice/100}}</em></span>
+											<span class="original-price" v-if="item1.price&&item1.price!=item1.originalPrice"><em>￥{{ item1.originalPrice/100}}</em></span>
+										</div>
 										<a :href="'/mall/web/vgoods/detail/' + item1.goodsNo">立即购买</a>
 									</div>
 								</div>
@@ -334,6 +336,19 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.btn-box {
+    display: flex;
+    position: absolute;
+    bottom: 0;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    .btn-box-left {
+        display: flex;
+        align-items: flex-end;
+        // justify-content: space-around;
+    }
+}
 .home {
     width: 100%;
     height: 100%;
@@ -443,11 +458,12 @@ export default {
 .home .page-content .new-card .card-list li a {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    // justify-content: space-between;
 }
 .home .page-content .new-card .card-list li .left {
     width: 2rem;
     height: 2rem;
+    margin-right: 0.18rem;
 }
 .home .page-content .new-card .card-list li .left img {
     width: 2rem;
@@ -455,7 +471,10 @@ export default {
     display: block;
 }
 .home .page-content .new-card .card-list li .right {
-    width: 4.3rem;
+    // width: 4.3rem;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
     height: 2rem;
     position: relative;
 }
@@ -489,19 +508,27 @@ export default {
     justify-content: space-around;
 }
 .home .page-content .new-card .card-list li .right .btn-box {
-    width: 4.3rem;
-    display: flex;
-    align-items: center;
-    position: absolute;
-    bottom: 0;
+    // width: 4.3rem;
+    // display: flex;
+    // flex-grow: 0;
+    // align-items: center;
+    // position: absolute;
+    // width: 100%;
+    // bottom: 0;
+    // justify-content: space-around;
+    // align-items: flex-end;
 }
 .home .page-content .new-card .card-list li .right .btn-box .price {
     color: #249e6c;
-	min-width: 1.3rem;
+    min-width: 1.4rem;
+	display: flex;
+	align-items: flex-end;
 }
 .home .page-content .new-card .card-list li .right .btn-box span em {
     font-size: 0.38rem;
     font-weight: 600;
+    line-height: 0.9;
+    display: inline-block;
     font-style: normal;
 }
 .home .page-content .new-card .card-list li .right .btn-box .original-price em {