Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !12

src/pages/couponDetail/couponDetail.wxml

@@ -13,8 +13,15 @@
 			</view>
 			<view class='coupon-code fs-24' bindtap='exchange' bindtap="handelPresentCouponCode">出示券码</view>
 		</view>
-		<view class='integral-detail' wx:if="{{couponDetail.couponDetail.style.takeCouponBgimg}}">
-			<image src='{{couponDetail.couponDetail.style.takeCouponBgimg}}' mode="widthFix" style="width: 100%;"></image>
+    <view class='integral-detail'>
+      <view class='integral-list'>
+        <view class='integral-title'>优惠详情</view>
+        <view class='integral-desc'>{{couponDetail.couponSetting.notice}}</view>
+      </view>
+      <view class='integral-list'>
+        <view class='integral-title'>有效期</view>
+        <view class='integral-desc'>{{couponDetail.coupon.endTime}}</view>
+      </view>
     </view>
 		<button type='primary' class="redeem-now" bindtap='exchange' bindtap="handelPresentCouponCode">出示券码</button>
 	</view>

src/pages/couponDetail/couponDetail.wxss

@@ -55,6 +55,7 @@
 }
 .integral-detail{
   margin-top: 90rpx;
+  padding: 0 30rpx;
 }
 .integral-list{
   margin-bottom: 60rpx;