Merge branch 'pindan_activity_list_optimize' into 'master'

add 拼单小程序活动列表新版接口

See merge request bp/yaconf!62

interface.ini

@@ -155,6 +155,9 @@ goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_
 goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_wechat_bind"
 goods.public.take_place_by_goods_sku_ids = "http://goods.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 goods.marketing.tuancan_list = "http://goods.int.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.int.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -588,6 +591,10 @@ goods.public.get_distributor = "http://goods.pre.int.yidian-inc.com/marketing/di
 goods.public.pindan_goods = "http://goods.pre.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.pre.int.yidian-inc.com/user/user/user_wechat_bind"
 goods.public.take_place_by_goods_sku_ids = "http://goods.pre.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
+goods.marketing.tuancan_list = "http://goods.pre.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.pre.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.pre.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -1016,6 +1023,9 @@ goods.marketing.goods_list = "http://goods.test.int.yidian-inc.com/marketing/mar
 goods.marketing.marketing_goods_rate = "http://goods.test.int.yidian-inc.com/marketing/marketing/marketing_goods_rate"
 goods.marketing.get_marketing_goods_list = "http://goods.test.int.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 goods.marketing.tuancan_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 ;团长
 goods.marketing.second_distributor_list = "http://goods.test.int.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/apply_distributor"
@@ -1408,6 +1418,9 @@ goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketin
 goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
 goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
 goods.marketing.tuancan_list = "http://goods.dev.yidian-inc.com/marketing/marketing/tuancan_list"
+goods.marketing.pindan_active_and_ready_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_active_and_ready_list"
+goods.marketing.pindan_end_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_end_list"
+goods.marketing.pindan_active_basic_list = "http://goods.dev.yidian-inc.com/marketing/marketing/pindan_active_basic_list"
 
 ;团长
 goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"