do modify domain m1.yohobuy.com mapi.yohobuy.com

@@ -283,24 +283,22 @@ class AbstractAction extends Controller_Abstract
      */
      */
     protected function getUid($useSession = false)
     protected function getUid($useSession = false)
     {
     {
-        // @todo debug 因登录没有写老的SESSION会话，此处使用COOKIE
-        $useSession = false;
-        
         if (!$this->_uid) {
         if (!$this->_uid) {
-            // 从SESSION获取
-            if ($useSession) {
-                $this->_uid = $this->getSession('_UID');
-            } 
-            // 从COOKIE获取
-            else {
             $cookie = $this->getCookie('_UID');
             $cookie = $this->getCookie('_UID');
             if (!empty($cookie)) {
             if (!empty($cookie)) {
+                $uid = 0;
                 $cookieList = explode('::', $cookie);
                 $cookieList = explode('::', $cookie);
                 if (isset($cookieList[1]) && is_numeric($cookieList[1])) {
                 if (isset($cookieList[1]) && is_numeric($cookieList[1])) {
-                        $this->_uid = $cookieList[1];
+                    $uid = $cookieList[1];
                     $this->_uname = $cookieList[0];
                     $this->_uname = $cookieList[0];
                     $this->_vip = $cookieList[2];
                     $this->_vip = $cookieList[2];
                 }
                 }
+                // 服务端比较
+                if ($useSession && $uid) {
+                    $token = $this->getSession('_TOKEN');
+                    if ($token === Helpers::makeToken($uid)) {
+                        $this->_uid = $uid;
+                    }
                 }
                 }
             }
             }
         }
         }
@@ -335,6 +333,7 @@ class AbstractAction extends Controller_Abstract
      * @param bool $showMore 是否显示更多内容
      * @param bool $showMore 是否显示更多内容
      * @return void
      * @return void
      */
      */
+
     protected function setTitle($title, $showMore = true, $sign = ' | ')
     protected function setTitle($title, $showMore = true, $sign = ' | ')
     {
     {
         $this->_view->assign('title_more', $showMore);
         $this->_view->assign('title_more', $showMore);
@@ -422,6 +421,7 @@ class AbstractAction extends Controller_Abstract
 
 
         $this->_view->assign('pageHeader', $header);
         $this->_view->assign('pageHeader', $header);
     }
     }
+
     /**
     /**
      * 设置网站导航底部信息
      * 设置网站导航底部信息
      * 
      * 

@@ -84,7 +84,8 @@ class LoginData
      */
      */
     public static function signoutSession($token)
     public static function signoutSession($token)
     {
     {
-        return Yohobuy::get( Helpers::logoutSession($token) );
+        echo Helpers::logoutSession($token); exit;
+        echo Yohobuy::get( Helpers::logoutSession($token) ); exit;
     }
     }
 
 
 }
 }

@@ -41,7 +41,7 @@ class HomeController extends AbstractAction
     {
     {
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('个人中心');
         $this->setTitle('个人中心');
-        $this->setNavHeader('个人中心');
+        $this->setNavHeader('个人中心', $this->server('HTTP_REFERER', SITE_MAIN) );
 
 
         $data = array(
         $data = array(
             'myIndexPage' => true,
             'myIndexPage' => true,

@@ -69,15 +69,16 @@ class OrderModel
         //检查数据返回是否正常,正常则处理数据
         //检查数据返回是否正常,正常则处理数据
         if (!empty($data['data']['order_list'])) {
         if (!empty($data['data']['order_list'])) {
             // 订单的状态列表
             // 订单的状态列表
-            $orderStatus = Helpers::getOrderStatus();
+            //$orderStatus = Helpers::getOrderStatus();
             
             
             foreach ($data['data']['order_list'] as $key => $vo) {
             foreach ($data['data']['order_list'] as $key => $vo) {
-                if ($vo['payment_status'] == 'Y' && $vo['status'] == 0) {
-                    $vo['status'] = 1;
-                }
+//                if ($vo['payment_status'] == 'Y' && $vo['status'] == 0) {
+//                    $vo['status'] = 1;
+//                }
                 //订单号，支付状态，订单商品数量，订单总价格
                 //订单号，支付状态，订单商品数量，订单总价格
                 $result[$key]['orderNum'] = $vo['order_code'];
                 $result[$key]['orderNum'] = $vo['order_code'];
-                $result[$key]['orderStatus'] = ($vo['is_cancel'] === 'Y') ? '已取消' : $orderStatus[ $vo['payment_type'] ][ $vo['status'] ];
+                //$result[$key]['orderStatus'] = ($vo['is_cancel'] === 'Y') ? '已取消' : $orderStatus[ $vo['payment_type'] ][ $vo['status'] ];
+                $result[$key]['orderStatus'] = $vo['status_str'];
                 $result[$key]['count'] = count($vo['order_goods']);
                 $result[$key]['count'] = count($vo['order_goods']);
                 $result[$key]['sumCost'] = $vo['amount'];
                 $result[$key]['sumCost'] = $vo['amount'];
                 //类内调用格式化订单商品数据方法
                 //类内调用格式化订单商品数据方法

@@ -213,11 +213,20 @@ class DetailModel
                 'cartUrl' => Helpers::url('/cart/index/index', null), // 购物车链接
                 'cartUrl' => Helpers::url('/cart/index/index', null), // 购物车链接
                 'numInCart' => 0,
                 'numInCart' => 0,
                 'goodsInstore' => $baseInfo['storage'], // 库存量
                 'goodsInstore' => $baseInfo['storage'], // 库存量
-                'soldOut' => $baseInfo['storage'] == 0, // 已售磬
-                'notForSale' => $baseInfo['attribute'] == 2, // 非卖品
             );
             );
-            if (!$result['cartInfo']['soldOut'] && !$result['cartInfo']['notForSale']) {
-                $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); // 加入购物车链接
+            $soldOut = $baseInfo['storage'] == 0;
+            $notForSale = $baseInfo['attribute'] == 2;
+            // 显示加入购物车链接
+            if (!$soldOut && !$notForSale) {
+                $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); // 
+            }
+            // 已售磬
+            elseif (!$notForSale && $soldOut) {
+                $result['cartInfo']['soldOut'] = true; 
+            }
+            // 非卖品
+            elseif (!$soldOut && $notForSale) {
+                $result['cartInfo']['notForSale'] = true;
             }
             }
 
 
             // 是否收藏
             // 是否收藏

@@ -18,12 +18,6 @@ class LoginController extends AbstractAction
     public function indexAction()
     public function indexAction()
     {
     {
         $refer = $this->get('refer');
         $refer = $this->get('refer');
-        // 已登录则直接跳回
-        $uid = $this->getUid();
-        if ($uid) {
-            $refer = empty($refer) ? SITE_MAIN . '/?go=1' : rawurldecode($refer);
-            $this->go($refer);
-        }
         if (!empty($refer)) {
         if (!empty($refer)) {
             $this->setCookie('refer', $refer);
             $this->setCookie('refer', $refer);
         }
         }
@@ -54,12 +48,6 @@ class LoginController extends AbstractAction
     public function internationalAction()
     public function internationalAction()
     {
     {
         $refer = $this->get('refer');
         $refer = $this->get('refer');
-        // 已登录则直接跳回
-        $uid = $this->getUid();
-        if ($uid) {
-            $refer = empty($refer) ? SITE_MAIN . '/?go=1' : rawurldecode($refer);
-            $this->go($refer);
-        }
         if (!empty($refer)) {
         if (!empty($refer)) {
             $this->setCookie('refer', $refer);
             $this->setCookie('refer', $refer);
         }
         }
@@ -82,10 +70,12 @@ class LoginController extends AbstractAction
      */
      */
     public function outAction()
     public function outAction()
     {
     {
+        // 清除客户端
         $this->setCookie('_UID', '');
         $this->setCookie('_UID', '');
+        // 清除服务端会话
+        $this->setSession('_TOKEN', '');
 
 
         $refer = $this->server('HTTP_REFERER', SITE_MAIN);
         $refer = $this->server('HTTP_REFERER', SITE_MAIN);
-
         $token = $this->get('token');
         $token = $this->get('token');
         if (!empty($token)) {
         if (!empty($token)) {
             LoginData::signoutSession($token);
             LoginData::signoutSession($token);
@@ -143,7 +133,6 @@ class LoginController extends AbstractAction
             $data['data']['href'] = $refer;
             $data['data']['href'] = $refer;
 
 
             $this->setSession('_TOKEN', Helpers::makeToken($data['data']['uid']));
             $this->setSession('_TOKEN', Helpers::makeToken($data['data']['uid']));
-            
         } while (false);
         } while (false);
 
 
         $this->echoJson($data);
         $this->echoJson($data);

@@ -45,7 +45,7 @@ routes.logout.type = "rewrite"
 routes.logout.match = "/passport/signout/index"
 routes.logout.match = "/passport/signout/index"
 routes.logout.route.module = Passport
 routes.logout.route.module = Passport
 routes.logout.route.controller = Login
 routes.logout.route.controller = Login
-routes.logout.route.action = out
+routes.logout.route.action = Out
 
 
 ; 找回密码(手机号)
 ; 找回密码(手机号)
 routes.phoneback.type = "rewrite"
 routes.phoneback.type = "rewrite"