* master: (32 commits)
  update: dist
  update: dist
  fix: dd
  update: dist
  fix: 有效期
  fix: 积分有效天数检验
  fix: 积分策略提示信息ui
  fix: 引入图标库
  fix: 积分策略提示文案ui修改
  fix: dd
  fix: jifen
  fix； 积分有效期
  update: 修复会员卡设置bug
  update: 修复会员卡设置bug
  fix: 积分有效期校验
  fix: 积分老数据兼容修改
  fix: 积分校验提示信息修改
  fix: 积分通用和抵现校验定位
  fix: 积分禁用
  update: dist
  ...

# Conflicts:
#	dist/index.html
#	dist/static/js/37.29a4b9c1745d64cfc6cd.js
#	dist/static/js/37.29a4b9c1745d64cfc6cd.js.map
#	dist/static/js/37.5a65b0174f843f0d8be9.js
#	dist/static/js/37.5a65b0174f843f0d8be9.js.map
#	dist/static/js/37.fa399aea4c5a144ef8fb.js
#	dist/static/js/37.fa399aea4c5a144ef8fb.js.map
#	dist/static/js/38.619d17c30edaf714d4e6.js
#	dist/static/js/38.91e212527125ab12b5b1.js
#	dist/static/js/38.c87321412b595001a395.js
#	dist/static/js/5.307b129f1a13ed13c71d.js.map
#	dist/static/js/6.51f127d5a5b283212b70.js.map
#	dist/static/js/6.cb35c9668cf721acc599.js
#	dist/static/js/6.cb35c9668cf721acc599.js.map
#	dist/static/js/8.b88326ad14d012ad7898.js
#	dist/static/js/manifest.b02394884ed74e79518b.js.map
#	dist/static/js/manifest.cdeb591d1beb41b20702.js.map
#	dist/static/js/manifest.ebdf2db04429972d1c41.js.map