From a4e3ad1bdd8c458f9a39ec850b5220f8eb605b44 Mon Sep 17 00:00:00 2001
From: laijiahua <laijiahua@3ncto.com>
Date: Sat, 29 Sep 2018 19:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/goods-classify.vue |  6 ++----
 src/view/home.vue           | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/view/goods-classify.vue b/src/view/goods-classify.vue
index f9c6adc..7f86bad 100644
--- a/src/view/goods-classify.vue
+++ b/src/view/goods-classify.vue
@@ -49,11 +49,9 @@
 </template>
 <script>
 	import goodsApi from "../models/goods-model.js";
-	import configs from '../configs';
+	//import configs from '../configs';
 	import { Alert,Toast,Popup,Loading } from "vux";
 	import BScroll from 'better-scroll';
-
-	var locationUrl = configs.locationUrl;
 	export default {
 	    data() {
 	        return {
@@ -222,7 +220,7 @@
 			},
 			ShareWenXin (){
 		   		var merchantNo = this.no
-				this.wxShare({"merchantNo":merchantNo,"source":0,"url":encodeURIComponent(locationUrl + '/v2/home')})
+				this.wxShare({"merchantNo":merchantNo,"source":0,"url":encodeURIComponent(location.host + '/v2/home')})
 		   	}
         },       
         mounted() {	
diff --git a/src/view/home.vue b/src/view/home.vue
index 9ad9df8..b0baf13 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -72,7 +72,8 @@
 								<div class="text">{{item1.shortDesc}}</div>
 								<div class="card-name" v-if="toJSON(item1.smallLabel)"><i>{{toJSON(item1.smallLabel)}}</i></div>
 								<div class="btn-box">
-									<span>￥ <em>{{item1.originalPrice > 0 ? item1.originalPrice/100 : item1.price/100}}</em></span>
+									<span class="original-price">￥ <em>{{item1.originalPrice ? item1.originalPrice/100:item1.price/100}}</em></span>
+									<span class="price"><em>￥{{ item1.price/100}}</em></span>
 									<a :href="'/mall/web/vgoods/detail/' + item1.goodsNo">立即购买</a>
 								</div>
 							</div>
@@ -458,18 +459,26 @@
 	position: absolute;
 	bottom: 0;
 }
-.home .page-content .new-card .card-list li .right .btn-box span {
-	font-size: 0.22rem;
-	font-weight:400;
-	color:rgba(153,153,153,1);
-	margin-right: auto;
+.home .page-content .new-card .card-list li .right .btn-box .original-price {
+	color: #249E6C;
 }
 .home .page-content .new-card .card-list li .right .btn-box span em {
 	font-size:0.38rem;
 	font-weight:600;
 	font-style: normal;
-	color:rgba(51,51,51,1);
 }
+.home .page-content .new-card .card-list li .right .btn-box .price em {
+	font-size: 0.24rem;
+	text-decoration:line-through ;
+	font-weight: normal;
+}
+.home .page-content .new-card .card-list li .right .btn-box span {
+	font-size: 0.22rem;
+	font-weight:400;
+	color:rgba(153,153,153,1);
+	margin-right: auto;
+}
+
 .home .page-content .new-card .card-list li .right .btn-box a {
 	width:1.7rem;
 	height:0.56rem;