Merge branch 'master' of http://119.23.72.7/shiyu/icsales

Application/Common/Conf/config.php

@@ -8,7 +8,8 @@ return array(
         'www'   =>  'Index',
         'www'   =>  'Index',
         'home'  =>  'Home',
         'home'  =>  'Home',
         'search'=>  'Search',
         'search'=>  'Search',
-        'item'  =>  'Item'
+        'item'  =>  'Item',
+        'passport' => 'Passport'
     ),
     ),
 
 
     'API_TOKEN' => 'zbPx8gDXDfIh3ZoJcO4EH', // api接口token 
     'API_TOKEN' => 'zbPx8gDXDfIh3ZoJcO4EH', // api接口token 

Application/Common/Controller/BaseController.class.php

@@ -13,9 +13,17 @@ class BaseController extends Controller
         foreach ($datas as $k => $v) {
         foreach ($datas as $k => $v) {
             $this->assign($k, $v['data']);
             $this->assign($k, $v['data']);
         }
         }
+
+        $getInfo = I();
+        $this->assign('get_url_info',$getInfo);
 	}
 	}
 
 
-	/**
+	public function __call($method, $args)
+    {
+        $this->redirect('/login');
+}
+
+    /**
      * 通过bcat_id获取CMS分类数据 --- 图片、文字等
      * 通过bcat_id获取CMS分类数据 --- 图片、文字等
      * @param  [type] $tags  [标签]
      * @param  [type] $tags  [标签]
      * @param  [type] $where [搜索条件，用&连接，如：a=1&b=2]
      * @param  [type] $where [搜索条件，用&连接，如：a=1&b=2]

Application/Common/View/public/indexheader.html

+<foreach name="get_utl_info" item="v" >
+    <input type="hidden" id="{$key}" value="{$v}">
+</foreach>
 <div class="index_header">
 <div class="index_header">
     <div class="header_content boxsiz public_content width_1190">
     <div class="header_content boxsiz public_content width_1190">
         <div class="fl">
         <div class="fl">

Application/Home/Controller/IndexController.class.php

@@ -11,7 +11,7 @@ class IndexController extends BaseController
     {
     {
         parent::_initialize();
         parent::_initialize();
         if (!cookie('token')) {
         if (!cookie('token')) {
-            $this->redirect('/login');
+            redirect(C('TMPL_PARSE_STRING.passporticsales'));
         }
         }
     }
     }
 
 

Application/Passport/Conf/config_url.php

 <?php
 <?php
 return array(
 return array(
     'URL_MAP_RULES' => array(//静态路由
     'URL_MAP_RULES' => array(//静态路由
-        'login' => 'Home/Index/login',
-        'register' => 'Home/Index/register',
-        'forget' => 'Home/Index/forget',
+        'index' => 'Index/index',
+        'login' => 'Index/login',
+        'register' => 'Index/register',
+        'forget' => 'Index/forget',
     )
     )
 );
 );

Application/Passport/Controller/IndexController.class.php

@@ -9,6 +9,14 @@ class IndexController extends BaseController
     /**
     /**
      * 登录页面
      * 登录页面
      */
      */
+    public function index()
+    {
+        $this->display('Login/index');
+    }
+
+    /**
+     * 登录页面
+     */
     public function login()
     public function login()
     {
     {
         $this->display('Login/index');
         $this->display('Login/index');

Application/Search/Conf/config_url.php

 <?php
 <?php
 return array(
 return array(
     'URL_ROUTE_RULES'        => array(//动态路由
     'URL_ROUTE_RULES'        => array(//动态路由
-        '/^(\w+)_(\d+)_(\d+)$/'   => 'Index/indexsearch?key=:1&type=:2&time=:3',
+        '/^(\w+)_(\d+)_(\d+)$/'   => 'Index/index?key=:1&type=:2&time=:3',
     )
     )
 );
 );

Application/Search/Controller/IndexController.class.php

@@ -9,7 +9,7 @@ class IndexController extends BaseController
     /**
     /**
      * 首页搜索结果
      * 首页搜索结果
      */
      */
-    public function indexsearch()
+    public function index()
     {
     {
         $this->display('Index/search');
         $this->display('Index/search');
     }
     }