do merge develop code to fixes bugs and add home test multi uid

hf
Commit e29d69c8261ba79b278fcf8870ac2d96ed61dc4e 1 parent 14cb0711
Showing 3 changed files with 60 additions and 37 deletions
script/nginx/conf/vhosts/nginx.test.yohobuy.conf
template/m.yohobuy.com/actions/index/home/index.phtml
yohobuy/m.yohobuy.com/application/controllers/Home.php
--- a/script/nginx/conf/vhosts/nginx.test.yohobuy.conf
View file @e29d69c
+++ b/script/nginx/conf/vhosts/nginx.test.yohobuy.conf
View file @e29d69c
@@ -173,6 +173,22 @@ server
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header   Accept-Encoding "gzip";
     }
+    location ^~ /product/pro_ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location ^~ /product/intro_ {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
     # 逛相关
     location ^~ /guang/ {
--- a/template/m.yohobuy.com/actions/index/home/index.phtml
View file @e29d69c
+++ b/template/m.yohobuy.com/actions/index/home/index.phtml
View file @e29d69c
@@ -94,7 +94,7 @@
             </a>
         </div>
         <div class="group-list">
-            <a class="list-item" href="/home/IHelp">
+            <a class="list-item" href="/help.html">
                 <span class="iconfont icon">&#xe639;</span>
                 帮助
                 <span class="iconfont num">&#xe604;</span>
--- a/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @e29d69c
+++ b/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @e29d69c
@@ -31,7 +31,7 @@ class HomeController extends AbstractAction
         if (!$uid) {
             $uid = $this->_uid = $this->get('uid', 8826435); //$this->getUid(true);
         }
-        
+
         $action = $this->getRequest()->getActionName();
         if (!$uid && $action !== 'index') {
             $this->go(Helpers::url('/signin.html'));
@@ -64,25 +64,25 @@ class HomeController extends AbstractAction
         $this->_view->display('index', $data);
     }
-	/**
-	 * 为您优选
-	 */
-	public function preferenceAction()
-	{
-		$result = array();
+    /**
+     * 为您优选
+     */
+    public function preferenceAction()
+    {
+        $result = array();
-		if ($this->isAjax()) {
-			// 优选新品数据
-			$channel = Helpers::getChannelByCookie();
-			$result = UserModel::getPreferenceData($channel);
-		}
+        if ($this->isAjax()) {
+            // 优选新品数据
+            $channel = Helpers::getChannelByCookie();
+            $result = UserModel::getPreferenceData($channel);
+        }
-		if (empty($result)) {
-			echo ' ';
-		} else {
-			$this->_view->display('recommend-content', $result);
-		}
-	}
+        if (empty($result)) {
+            echo ' ';
+        } else {
+            $this->_view->display('recommend-content', $result);
+        }
+    }
     /**
      * 用户收藏的商品
@@ -147,9 +147,9 @@ class HomeController extends AbstractAction
         if ($this->isAjax()) {
             $uid = $this->getUid();
-	        $udid = $this->getUdid();
-	        $page = $this->get('page', 1);
-	        $limit = $this->get('limit', 100);
+            $udid = $this->getUdid();
+            $page = $this->get('page', 1);
+            $limit = $this->get('limit', 100);
             $result = UserModel::browserRecord($uid, $udid, $page, $limit);
         }
@@ -310,7 +310,7 @@ class HomeController extends AbstractAction
         }
     }
-    /** 
+    /**
      * 在线客服
      */
     public function onlineServiceAction()
@@ -469,13 +469,14 @@ class HomeController extends AbstractAction
         $uid = $this->getUid();
         $data = GradeModel::getGrade($gender, $channel, $uid);
         $data['pageFooter'] = true;
-        
+
         $this->_view->display('vip-grade', $data);
     }
     /*
      * 会员特权查看页
      */
+
     public function preferentialAction()
     {
         //设置网站seo信息
@@ -494,6 +495,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单页面,获得nav导航条焦点。并且异步请求订单详情列表页（getOrders）
      */
+
     public function orderAction()
     {
         //获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论。
@@ -554,6 +556,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单-取消订单
      */
+
     public function cancelOrderAction()
     {
         //判断是不是ajax请求
@@ -574,6 +577,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单-删除订单
      */
+
     public function delOrderAction()
     {
         //判断是不是ajax请求
@@ -594,6 +598,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单-支付链接获取
      */
+
     private function paymentAction()
     {
         $gender = Helpers::getGenderByCookie();
@@ -604,6 +609,7 @@ class HomeController extends AbstractAction
     /*
      * 我的订单-随便逛逛链接获取
      */
+
     private function strollAction()
     {
         //获取性别、频道数据
@@ -662,24 +668,25 @@ class HomeController extends AbstractAction
      * 帮助列表页
      */
     private function IHelpAction()
-    {   
+    {
         $this->setTitle('帮助中心');
         $this->setNavHeader('帮助中心');
         $data = array(
             'iHelp' => array(
-                array('name' => '新用户注册','url' => 'http://m.dev.yohobuy.com/' ),
-                array('name' => '交款须知' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '服务条款' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '网站订购流程' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '会员登录' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '网站订单修改' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => 'YOHO币' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '常见问题' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '支付方式' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '发票制度说明' ,'url' => 'http://m.dev.yohobuy.com/'),
-                array('name' => '配送时间' ,'url' => 'http://m.dev.yohobuy.com/')
+                array('name' => '新用户注册', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '交款须知', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '服务条款', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '网站订购流程', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '会员登录', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '网站订单修改', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => 'YOHO币', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '常见问题', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '支付方式', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '发票制度说明', 'url' => 'http://m.dev.yohobuy.com/'),
+                array('name' => '配送时间', 'url' => 'http://m.dev.yohobuy.com/')
             )
         );
         $this->_view->display('i-help', $data);
     }
-}    
+
+}