Merge branch 'pindan_activity_list_optimize' into 'master'

add 拼单小程序活动列表新版接口 获取活动是否在线接口

See merge request bp/yaconf!65

interface.ini

@@ -158,6 +158,7 @@ goods.marketing.tuancan_list = "http://goods.int.yidian-inc.com/marketing/market
 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.is_online = "http://goods.int.yidian-inc.com/marketing/marketing/is_online"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -605,6 +606,7 @@ goods.marketing.tuancan_list = "http://goods.pre.yidian-inc.com/marketing/market
 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.is_online = "http://goods.pre.yidian-inc.com/marketing/marketing/is_online"
 
 ;营销中心
 goods.marketing.yingxiao_list = "http://goods.pre.int.yidian-inc.com/marketing/marketing/yingxiao_list"
@@ -1045,6 +1047,7 @@ goods.marketing.tuancan_list = "http://goods.test.int.yidian-inc.com/marketing/m
 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.is_online = "http://goods.test.int.yidian-inc.com/marketing/marketing/is_online"
 ;团长
 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"
@@ -1449,6 +1452,7 @@ goods.marketing.tuancan_list = "http://goods.dev.yidian-inc.com/marketing/market
 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.is_online = "http://goods.dev.yidian-inc.com/marketing/marketing/is_online"
 
 ;团长
 goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"

marketing.ini

+[common]
+
+
+; 生产环境
+[prod : common ]
+
+;裂变优惠券
+fission_marketing_id  =  "10000094"
+;团长分销活动
+colonel_marketing_id  =  "10000095"
+
+; 预发环境
+[perf : common]
+
+;裂变优惠券
+fission_marketing_id  =  "10000094"
+;团长分销活动
+colonel_marketing_id  =  "10000095"
+
+
+;测试环境
+[test : common]
+
+;裂变优惠券
+fission_marketing_id  =  "3"
+;团长分销活动
+colonel_marketing_id  =  "2"
+
+;开发环境
+[dev : common]
+
+;裂变优惠券
+fission_marketing_id  =  "165"
+;团长分销活动
+colonel_marketing_id  =  "166"
+
+
+;goods 调用 生活号
+[prod-goods : prod : common]
+[perf-goods : perf : common]
+[test-goods : test : common]
+[dev-goods : dev : common]
+