套装商品修复

packageUser/pages/user/orders/orders.wxss

@@ -55,21 +55,22 @@
 }
 .order-main {
   width: 710rpx;
-  height: 200rpx;
   background-color: #fcfcfc;
   margin-bottom:5px;
 }
 .order-main__left {
   width: 200rpx;
   height: 200rpx;
-  display: block;
-  float: left;
+  display: inline-block;
+  vertical-align: top;
 }
 .order-main__right {
   position: relative;
   width: 490rpx;
-  height: 200rpx;
-  float: right;
+  display: inline-block;
+  padding: 0 15rpx;
+      box-sizing: border-box;
+  
 }
 .order-info__title {
   color: #4c4c4c;

pages/areacart/areacart.wxml

@@ -45,8 +45,8 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx':''}}">
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx':''}}">
+		      <movable-area style="{{item.package?'height:'+(260+item.package_list.length * 25)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(260+item.package_list.length * 25)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
@@ -76,7 +76,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx;line-height:'+(260+item.package_list.length * 20)+'rpx':''}}"></view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(260+item.package_list.length * 20)+'rpx;line-height:'+(260+item.package_list.length * 25)+'rpx':''}}"></view>
 		    </view>
 	    </view>
 	</view>

pages/cart/cart.wxml

@@ -45,8 +45,8 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx':''}}">
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx':''}}">
+		      <movable-area style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend" style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.original_price}}" data-index="{{index}}">
@@ -77,7 +77,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem" style="{{item.package?'height:'+(210+item.package_list.length * 20)+'rpx;line-height:'+(210+item.package_list.length * 20)+'rpx':''}}">删除</view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem" style="{{item.package?'height:'+(210+item.package_list.length * 25)+'rpx;line-height:'+(210+item.package_list.length * 25)+'rpx':''}}">删除</view>
 		    </view>
 	    </view>
 	</view>

pages/centcart/centcart.wxml

@@ -55,8 +55,8 @@
 	-->	
 		<view class="cartlist" wx:for="{{cartList}}" wx:key="id">
 			<view class="main_item">
-		      <movable-area  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx':''}}">
-		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend"  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx':''}}">
+		      <movable-area  style="{{item.package?'height:'+(290+item.package_list.length * 25)+'rpx':''}}">
+		        <movable-view damping="100" out-of-bounds="true" direction="horizontal" x="{{item.movex}}" id="{{index}}" animation="false" bindchange="handleMovableChange" capture-bind:touchstart="handleTouchestart" capture-bind:touchend="handleTouchend"  style="{{item.package?'height:'+(290+item.package_list.length * 25)+'rpx':''}}">
 		          <view class="main_item_content ">
 		          		  <view class="cartlist_item">
 						   	  <view class="cartlist_select {{item.IsBuy ? 'active' : ''}}" bindtap="itemselected" data-count="{{item.count}}" data-id='{{item.id}}' data-price="{{item.price}}" data-index="{{index}}">
@@ -87,7 +87,7 @@
 		          </view>
 		        </movable-view>
 		      </movable-area>
-		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx;line-height:'+(290+item.package_list.length * 20)+'rpx':''}}"></view>
+		      <view class="delete_btn" data-productIndex="{{index}}" data-id='{{item.id}}' bindtap="delitem"  style="{{item.package?'height:'+(290+item.package_list.length * 20)+'rpx;line-height:'+(290+item.package_list.length * 25)+'rpx':''}}"></view>
 		    </view>
 	    </view>
 	</view>