Merge branch 'master' of https://gitlab.yidian-inc.com/bp/yaconf

interface.ini

@@ -31,6 +31,8 @@ service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/g
 
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
+service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
+
 
 ;Switch开关按钮域名
 service.switch.api = "http://api.jwshq.cn/"
@@ -146,6 +148,7 @@ goods.marketing.get_marketing_goods_list = "http://goods.int.yidian-inc.com/mark
 goods.public.get_marketing_list = "http://goods.int.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.int.yidian-inc.com/goods/goods/pindan_goods"
+goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_wechat_bind"
 
 
 ;团长
@@ -195,7 +198,6 @@ goods.public.goods_spu_list = "http://goods.int.yidian-inc.com/goods/goods/goods
 goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_goods_sku"
 goods.public.goods_spu_shop_list = "http://goods.int.yidian-inc.com/goods/goods/goods_spu_shop_list"
 
-
 ;用户绑定
 goods.user.wechat_login = "http://goods.int.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.int.yidian-inc.com/user/user/bind_phone"
@@ -227,6 +229,12 @@ order.order.order_refund_callback = "http://order.int.yidian-inc.com/order/order
 order.order.order_info = "http://order.int.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.int.yidian-inc.com/order/order/my_order_record"
 order.user.is_new_user = "http://order.int.yidian-inc.com/order/order/is_new_user"
+order.order.wx_share_code = "http://order.int.yidian-inc.com/order/order/wx_share_code"
+order.marketing.marketing_order_list = "http://order.int.yidian-inc.com/order/marketing/marketing_order_list"
+order.order.order_confirm_page = "http://order.int.yidian-inc.com/order/order/order_confirm_page"
+
+
+
 
 ;订单后台
 order.order.old_order_list = "http://order.int.yidian-inc.com/order/order/old_order_list"
@@ -322,6 +330,8 @@ service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/y
 service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserWXBindingInfo"
+service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
+
 
 service.jw_order.refund = "http://test.zhiyueapp.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "http://test.zhiyueapp.cn/api/wx/hulk/order/rejectRefundByBuyer"
@@ -487,6 +497,8 @@ goods.public.goods_spu_shop_list = "http://goods.test.int.yidian-inc.com/goods/g
 goods.public.get_marketing_list = "http://goods.test.int.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
+goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/user_wechat_bind"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
@@ -521,6 +533,11 @@ order.order.order_refund_callback = "http://order.test.yidian-inc.com/order/orde
 order.order.order_info = "http://order.test.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.test.yidian-inc.com/order/order/my_order_record"
 order.user.is_new_user = "http://order.test.yidian-inc.com/order/order/is_new_user"
+order.order.wx_share_code = "http://order.test.yidian-inc.com/order/order/wx_share_code"
+order.marketing.marketing_order_list = "http://order.test.yidian-inc.com/order/marketing/marketing_order_list"
+order.order.order_confirm_page = "http://order.test.yidian-inc.com/order/order/order_confirm_page"
+
+
 
 ;订单后台
 order.order.old_order_list = "http://order.test.yidian-inc.com/order/order/old_order_list"
@@ -698,6 +715,7 @@ goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketin
 goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
 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.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/apply_distributor"
@@ -745,6 +763,7 @@ goods.public.goods_spu_shop_list = "http://goods.dev.yidian-inc.com/goods/goods/
 goods.public.get_marketing_list = "http://goods.dev.yidian-inc.com/marketing/marketing/get_marketing_list"
 goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/get_distributor"
 goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
+goods.public.user_wechat_bind = "http://goods.dev.yidian-inc.com/user/user/user_wechat_bind"
 
 
 ;用户绑定
@@ -779,6 +798,10 @@ order.order.order_refund_callback = "http://order.dev.yidian-inc.com/order/order
 order.order.order_info = "http://order.dev.yidian-inc.com/order/order/order_info"
 order.order.my_order_record = "http://order.dev.yidian-inc.com/order/order/my_order_record"
 order.user.is_new_user = "http://order.dev.yidian-inc.com/order/order/is_new_user"
+order.order.wx_share_code = "http://order.dev.yidian-inc.com/order/order/wx_share_code"
+order.marketing.marketing_order_list = "http://order.dev.yidian-inc.com/order/marketing/marketing_order_list"
+order.order.order_confirm_page = "http://order.dev.yidian-inc.com/order/order/order_confirm_page"
+
 
 ;订单后台
 order.order.old_order_list = "http://order.dev.yidian-inc.com/order/order/old_order_list"