ActivityController

1

@@ -0,0 +1,7 @@
+Merge branch 'test'
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.

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

@@ -46,6 +46,7 @@
 
             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; ?>';