Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap

@@ -42,7 +42,7 @@ class YuanxiaoController extends HuodongAction
             'shareDesc' => '元宵节快乐!一起来YOHO!BUY有货玩2016年潮流开运测试！',
             'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/02/19/16/02dbd38c84eccf1097b7e240452f0de856.png',
             'shareUrl' => Helpers::url('/cuxiao/yuanxiao/index'),
-            'playUrl' => $this->isApp() ? $playUrl . '?app_version=' . $this->get('app_version') . 'openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}': $playUrl,
+            'playUrl' => $this->isApp() ? $playUrl . '?app_version=' . $this->get('app_version') . '&openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $playUrlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}': $playUrl,
         ));
     }
 
@@ -82,7 +82,7 @@ class YuanxiaoController extends HuodongAction
                 $this->setCookie('yuanxiaochouqian', json_encode($cookieData), time() + 15 * 60);
 
                 $waitUrl = Helpers::url('/cuxiao/yuanxiao/wait');
-                $this->go($this->_isApp ? $waitUrl . '?app_version=' . $this->get('app_version') . 'openby:yohobuy={"action":"go.h5","params":{"islogin":"N","param":{"from":"app"}}}' : $waitUrl);
+                $this->go($this->_isApp ? $waitUrl . '?app_version=' . $this->get('app_version') . '&openby:yohobuy={"action":"go.h5","params":{"islogin":"N","param":{"from":"app"}}}' : $waitUrl);
 
             } else { // 不成功就显示返回的错误信息
 
@@ -134,7 +134,7 @@ class YuanxiaoController extends HuodongAction
         $this->_view->display('wait', array(
             'staticTitle' => '2016潮流运势测试',
             'staticFile' => self::STATIC_FILE,
-            'activityUrl' => $this->_isApp ? $activityUrl . '?app_version=' . $this->get('app_version') . 'openby:yohobuy={"action":"go.h5","params":{"islogin":"N","param":{"from":"app"},"share":"'.$activityUrl.'", shareparam:":{"share_id":"1"}}}' : $activityUrl,
+            'activityUrl' => $this->_isApp ? $activityUrl . '?app_version=' . $this->get('app_version') . '&openby:yohobuy={"action":"go.h5","params":{"islogin":"N","param":{"from":"app"},"share":"'.$activityUrl.'", shareparam:":{"share_id":"1"}}}' : $activityUrl,
             'staticJS' => array(
                 'wait.js'
             ),