Merge branch 'master' of http://git.liuniu946.com/xuhaolan/huilai

pages/cart/cart.vue

@@ -118,7 +118,7 @@
 				</view>
 				<!-- 底部菜单栏 -->
 				<view class="action-section">
-					<view class="checkbox"><view class="iconfont iconroundcheckfill icon-checked-box" @click="check('all')" :class="{ 'icon-checked': allChecked }"></view></view>
+					<view class="checkbox"><view class="iconfont iconroundcheckfill icon-checked-box" @click="check('all')" :class="{ 'icon-checked': vipallChecked }"></view></view>
 					<view class="total-box">
 						<text class="price">¥{{ viptotal }}</text>
 					</view>

pages/order/createOrder.vue

@@ -96,10 +96,10 @@
 				<text class="cell-tit clamp">优惠金额</text>
 				<text class="cell-tip red">-￥35</text>
 			</view> -->
-			<view class="yt-list-cell b-b">
+			<!-- <view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">积分抵扣{{ '（当前积分：' + integralAll + '）' }}</text>
 				<view class="cell-tip"><radio @click="checkedPoints = !checkedPoints" color=" #5dbc7c" :checked="checkedPoints" /></view>
-			</view>
+			</view> -->
 			
 			<view class="yt-list-cell b-b">
 				<text class="cell-tit clamp">备注</text>

pages/user/user.vue

@@ -24,9 +24,6 @@
 					<view class="info-box">
 
 						<view class="phone" v-if="userInfo.phone">ID:{{userInfo.phone | phone}}</view>
-						<view class="image">
-							<image src="../../static/user/user10.png" mode=""></image>
-						</view>
 					</view>
 				</view>
 				<!-- 设置 -->
@@ -295,15 +292,18 @@
 </script>
 
 <style lang="scss">
+	.container,page {
+		background: #FFFFFF;
+		height: auto;
+		min-height: 100%;
+	}
 	.u-tabbar {
-		margin-top: 30rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		width: 750rpx;
-		height: 200rpx;
 		position: relative;
-		background: #F3F3F3;
+		background: #FFFFFF;
 		bottom: 0;
 
 		text {
@@ -314,9 +314,6 @@
 
 	}
 
-	.container {
-		background-color: #fff;
-	}
 
 	.user {
 		image {
@@ -515,7 +512,7 @@
 	.item-box {
 		padding-top: 80rpx;
 		height: 900rpx;
-		background: #f4f4f4;
+		background: #FFFFFF;
 
 		.item-box-box {
 			background: #FFFFFF;
@@ -562,8 +559,6 @@
 	}
 
 	.btm {
-		margin-top: 40rpx;
-		padding-bottom: 200rpx;
 		margin: 30rpx;
 		border-radius: 20rpx;