Authored by 孟顺

Merge branch 'patch-14' into patch-16

# Conflicts:
#	README.md
@@ -102,6 +102,9 @@ @@ -102,6 +102,9 @@
102 |go.blkhome | blk首页 |{"action":"go.blkhome"} | 102 |go.blkhome | blk首页 |{"action":"go.blkhome"} |
103 |go.couponProductList | 优惠商品列表 |{"action":"go.couponProductList","params":{"coupon_code":"1258","coupon_id":"1234", "title" : "x优惠活动", "coupon_title" : "以下商品满xxx减xx活动"}} |coupon_id:券ID coupon_code:券码 coupon_title:促销内容 title:标题 103 |go.couponProductList | 优惠商品列表 |{"action":"go.couponProductList","params":{"coupon_code":"1258","coupon_id":"1234", "title" : "x优惠活动", "coupon_title" : "以下商品满xxx减xx活动"}} |coupon_id:券ID coupon_code:券码 coupon_title:促销内容 title:标题
104 |go.associatorgift | 会员礼包 |{"action":"go.associatorgift"} | 104 |go.associatorgift | 会员礼包 |{"action":"go.associatorgift"} |
  105 +|go.promotion | 促销商品列表 | {"action":"go.promotion","params":{"title":"主标题","promotiontitle":"促销标题","promotion_id":"108"}} | title:页面标题 promotiontitle:促销标题 promotion_id:促销id
  106 +|go.searchlist | 模糊搜索列表页 | {"action":"go.searchlist","params":{"keyword":"店铺名字"}} | keyword:店铺名字 keyword信息会显示顶部的搜索框
  107 +
105 ### 新增推送(push)方式,兼容现有新跳转规则(统一有货 App跳转规则) 108 ### 新增推送(push)方式,兼容现有新跳转规则(统一有货 App跳转规则)
106 109
107 110