modify to gulp ge css js

@@ -20,7 +20,7 @@ class KidsController extends AbstractAction
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('潮童首页');
         $this->setTitle('潮童首页');
         // 显示侧边栏
         // 显示侧边栏
-        $this->setNavSide();
+        $this->setNavSide('kids');
         // 显示底部TAB
         // 显示底部TAB
         $this->setNavFooterTab();
         $this->setNavFooterTab();
 
 

@@ -20,7 +20,7 @@ class LifestyleController extends AbstractAction
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('创意生活首页');
         $this->setTitle('创意生活首页');
         // 显示侧边栏
         // 显示侧边栏
-        $this->setNavSide();
+        $this->setNavSide('lifestyle');
         // 显示底部TAB
         // 显示底部TAB
         $this->setNavFooterTab();
         $this->setNavFooterTab();
 
 

@@ -52,6 +52,17 @@ class ClassModel
                     $item = array();
                     $item = array();
                     $item['name'] = $val['category_name'];
                     $item['name'] = $val['category_name'];
                     $item['id'] = $val['relation_parameter']['sort'];
                     $item['id'] = $val['relation_parameter']['sort'];
+
+                    // 首先添加一级分类
+                    $item['sub'][] = array(
+                        'name' => '全部'.$item['name'],
+                        'id' => $item['id'],
+                        'url' => Helpers::url('/', array(
+                                    'sort' => $item['id'],
+                                    'sort_name' => $item['name'], 'list'))
+                    );
+
+                    $subitem = array();
                     foreach ($val['sub'] as $value) {
                     foreach ($val['sub'] as $value) {
                         $subitem = array();
                         $subitem = array();
                         $subitem['name'] = $value['category_name'];
                         $subitem['name'] = $value['category_name'];

@@ -77,6 +77,16 @@ class SideModel
      */
      */
     private static function genLeftNavGuang($guangChoosed = 'all')
     private static function genLeftNavGuang($guangChoosed = 'all')
     {
     {
+        // 判断逛的背景色
+        $color = false;
+        if($guangChoosed === 'girls') {
+            $color = '#FF88AE';
+        } else if($guangChoosed === 'kids') {
+            $color = '#7ad9f9';
+        } else if($guangChoosed === 'lifestyle') {
+            $color = '#4f4138';
+        }
+
         return array(
         return array(
             'textCn' => '逛',
             'textCn' => '逛',
             'textEn' => 'TRENDFINDER',
             'textEn' => 'TRENDFINDER',
@@ -88,7 +98,7 @@ class SideModel
                         'textEn' => 'TrendFinder',
                         'textEn' => 'TrendFinder',
                         'back' => true,
                         'back' => true,
                         'isSelect' => false,
                         'isSelect' => false,
-                        'bgColor' => ($guangChoosed === 'girls') ? '#FF88AE' : false,
+                        'bgColor' => $color,
                     ),
                     ),
                     1 => array(
                     1 => array(
                         'textCn' => '查看全部',
                         'textCn' => '查看全部',

@@ -209,7 +209,7 @@ class BackController extends AbstractAction
             'phoneNum' => $phoneNum
             'phoneNum' => $phoneNum
         );
         );
 
 
-        $this->_view->assign('title', 'YOHO!有货');
+        $this->setTitle('找回密码-通过手机号');
         $this->_view->display('mobile-code', $data);
         $this->_view->display('mobile-code', $data);
     }
     }
 
 
@@ -246,6 +246,11 @@ class BackController extends AbstractAction
 
 
         // 邮箱验证码
         // 邮箱验证码
         $code = $this->get('code', '');
         $code = $this->get('code', '');
+
+        // 判断是否允许访问, 不允许则跳转到错误页面
+        if ((!$token || !Helpers::verifyMobile($phoneNum)) && !$code) {
+            $this->error();
+        }
         
         
         $data = array(
         $data = array(
             'backUrl' => '/signin.html',
             'backUrl' => '/signin.html',
@@ -258,7 +263,7 @@ class BackController extends AbstractAction
             'code' => $code
             'code' => $code
         );
         );
 
 
-        $this->_view->assign('title', 'YOHO!有货');
+        $this->setTitle('找回密码-输入新密码');
         $this->_view->display('new-password', $data);
         $this->_view->display('new-password', $data);
     }
     }
 
 

@@ -249,6 +249,11 @@ class RegController extends AbstractAction
             if (!Helpers::verifyToken($mobile, $token)) {
             if (!Helpers::verifyToken($mobile, $token)) {
                 break;
                 break;
             }
             }
+
+            /* 判断密码是否符合规则 */
+            if (!Helpers::verifyPassword($password)) {
+                break;
+            }
             
             
             /* 验证注册的标识码是否有效 */
             /* 验证注册的标识码是否有效 */
             $data = RegData::regMobile($area, $mobile, $password);
             $data = RegData::regMobile($area, $mobile, $password);