Commit 754c6bd5cdfd07aa0b708582e80b2771dd9b50fd

Authored by 后端研发-倪永富
2 parents ee929688 563a487e

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

pages/cart/cart/cart.wxml
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 </view> 107 </view>
108 </block> 108 </block>
109 </view> 109 </view>
110 - <view class="pay-for flex-vertical-between"> 110 + <view class="pay-for flex-vertical-between" style="bottom:{{tabBar.isIpx ? '172rpx' : '100rpx'}}">
111 <view class="allradio flex-vertical-between"> 111 <view class="allradio flex-vertical-between">
112 <view class="flex-vertical mlr" bindtap="checkAll"> 112 <view class="flex-vertical mlr" bindtap="checkAll">
113 <!--<radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>--> 113 <!--<radio class="order-raido" color="red" checked="{{checkAllToggle}}"></radio>-->
pages/cart/cart/cart.wxss
@@ -143,7 +143,7 @@ radio { @@ -143,7 +143,7 @@ radio {
143 height: 100rpx; 143 height: 100rpx;
144 position: fixed; 144 position: fixed;
145 left: 0; 145 left: 0;
146 - bottom: 45px; 146 + bottom: 90rpx;
147 font-size: 28rpx; 147 font-size: 28rpx;
148 color: #666; 148 color: #666;
149 background-color: rgb(255, 255, 255); 149 background-color: rgb(255, 255, 255);