activityController

www/protected/modules/common/controllers/ActivityController.php

@@ -88,7 +88,7 @@ class ActivityController extends O2oBaseController  {
                 }
             }
         }
-        var_dump($coupon_id);exit;
+        var_dump($coupon_id);
         if($home_page){
             $this->renderpartial('//o2o/web/index', array(
                 'version' => '2015111601',
@@ -122,17 +122,15 @@ class ActivityController extends O2oBaseController  {
         $redirectURI = 'http://' . $_SERVER['HTTP_HOST'] . Yii::app()->request->baseUrl . '/index.php?r=/common/activity/getCoupon&coupon_id='.$coupon_id;
 
         if($home_page){
-            $appURI = Yii::app()->request->baseUrl . '/common/activity/getCoupon'.'&home_page='.$home_page;
+            $appURI = Yii::app()->request->baseUrl . '/index.php?r=common/activity/getCoupon'.'&home_page='.$home_page.'&coupon_id='.$coupon_id;
             $redirectURI = $redirectURI.'/'.$home_page;
         }else{
-
-
-            $appURI = Yii::app()->request->baseUrl . '/common/activity/getCoupon&coupon_id='.$coupon_id;
+            $appURI = Yii::app()->request->baseUrl . '/index.php?r=common/activity/getCoupon&coupon_id='.$coupon_id;
         }
         $scope = 'snsapi_userinfo';
         $state = 'yiguanjia';
         $codeURI = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' . $wxConfig['appId'] . '&redirect_uri=' . urlencode($redirectURI) . '&response_type=code&scope=' . $scope . '&state=' . $state . '#wechat_redirect';
-
+        var_dump($appURI);var_dump($codeURI);exit;
         $this->renderpartial('wxIndex', array(
             'codeURI' => $codeURI,
             'appURI' => $appURI

www/protected/modules/common/views/activity/getCoupon.php

@@ -38,10 +38,7 @@
 <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>
 <script type="text/javascript">
     (function(){
-
         var ua = navigator.userAgent.toLowerCase();
-        var url = '<?php echo Yii::app()->request->baseUrl?>';
-
         <?php
         if(isset($from_channel)){
             echo "var from_channel = '$from_channel';";
@@ -51,7 +48,7 @@
         }
         ?>
 
-        if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+       // if (ua.match(/MicroMessenger/i) == 'micromessenger') {
             <?php
             if(!empty($userId) && !empty($appToken)){
                 echo '
@@ -67,12 +64,12 @@
                 location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id='.$coupon_id; ?>';
             }
             document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
-        }
+        //}
         if (location.hash == '#rd') {
             location.hash = '';
         }
         var debug = true;
-
+        
 
         var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=20160960804';
         if (debug) {