8 years ago · 551228225b
--- a/1
+++ b/1
@@ -1,7 +0,0 @@
 
				-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.
			
--- a/www/protected/modules/common/controllers/ActivityController.php
+++ b/www/protected/modules/common/controllers/ActivityController.php
@@ -82,6 +82,7 @@ class ActivityController extends O2oBaseController  {
 
				         $coupon_id =new MongoId($coupon_id);
			
 
				         $start_time = time();                 //发放优惠券可用开始时间
			
 
				         $end_time = $start_time + 86400*30;   //发放优惠券过期时间
			
 
				+
			
 
				         $flag = 0;
			
 
				         if ($userId != '') {
			
 
				             $userId = new MongoId($userId);
			
@@ -94,7 +95,6 @@ class ActivityController extends O2oBaseController  {
 
				             }
			
 
				             $flag = 1;
			
 
				         }
			
 
				-
			
 
				         if($flag){
			
 
				             $this->renderpartial('index');
			
 
				         }else{
			
--- a/www/protected/modules/common/views/activity/getCoupon.php
+++ b/www/protected/modules/common/views/activity/getCoupon.php
@@ -26,7 +26,9 @@
 
				     (function(){
			
 
				         var ua = navigator.userAgent.toLowerCase();
			
 
				         if (ua.match(/MicroMessenger/i) == 'micromessenger') {
			
 
				+
			
 
				             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>');
			
 
				         }
			
 
				     })();
			
--- a/www/protected/modules/common/views/activity/index.php
+++ b/www/protected/modules/common/views/activity/index.php
@@ -15,7 +15,7 @@
 
				 <body>
			
 
				 <div align="center">
			
 
				     <h1>扫码关注壹管家获取更多资讯</h1>
			
 
				-    <img src="<?php echo Yii::app()->request->baseUrl; ?>/images/qryiguanjia.jpg" class="index_logo" />
			
 
				+    <img src="<?php echo Yii::app()->request->baseUrl; ?>/images/qryiguanjia.jpg" class="index_logo" style="width: 100%"/>
			
 
				 </div>
			
 
				 </body>