Merge branch 'feature-zyw' into 'dev'

优惠券详情

See merge request !13

src/pages/couponDetail/couponDetail.wxml

@@ -15,12 +15,12 @@
 		</view>
     <view class='integral-detail'>
       <view class='integral-list'>
-        <view class='integral-title'>优惠详情</view>
-        <view class='integral-desc'>{{couponDetail.couponSetting.notice}}</view>
+        <text class='integral-title'>优惠详情</text>
+        <text class='integral-desc'>{{couponDetail.couponSetting.notice}}</text>
       </view>
       <view class='integral-list'>
-        <view class='integral-title'>有效期</view>
-        <view class='integral-desc'>{{couponDetail.coupon.endTime}}</view>
+        <text class='integral-title'>有效期</text>
+        <text class='integral-desc'>{{couponDetail.coupon.endTime}}</text>
       </view>
     </view>
 		<button type='primary' class="redeem-now" bindtap='exchange' bindtap="handelPresentCouponCode">出示券码</button>

src/pages/couponDetail/couponDetail.wxss

@@ -71,6 +71,6 @@
   width: 120rpx;
 }
 .integral-desc{
-  width: 500rpx;
+  width: 440rpx;
   color: #666666;
 }
\ No newline at end of file