Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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

@@ -85,7 +85,8 @@ class ActivityController extends O2oBaseController  {
         $coupon_id =new MongoId($coupon_id);
         $start_time = time();                 //发放优惠券可用开始时间
         $end_time = $start_time + 86400*30;   //发放优惠券过期时间
-        $flag = 0;
+        $flag = 1;
+        var_dump($userId);
         if ($userId != ""){
             if (!CommonFn::isMongoId($userId)) {
                 $userId = new MongoId($userId);

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

@@ -58,13 +58,18 @@
           ';
             }
             ?>
-            location.href = '<?php echo Yii::app()->request->baseUrl . 'index.php?r=/common/activity/wxIndex&coupon_id='.$coupon_id; ?>';
+
+            var userID = localStorage.getItem('wxUserID');
+            var appToken = localStorage.getItem('appToken');
+            alert(userID);
+            if (!userID || !appToken) {
+                localStorage.clear();
+                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 = '';
-        }
+
 
     })();
 </script>