Merge branch 'master' of http://git.liuniu946.com/hwq/mnsx

pages/index/index.vue

@@ -24,7 +24,7 @@
 				<view class="flex-grow-true padding-c-10 flex" @click="navto('/pages/index/Vipgift')">
 					<view>
 						<view class="font-size-base text-default">购买会员礼包成为会员</view>
-						<view class="font-size-sm text-gray">每月赠送33元积分,下单抵扣当钱花</view>
+						<view class="font-size-sm text-gray">每月赠送积分,下单抵扣当钱花</view>
 					</view>
 					<view class="font-size-sm">
 						<text>详情</text>

pages/product/product.vue

@@ -16,7 +16,7 @@
 				<view class="right-top">距离本场结束还剩</view>
 				<uni-countdown
 					class="timeBox"
-					color="#901b21"
+					color="#ee2f72"
 					background-color="#fff"
 					splitor-color="#fff"
 					:show-day="true"
@@ -704,7 +704,7 @@ export default {
 			height: 66rpx;
 			line-height: 66rpx;
 			border-radius: 100rpx;
-			background: #901b21;
+			background: #ee2f72;
 			font-size: $font-base + 2rpx;
 			color: #fff;
 			margin: 30rpx auto 20rpx;
@@ -776,7 +776,7 @@ export default {
 
 			.price {
 				font-size: $font-lg;
-				color: #901b21;
+				color: #ee2f72;
 				margin: 10rpx 0rpx;
 			}
 
@@ -1147,14 +1147,13 @@ page {
 	}
 }
 .price-box-jf {
-	color: #901b21;
+	color: #ef041f;
 	display: flex;
 	align-items: baseline;
 	height: 64rpx;
 	font-size: 50rpx;
 	font-family: PingFang SC;
 	font-weight: 800;
-	color: #901b21;
 	.price {
 		font-size: 50rpx;
 	}