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

F5VT98DI7XY4X12\Administrator
2 parents c8e7b06d 2e04af9e
Showing 2 changed files with 42 additions and 29 deletions
pages/cart/cart2/cart2.wxml
pages/cart/cart2/cart2.wxss
@@ -258,30 +258,30 @@
         <view class="xc-frame flex-level">
             <view class="list-frame">	
-				<view class="xc-coupon-effect flex-vertical flex-space-between" >
+				<view class="xc-coupon-effect flex-vertical flex-space-between" bindtap="sele_quan_item" data-no="1">
 				    <view class="xc-goods-coupon ">
-				        <view class="xc-coupon-money">不使用优惠券</view>
-				        <view class="flex xc-coupon-time"></view>
+				        <view class="xc-coupon-money0">不使用优惠券</view>
+				        <view class="flex"></view>
 				    </view>
-				    <view class="xc-coupon-selection flex-right-vertical" bindtap="sele_quan_item" data-no="1">
-				        <icon color='red' size='25' type='success' wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"></icon>
+				    <view class="xc-coupon-selection flex-right-vertical" >
+				        <icon color='red' size='20' type='success' wx:if="{{using_quan[selected_quan_pick].is_nouse_red}}"></icon>
 				        <view class="circle xc-not-Selection" wx:if="{{!using_quan[selected_quan_pick].is_nouse_red }}"></view>
 				    </view>
 				</view>
 				<!-- 循环那些还没有被其他门店选择的券 -->
-                <view class="xc-coupon-effect flex-vertical flex-space-between" wx:for="{{selected_quan_list}}"  wx:if="{{!item.is_using}}" >
+                <view class="xc-coupon-effect flex-vertical flex-space-between" wx:for="{{selected_quan_list}}"  wx:if="{{!item.is_using}}" bindtap="sele_quan_item" data-ind="{{index}}">
                     <view class="xc-goods-coupon ">
                         <view class="xc-coupon-money">{{item.Sum}}元</view>
-                        <view>订单满{{item.BuySum}}元使用</view>
+                        <view class="xc-coupon-money1">订单满{{item.BuySum}}元使用</view>
                         <view class="flex xc-coupon-time">使用期限   
 						   <view class="time"  wx:if="{{item.BeginDate && item.ValidDate}}" >
 							   {{filters.replace_time(item.BeginDate)}}至{{filters.replace_time(item.ValidDate)}}
 						   </view>
                         </view>
                     </view>
-                    <view class="xc-coupon-selection flex-right-vertical" bindtap="sele_quan_item" data-ind="{{index}}">
-                        <icon color='red' size='25' type='success' wx:if="{{item.show_red}}"></icon>
+                    <view class="xc-coupon-selection flex-right-vertical" >
+                        <icon color='red' size='20' type='success' wx:if="{{item.show_red}}"></icon>
                         <view class="circle xc-not-Selection" wx:if="{{!item.show_red }}"></view>
                     </view>
                 </view>
@@ -310,7 +310,7 @@
 .cx-popup .top{
     width:100%;
-    height:133rpx;
+    height:100rpx;
     border-bottom:3rpx solid #ddd;
@@ -318,7 +318,7 @@
 .xc-top-content{
     width: 88%;
     height:85rpx;
-    padding-top: 50rpx;
+    padding-top: 20rpx;
     font-size: 36rpx;
 }
@@ -341,26 +341,25 @@
     height: 100%;
     overflow-y:scroll;
-    margin-top:20rpx;
-
 }
 .xc-close-frame{
-    margin-top:30rpx;
-    width:15%;
+    margin-top:10rpx;
+    width:1%;
     display:flex;
 }
 .xc-close{
-    width:70rpx;
-    height:70rpx;
-    border-radius:50%;
-    border:5rpx solid #a5a5a7;
-    text-align:center;
-    line-height: 55rpx;
-    font-size:80rpx;
-    color:#a5a5a7;
-    font-family:"微软正黑体";
-    margin-top:8rpx;
+   width: 46rpx;
+height: 46rpx;
+border-radius: 50%;
+border: 5rpx solid #a5a5a7;
+text-align: center;
+line-height: 33rpx;
+font-size: 64rpx;
+color: #a5a5a7;
+margin-top: 5rpx;
+
+
 }
 .xc-money{
@@ -374,7 +373,7 @@
 }
 .xc-coupon-effect{
     width: 99%;
-    height: 128rpx;
+    min-height: 100rpx;
     border-bottom:3rpx solid #ddd;
@@ -389,10 +388,24 @@
     margin-left:222rpx;
 }
+.xc-coupon-money0{
+    color: #c91e31;
+    font-size: 35rpx;
+    line-height: 40rpx;
+
+}
 .xc-coupon-money{
     color: #c91e31;
     font-size: 35rpx;
-    margin-top:20rpx;
+    line-height: 40rpx;
+    padding-top: 10px;
+
+}
+.xc-coupon-money1{
+    color: #444;
+    font-size: 28rpx;
+  line-height: 60rpx;
+
 }
 .xc-coupon-time{
@@ -427,8 +440,8 @@
 @keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } }
 .xc-not-Selection{
-    width: 60rpx;
-    height: 60rpx;
+   width: 40rpx;
+height: 40rpx;
     background: #eeeeee;
 }