Merge branch 'master' into minus

hdApp/src/pagesPurchase/components/cp2.vue

@@ -26,10 +26,10 @@
 						</block>
 					</view>
 					<view class="price" v-if="info.myLevel && info.myLevel == 2">
-						<text style="color:#a7a2a2;text-decoration:line-through;font-size:25upx;font-weight:bold;">￥{{parseFloat(info.defaultGradePrice) }}</text>
-						<text style="font-weight:bold;margin-left:10upx;font-size:25upx;">会员价￥{{ parseFloat(info.price) }}</text>
+						<text style="color:#a7a2a2;text-decoration:line-through;font-size:30upx;font-weight:bold;">￥{{parseFloat(info.defaultGradePrice) }}</text>
+						<text style="font-weight:bold;margin-left:10upx;font-size:30upx;">会员￥{{ parseFloat(info.price) }}</text>
 					</view>
-					<view class="price" style="font-weight:bold;font-size:25upx;" v-else>￥{{ info.price ? parseFloat(info.price) : 0 }}</view>
+					<view class="price" style="font-weight:bold;font-size:30upx;" v-else>￥{{ info.price ? parseFloat(info.price) : 0 }}</view>
 				</view>
 				<view style="text-align: right" >
 					<view class="open-bx" >

hdApp/src/pagesPurchase/components/item.vue

@@ -30,10 +30,10 @@
 						</block>
 					</view>
 					<view class="price" v-if="info.myLevel && info.myLevel == 2">
-						<text style="color:#a7a2a2;text-decoration:line-through;font-size:25upx;font-weight:bold;">￥{{parseFloat(info.defaultGradePrice) }}</text>
-						<text style="font-weight:bold;margin-left:10upx;font-size:25upx;">会员价￥{{ parseFloat(info.price) }}</text>
+						<text style="color:#a7a2a2;text-decoration:line-through;font-size:30upx;font-weight:bold;">￥{{parseFloat(info.defaultGradePrice) }}</text>
+						<text style="font-weight:bold;margin-left:10upx;font-size:30upx;">会员￥{{ parseFloat(info.price) }}</text>
 					</view>
-					<view class="price" style="font-weight:bold;font-size:25upx;" v-else>￥{{ info.price ? parseFloat(info.price) : 0 }}</view>
+					<view class="price" style="font-weight:bold;font-size:30upx;" v-else>￥{{ info.price ? parseFloat(info.price) : 0 }}</view>
 				</view>
 				<view style="text-align: right" >
 					<view class="open-bx" >

hdApp/src/pagesPurchase/ghsProduct2.vue

@@ -135,7 +135,7 @@
 		<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
 
 		<view v-if="cartItemShow == true" style="position: fixed;z-index: 190;top: 0;left: 0;width: 100vw;height: 100vh;background: rgba(0, 0, 0, 0.6);color: #fff;" @click="hideCartItem()">
-			<view style="position: fixed;bottom: 108upx;width:100vw;heigh:300upx;background-color:white;" @click.stop="">
+			<view style="position: fixed;bottom: 108upx;width:100vw;height:300upx;background-color:white;" @click.stop="">
 				<view class="commodity-view">
 					<view class="summary-bar">
 						<button class="admin-button-com blue middle" @click.stop="delMemory()">清空花材</button>