Merge branch 'master' into develop

# Conflicts:
#	README.md

@@ -39,11 +39,12 @@
 |      action      |    跳转目的     |                                                                                                                                   跳转参数                                                                                                                              |           说明            |
 |------------------|-------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|
 | go.brand         | 品牌列表页       | yohobuy＝{"action":"go.brand","params":{"shop_id":"356","jumptoshop":"Y","brand_id":"4","promotion":"4",tags_filter: "1","app_type":"1"}}  |app_type 0:有货 1:BLK                                                                                                                                                                                                               |  promotion专区id(童装), tags_filter（默认不填，1：全球购羊头品牌标签过滤）,如果要跳转到店铺设置jumptoshop=Y,否则跳转到品牌|
-| go.productDetail | 商品详情页       | yohobuy={"action":"go.productDetail","params":{"product_skn":"126131",tags_filter: "1"，"from_page_name":"aFP_XXX","from_page_param":"12354"}}                                                                                                                                                                                                   |tags_filter（默认不填，1：全球购羊头品牌标签过滤),from_page_name:当前页面P_NAME, from_page_param:当前页面P_PARAM |
+| go.productDetail | 商品详情页       | yohobuy={"action":"go.productDetail","params":{"product_skn":"126131",tags_filter:"1"，"from_page_name":"aFP_XXX","from_page_param":"12354"}}                                                                                      |tags_filter（默认不填，1：全球购羊头品牌标签过滤),from_page_name:当前页面P_NAME, from_page_param:当前页面P_PARAM |
+| go.productDetail | 拼团商品详情页       | yohobuy={"action":"go.productDetail","params":{"product_skn":"126131","activity_id":"123","activity_type":"groupPurchase"}}                                                                                      | activity_id:拼团id，activity_type: 拼团商品详情标识|
 | go.coupon        | 优惠券页        | yohobuy＝{"action":"go.coupon"}                                                                                                                                                                                                                                           |                         |
 | go.fav           | 收藏列表页       | yohobuy＝{"action":"go.fav","params":{"favType":"0"}}                                                                                                                                                                                                                     | favType标示收藏类型：0:商品收藏和 1:品牌收藏 |
 | go.mine          | 我的页面        | yohobuy＝{"action":"go.mine"}                                                                                                                                                                                                                                             |                         |
-| go.list          | 商品列表页       | yohobuy＝{"action":"go.list","params":{"msort":"1","misort":"11","title":"上衣"， "actiontype":"1" ，"shop_id":"356", "query":"关键字搜索", "gender":"1,3", "brand":"1", "color":"1", "size":"12", "price":"10", "page":"1", "isrecommd":"Y", "ishot":"Y", "p_d":"0.1, 0.9", "promotion":"23","outlets":"1","app_type":"0","cover_url":"imageurl"}} | actiontype=0 其他，支持promotion搜索；actiontype=1 普通分类；actiontype=2 专区商品列表 cover_url 专区配置顶部banner图片url； outlets=1表示是奥莱的商品 app_type 0:有货 1:BLK|
+| go.list          | 商品列表页       | yohobuy＝{"action":"go.list","params":{"sort":"12","msort":"1","misort":"11","title":"上衣"， "actiontype":"1" ，"shop_id":"356", "query":"关键字搜索", "gender":"1,3", "brand":"1", "color":"1", "size":"12", "price":"10", "page":"1", "isrecommd":"Y", "ishot":"Y", "p_d":"0.1, 0.9", "promotion":"23","outlets":"1","app_type":"0","cover_url":"imageurl","contentCode":""}} | actiontype=0 其他，支持promotion搜索；actiontype=1 普通分类；actiontype=2 专区商品列表 cover_url 专区配置顶部banner图片url； outlets=1表示是奥莱的商品 app_type 0:有货 1:BLK sort:类目 contentCode:商品列表楼层资源位code码|
 | go.attention     | 分类页         | yohobuy＝{"action":"go.attention","params":{"actiontype":"0"}}    |  "actiontype=0 品类 1品牌 2关注"                    |
 | go.plus          | plus页       | yohobuy＝{"action":"go.plus"}                                                                                                                                                                                                                                             |                         |
 | go.star          | star页       | yohobuy＝{"action":"go.star"}                                                                                                                                                                                                                                             |                         |
@@ -58,8 +59,8 @@
 | go.home	| 侧滑跳转到首页 |  yohobuy＝{"action":"go.home","params":{"gender":"1","channel":"2"}}     |除侧滑二级页面，其它禁用 channel频道标识  |
 | go.secondhome	| 跳转到第二首页  |  yohobuy＝{"action":"go.secondhome"}     | 无参数   |
 | go.newyohood	| banner跳转到yohood页 |  yohobuy＝{"action":"go.newyohood"}     |
-| go.top100           | 热卖排行榜       | yohobuy＝{"action":"go.top100","params":{"page":"0"}}     | page表示显示的tab页索引，0 第一个                                                                                                                                                                                                                                   |
-| go.activitytemplate   | 活动模板   | yohobuy＝{"action":"go.activitytemplate","params":{"template_id":"0","title":"标题","type":"0"}} | template_id表示活动ID ，title表示活动标题 ,type区分不同类型（0通用、1新人专享）（同类型活动模板根据type区分）
+| go.top100           | 热卖排行榜       | yohobuy＝{"action":"go.top100","params":{"page":"0","contentCode":""}}     | page表示显示的tab页索引，0 第一个;contentCode:楼层资源位code码                                                                                                                                                                                                                                   |
+| go.activitytemplate   | 活动模板   | yohobuy＝{"action":"go.activitytemplate","params":{"template_id":"0","title":"标题","type":"0"}} | template_id表示活动ID ，title表示活动标题 ,type区分不同类型（0通用、1新人专享 2拼团）（同类型活动模板根据type区分，配置拼团时，活动id优先使用activityId代替template_id）。拼团另外支持的参数有：collageTopSkn, sort, gender, order, p_d, color, brand, price, g_size, msort, misort, age_level, style, from, showType, productPool
 |go.subchannel          | 二级频道   | yohobuy＝{"action":"go.subchannel","params":{"template_id":"28","title":"标题","content_code":"891b7811db16feba557fd8eff7f07dcf"}} | template_id表示你可能喜欢数据的ID ，title表示二级频道标题 ,content_code表示二级频道资源位
 |go.showgoods          | 去晒单   | yohobuy＝{"action":"go.showgoods"} |
 |go.globalpurchase     | 全球购首页   | yohobuy＝{"action":"go.globalpurchase"} | 不带任何参数
@@ -111,6 +112,9 @@
 |go.ufo     | 球鞋市集UFO   | {"action":"go.ufo","params":{"pagename":"home"}} | 更多参数参数见[UFO 跳转规则](http://git.yoho.cn/ufo/mobileApi/blob/master/go_ufo_rules.md)
 
 
+|go.miniapp   | 小程序落地页规则      | yohobuy＝{"action":"go.miniapp","params":{"username":"gh_afb5ac7a8f9d","path":"/pages/index/index","debugmode":"1"}}   | username,小程序标识 gh_afb5ac7a8f9d表示有货精选gh_e55f5aae07b7表示限定小程序 path,小程序落地页面路径，缺省到小程序首页 开发人员配置选项debugmode,1表示开发版 2表示体验版 0 or字段缺省表示正式版本
+|go.switchchannel    | 男女首页切换规则      | {"action":"go.switchchannel","params":{"channel":"1","tip":"您已切换到男生频道"}}   | v6.9.4版本后channel值使用首页的channelid值, channel:1男装 2女装 3潮童 1469高街BLK 1951创意生活 2073球鞋 tip：切换到channel频道的提示
+|go.mineredpackage    | 跳转至6.7.9新增的我的红包页      | {"action":"go.mineredpackage"}   |
 ### 新增推送（push）方式，兼容现有新跳转规则（统一有货 App跳转规则）
 
 
@@ -163,6 +167,9 @@
 |go.refundorderdetail     | 退货详情页        | {"type": "push","url":{"action":"go.refundorderdetail","params":{"id":"123"}}}   |,id:退货id
 |go.changeorderdetail     | 换货详情页        | {"type": "push","url":{"action":"go.changeorderdetail","params":{"id":"123"}}}   |,id:换货id
 |go.yohocoin     | 我的有货币         | {"type": "push","url":{"action":"go.yohocoin"}}   |
+|go.userLogout     | 账号注销         | {"title":"账号注销","type":"userLogout"}   |title为页面名称，type指定注销页面，其中type类型有：'userLogout'账户注销页，'userLogoutClause'注销条款页面，'userLogouReason'注销原因页面，'userLogoutFaildReason'注销失败原因页面，'userLogoutFaild'注销失败页面，'userLogoutStatus'注销状态页面
+|go.minealliance     | 我的联盟   | {"action":"go.minealliance","params":{"title":"我的联盟"}} | title:页面标题
+|go.bargainlist     | 砍价列表   | {"action":"go.bargainlist","params":{"title":"砍价"}} | title:页面标题
 
 ### 新增推送（push）更新App新版本
 
@@ -303,3 +310,5 @@ var params = { "Native_FS":"deleteItemAtPath", "options":{ "path":"itemPath" }};
 ```javascript
 var params = { "Native_FS":"copyItem", "options":{ "srcPath":"xxx", "dstPath":"xxx" } };
 ```
+
+