merge test js css

@@ -355,25 +355,15 @@ class AbstractAction extends Controller_Abstract
      * 
      * 
      * @return void
      * @return void
      */
      */
-    protected function setNavFooter()
+    protected function setNavFooterTab()
     {
     {
-        $footer = array();
-
-        // 已登录 @todo
-        $name = $this->getUname();
-        if (!empty($name)) {
-            $footer['user'] = array();
-            $footer['user']['name'] = $name; // 昵称
-            $footer['user']['url'] = ''; // 个人中心链接
-            $footer['user']['signoutUrl'] = '/passport/login/out'; // 登出链接
-        }
-        // 未登录
-        else {
-            $footer['loginUrl'] = '/signin.html'; // 登录链接
-            $footer['signupUrl'] = '/reg.html'; // 注册链接
-        }
-
-        $this->_view->assign('pageFooter', $footer);
+        $this->_view->assign('showFooterTab', array(
+            'indexUrl' => Helpers::url('/?go=1'), //首页
+            'categoryUrl' => Helpers::url('/cate'), // 分类
+            'guangUrl' => Helpers::url('', null, 'guang'), // 逛首页
+            'shoppingCartUrl' => Helpers::url('/cart/index/index'), // 购物车
+            'mineUrl' => Helpers::url('/home'), // 个人中心
+        ));
     }
     }
 
 
     /**
     /**

@@ -17,16 +17,16 @@ use Plugin\Cache;
 class Yohobuy
 class Yohobuy
 {
 {
 
 
-   // /* 正式环境 */
-   // const API_URL = 'http://api2.open.yohobuy.com/';
-   // const SERVICE_URL = 'http://service.api.yohobuy.com/';
-   // const YOHOBUY_URL = 'http://www.yohobuy.com/';
-
-    /* 测试环境 */
-    const API_URL = 'http://test2.open.yohobuy.com/';
-    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+    /* 正式环境 */
+    const API_URL = 'http://api2.open.yohobuy.com/';
+    const SERVICE_URL = 'http://service.api.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
 
+//    /* 测试环境 */
+//    const API_URL = 'http://test2.open.yohobuy.com/';
+//    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
+//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
+
     /**
     /**
      * 私钥列表
      * 私钥列表
      * 
      *