合并冲突

assets/css/style.less

@@ -399,13 +399,14 @@ page {
 }
 
 /*优惠券列表公共*/
+
 .coupon-list {
   padding: 0 0.3*100rpx;
   margin-top: 0.25*100rpx;
+  box-sizing: border-box;
 }
 
 .coupon-list .item {
-  box-sizing: border-box;
   width: 100%;
   height: 1.7*100rpx;
   margin-bottom: 0.16*100rpx;
@@ -421,7 +422,10 @@ page {
   font-size: 0.36*100rpx;
   font-weight: bold;
   text-align: center;
-  line-height: 1.7*100rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
 }
 
 .coupon-list .item .money.moneyGray {
@@ -433,9 +437,10 @@ page {
 }
 
 .coupon-list .item .text {
-  flex: 1;
+  width: 4.5*100rpx;
   padding: 0 0.17*100rpx 0 0.24*100rpx;
   background-color: #fff;
+  box-sizing: border-box;
 }
 
 .coupon-list .item .text .condition {
@@ -465,7 +470,10 @@ page {
 .coupon-list .item .text .data .bnt.gray {
   background-color: #ccc;
 }
-
+.coupon-list .pic-num {
+  color: #ffffff !important;
+  font-size: 0.24*100rpx !important;
+}
 /*优惠券列表弹窗*/
 .coupon-list-window {
   position: fixed;
@@ -476,11 +484,22 @@ page {
   border-radius: 0.16*100rpx 0.16*100rpx 0 0;
   z-index: 111;
   transition: all .3s cubic-bezier(.25, .5, .5, .9);
+  -webkit-transition: all .3s cubic-bezier(.25, .5, .5, .9);
+  -moz-transition: all .3s cubic-bezier(.25, .5, .5, .9);
+  -o-transition: all .3s cubic-bezier(.25, .5, .5, .9);
   transform: translate3d(0, 100%, 0);
+  -webkit-transform: translate3d(0, 100%, 0);
+  -ms-transform: translate3d(0, 100%, 0);
+  -moz-transform: translate3d(0, 100%, 0);
+  -o-transform: translate3d(0, 100%, 0);
 }
 
 .coupon-list-window.on {
   transform: translate3d(0, 0, 0);
+  -webkit-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -moz-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
 }
 
 .coupon-list-window .title {