chenchao / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 5cfd01ebd8a698df78f0ed4099dd7b0847ccb8de 2 parents 446b030f 5682930b

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -52,7 +52,7 @@ class CouponController extends HuodongAction @@ -52,7 +52,7 @@ class CouponController extends HuodongAction
52 $urlGirls = Helpers::url('/cuxiao/coupon/girlsbrand'); 52 $urlGirls = Helpers::url('/cuxiao/coupon/girlsbrand');
53 $urlKids = Helpers::url('/cuxiao/coupon/kidsbrand'); 53 $urlKids = Helpers::url('/cuxiao/coupon/kidsbrand');
54 $urlLifestyle = Helpers::url('/cuxiao/coupon/lifestylebrand'); 54 $urlLifestyle = Helpers::url('/cuxiao/coupon/lifestylebrand');
55 - $urlShare = Yohobuy::SERVICE_URL . '/operations/api/v5/webshare/getShare'; 55 + $urlShare = '\/operations\/api\/v5\/webshare\/getShare';
56 $urlEncode = strtr($urlBoys, array('/' => '\\/')); 56 $urlEncode = strtr($urlBoys, array('/' => '\\/'));
57 57
58 $this->_view->display('boysbrand', array( 58 $this->_view->display('boysbrand', array(
@@ -67,7 +67,7 @@ class CouponController extends HuodongAction @@ -67,7 +67,7 @@ class CouponController extends HuodongAction
67 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/11/26/09/0226ad7f8bcf5467a789e17b761c7557e0.jpg', 67 'shareImg' => 'http://img12.static.yhbimg.com/couponImg/2015/11/26/09/0226ad7f8bcf5467a789e17b761c7557e0.jpg',
68 'shareDesc' => '2015感恩季！品牌专属优惠券限时送！先领券，再购物，让你乐享整个冬季！', 68 'shareDesc' => '2015感恩季！品牌专属优惠券限时送！先领券，再购物，让你乐享整个冬季！',
69 69
70 - 'url_boys' => $urlBoys . '?yohobuy={"action":"go.h5","params":{"id":"364","share":"' . $urlShare . '","shareparam":{"share_id":"406"},"islogin":"N","type":0,"url":"' . $urlBoys . '","param":{}}}', 70 + 'url_boys' => $urlBoys . '?yohobuy={"action":"go.h5","params":{"id":"364","share":"' . $urlShare . '","shareparam":{"share_id":"406"},"islogin":"Y","type":0,"url":"' . $urlBoys . '","param":{}}}',
71 'url_girls' => $urlGirls . '?yohobuy={"action":"go.h5","params":{"id":"366","share":"' . $urlShare . '","shareparam":{"share_id":"408"},"islogin":"N","type":0,"url":"' . $urlGirls . '","param":{}}}', 71 'url_girls' => $urlGirls . '?yohobuy={"action":"go.h5","params":{"id":"366","share":"' . $urlShare . '","shareparam":{"share_id":"408"},"islogin":"N","type":0,"url":"' . $urlGirls . '","param":{}}}',
72 'url_kids' => $urlKids . '?yohobuy={"action":"go.h5","params":{"id":"368","share":"' . $urlShare . '","shareparam":{"share_id":"410"},"islogin":"N","type":0,"url":"' . $urlKids . '","param":{}}}', 72 'url_kids' => $urlKids . '?yohobuy={"action":"go.h5","params":{"id":"368","share":"' . $urlShare . '","shareparam":{"share_id":"410"},"islogin":"N","type":0,"url":"' . $urlKids . '","param":{}}}',
73 'url_lifestyle' => $urlLifestyle . '?yohobuy={"action":"go.h5","params":{"id":"370","share":"' . $urlShare . '","shareparam":{"share_id":"412"},"islogin":"N","type":0,"url":"' . $urlLifestyle . '","param":{}}}', 73 'url_lifestyle' => $urlLifestyle . '?yohobuy={"action":"go.h5","params":{"id":"370","share":"' . $urlShare . '","shareparam":{"share_id":"412"},"islogin":"N","type":0,"url":"' . $urlLifestyle . '","param":{}}}',