Authored by hf

reset compile php file

@@ -20,7 +20,7 @@ class KidsController extends AbstractAction @@ -20,7 +20,7 @@ class KidsController extends AbstractAction
20 // 设置网站标题 20 // 设置网站标题
21 $this->setTitle('潮童首页'); 21 $this->setTitle('潮童首页');
22 // 显示侧边栏 22 // 显示侧边栏
23 - $this->setNavSide(); 23 + $this->setNavSide('kids');
24 // 显示底部TAB 24 // 显示底部TAB
25 $this->setNavFooterTab(); 25 $this->setNavFooterTab();
26 26
@@ -20,7 +20,7 @@ class LifestyleController extends AbstractAction @@ -20,7 +20,7 @@ class LifestyleController extends AbstractAction
20 // 设置网站标题 20 // 设置网站标题
21 $this->setTitle('创意生活首页'); 21 $this->setTitle('创意生活首页');
22 // 显示侧边栏 22 // 显示侧边栏
23 - $this->setNavSide(); 23 + $this->setNavSide('lifestyle');
24 // 显示底部TAB 24 // 显示底部TAB
25 $this->setNavFooterTab(); 25 $this->setNavFooterTab();
26 26
@@ -52,6 +52,17 @@ class ClassModel @@ -52,6 +52,17 @@ class ClassModel
52 $item = array(); 52 $item = array();
53 $item['name'] = $val['category_name']; 53 $item['name'] = $val['category_name'];
54 $item['id'] = $val['relation_parameter']['sort']; 54 $item['id'] = $val['relation_parameter']['sort'];
  55 +
  56 + // 首先添加一级分类
  57 + $item['sub'][] = array(
  58 + 'name' => '全部'.$item['name'],
  59 + 'id' => $item['id'],
  60 + 'url' => Helpers::url('/', array(
  61 + 'sort' => $item['id'],
  62 + 'sort_name' => $item['name'], 'list'))
  63 + );
  64 +
  65 + $subitem = array();
55 foreach ($val['sub'] as $value) { 66 foreach ($val['sub'] as $value) {
56 $subitem = array(); 67 $subitem = array();
57 $subitem['name'] = $value['category_name']; 68 $subitem['name'] = $value['category_name'];
@@ -77,6 +77,16 @@ class SideModel @@ -77,6 +77,16 @@ class SideModel
77 */ 77 */
78 private static function genLeftNavGuang($guangChoosed = 'all') 78 private static function genLeftNavGuang($guangChoosed = 'all')
79 { 79 {
  80 + // 判断逛的背景色
  81 + $color = false;
  82 + if($guangChoosed === 'girls') {
  83 + $color = '#FF88AE';
  84 + } else if($guangChoosed === 'kids') {
  85 + $color = '#7ad9f9';
  86 + } else if($guangChoosed === 'lifestyle') {
  87 + $color = '#4f4138';
  88 + }
  89 +
80 return array( 90 return array(
81 'textCn' => '逛', 91 'textCn' => '逛',
82 'textEn' => 'TRENDFINDER', 92 'textEn' => 'TRENDFINDER',
@@ -88,7 +98,7 @@ class SideModel @@ -88,7 +98,7 @@ class SideModel
88 'textEn' => 'TrendFinder', 98 'textEn' => 'TrendFinder',
89 'back' => true, 99 'back' => true,
90 'isSelect' => false, 100 'isSelect' => false,
91 - 'bgColor' => ($guangChoosed === 'girls') ? '#FF88AE' : false, 101 + 'bgColor' => $color,
92 ), 102 ),
93 1 => array( 103 1 => array(
94 'textCn' => '查看全部', 104 'textCn' => '查看全部',
@@ -209,7 +209,7 @@ class BackController extends AbstractAction @@ -209,7 +209,7 @@ class BackController extends AbstractAction
209 'phoneNum' => $phoneNum 209 'phoneNum' => $phoneNum
210 ); 210 );
211 211
212 - $this->_view->assign('title', 'YOHO!有货'); 212 + $this->setTitle('找回密码-通过手机号');
213 $this->_view->display('mobile-code', $data); 213 $this->_view->display('mobile-code', $data);
214 } 214 }
215 215
@@ -247,6 +247,11 @@ class BackController extends AbstractAction @@ -247,6 +247,11 @@ class BackController extends AbstractAction
247 // 邮箱验证码 247 // 邮箱验证码
248 $code = $this->get('code', ''); 248 $code = $this->get('code', '');
249 249
  250 + // 判断是否允许访问, 不允许则跳转到错误页面
  251 + if ((!$token || !Helpers::verifyMobile($phoneNum)) && !$code) {
  252 + $this->error();
  253 + }
  254 +
250 $data = array( 255 $data = array(
251 'backUrl' => '/signin.html', 256 'backUrl' => '/signin.html',
252 'headerText' => '找回密码', 257 'headerText' => '找回密码',
@@ -258,7 +263,7 @@ class BackController extends AbstractAction @@ -258,7 +263,7 @@ class BackController extends AbstractAction
258 'code' => $code 263 'code' => $code
259 ); 264 );
260 265
261 - $this->_view->assign('title', 'YOHO!有货'); 266 + $this->setTitle('找回密码-输入新密码');
262 $this->_view->display('new-password', $data); 267 $this->_view->display('new-password', $data);
263 } 268 }
264 269
@@ -250,6 +250,11 @@ class RegController extends AbstractAction @@ -250,6 +250,11 @@ class RegController extends AbstractAction
250 break; 250 break;
251 } 251 }
252 252
  253 + /* 判断密码是否符合规则 */
  254 + if (!Helpers::verifyPassword($password)) {
  255 + break;
  256 + }
  257 +
253 /* 验证注册的标识码是否有效 */ 258 /* 验证注册的标识码是否有效 */
254 $data = RegData::regMobile($area, $mobile, $password); 259 $data = RegData::regMobile($area, $mobile, $password);
255 if (!isset($data['code'])) { 260 if (!isset($data['code'])) {