Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/cats/style4.vue

@@ -46,6 +46,9 @@
 									<div  v-if="u.TenantId!=27" class="price" :style="{ color: mainColor }">
 										{{ cx.price_content }}
 									</div>
+								<view   v-if="u.TenantId!=27"  class="origin">
+									{{ cx.original_price_content }}
+								</view>
 									<div v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</div>
 									
 								</div>
@@ -69,6 +72,9 @@
 								<view   class="vip2" :style="{ color: mainColor }">
 									{{ cx.price_content }}
 								</view>
+								<view   class="origin" :style="{ color: mainColor }">
+									{{ cx.original_price_content }}
+								</view>
 								
 								<div @click.stop="showSkuHandler(cx)" class="right">
 									<!-- todo 点击加入购物车-->
@@ -248,6 +254,13 @@
 </script>
 
 <style>
+	.origin {
+		font-family: "oswald";
+		font-size: 28rpx;
+		color: #999;
+		text-decoration: line-through;
+		margin-left: 10rpx;
+	}
 	.vip2{
 		font-size: 16px;
 		margin-right: 10rpx;

components/cats/style44.vue

@@ -173,6 +173,9 @@
 										<div v-if="u.TenantId!=27" class="price" :style="{ color: mainColor }">
 											{{ cx.price_content }}
 										</div>
+								<view  v-if="u.TenantId!=27 && cx.price_content !== cx.original_price_content"  class="origin">
+									{{ cx.original_price_content }}
+								</view>
 										<div v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</div>
 									</div>
 									<div v-if="u.TenantId!=27" @click.stop="showSkuHandler(cx)" class="right">
@@ -195,6 +198,9 @@
 									<view class="vip2" :style="{ color: mainColor }">
 										{{ cx.price_content }}
 									</view>
+								<view  v-if="cx.price_content !== cx.original_price_content" class="origin">
+									{{ cx.original_price_content }}
+								</view>
 
 									<div @click.stop="showSkuHandler(cx)" class="right">
 										<!-- todo 点击加入购物车-->
@@ -553,6 +559,13 @@
 </script>
 
 <style >
+	.origin {
+		font-family: "oswald";
+		font-size: 24rpx;
+		color: #999;
+		text-decoration: line-through;
+		margin: 0 10rpx;
+	}
 	/* .The-tail >>> .u-divider{
 		background-color: transparent !important;
 	} */

pages/goods/goods.vue

@@ -186,6 +186,9 @@
 					<text class="numfont22" v-if="g.form_id!=1&&g.edu_data.BookPrice">
 						{{ g.price_min == g.price_max ? parseFloat(g.price_min)+parseFloat(g.edu_data.BookPrice) : g.price_min + '-' + g.price_max }}
 					</text>
+					<text class="origin">
+						{{ g.original_price}}
+					</text>
 					<!-- <text class="numfont" v-if="g.form_id==1">
 						{{ g.price_min }}
 					</text> -->
@@ -1249,6 +1252,13 @@
 		font-size: 44rpx;
 		font-weight: bold;
 	}
+	.origin {
+		font-family: "oswald";
+		font-size: 28rpx;
+		color: #999;
+		text-decoration: line-through;
+		margin-left: 10rpx;
+	}
 
 	.sign-up {
 		font-size: 20rpx;