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

@@ -17,7 +17,7 @@
     </div>
     </div>
     <script type="text/javascript">
     <script type="text/javascript">
         setTimeout(function (){
         setTimeout(function (){
-            location.href = '{{{activityUrl}}}';
+            location.href = '{{activityUrl}}';
         }, 2000);
         }, 2000);
     </script>
     </script>
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

@@ -122,7 +122,7 @@ class YuanxiaoController extends HuodongAction
         $this->_view->display('wait', array(
         $this->_view->display('wait', array(
             'staticTitle' => '2016潮流运势测试',
             'staticTitle' => '2016潮流运势测试',
             'staticFile' => self::STATIC_FILE,
             'staticFile' => self::STATIC_FILE,
-            'activityUrl' => !$this->isWeixin() ? $activityUrl . '?openby:yohobuy={"action":"go.h5","params":{"url":"' . $activityUrlEncode . '","islogin":"N","param":{"from":"app"},"share":"'.$activityUrlEncode.'","shareparam":{"share_id":"19"}}}' : $activityUrl,
+            'activityUrl' => $activityUrl, //!$this->isWeixin() ? $activityUrl . '?openby:yohobuy={"action":"go.h5","params":{"url":"' . $activityUrlEncode . '","islogin":"N","param":{"share_id":"19"},"share":"'.$activityUrlEncode.'","shareparam":{"share_id":"19"}}}' : $activityUrl,
             'staticJS' => array(
             'staticJS' => array(
                 'wait.js'
                 'wait.js'
             ),
             ),