Merge branch 'feature-zyw' into 'dev_7.0.1'

Feature zyw

See merge request !32

src/pages/couponDetail/couponDetail.js

@@ -38,7 +38,7 @@ wxService.page({
          data.couponSetting.notice = JSON.parse(data.couponSetting.notice)
         for (let i in data.couponSetting.notice){
           if (data.couponSetting.notice[i].type == 1){
-            data.couponSetting.notice[i].value = data.couponSetting.startTime.substring(0, 10) + ' 至 ' + data.couponSetting.endTime.substring(0, 10)
+            data.couponSetting.notice[i].value = data.coupon.startTime.substring(0, 10) + ' 至 ' + data.coupon.endTime.substring(0, 10)
           }
         }
          this.setData({