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

Feature zyw

See merge request !30

src/pages/couponDetail/couponDetail.js

@@ -4,7 +4,6 @@ const wxService = require('../../utils/wxService')
 const utils = require('../../utils/util')
 const envInfo = require('../../config/index').envInfo
 
-
 wxService.page({
   /**
    * 页面的初始数据
@@ -37,6 +36,11 @@ wxService.page({
          data.coupon.startTime =  data.coupon.startTime.substring(0,10)
          data.coupon.endTime = data.coupon.endTime.substring(0,10)
          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)
+          }
+        }
          this.setData({
             couponDetail: data
          })