合并分支 '1iuzhen' 到 'master'

选择宝宝年龄段逻辑调整



查看合并请求 !199

@@ -116,7 +116,7 @@ class LoginController extends HomeBaseController
      */
      */
     public function chooseAge() {
     public function chooseAge() {
         if (cmf_is_user_login()) {
         if (cmf_is_user_login()) {
-            if(!session('baby_age')) {
+//            if(!session('baby_age')) {
             $baby_model = new BabyModel();
             $baby_model = new BabyModel();
             $where = [
             $where = [
                 'delete_time' => 0
                 'delete_time' => 0
@@ -132,9 +132,9 @@ class LoginController extends HomeBaseController
             }
             }
             $this->assign('babyList',json_encode($list));
             $this->assign('babyList',json_encode($list));
             return $this->fetch(':choose');
             return $this->fetch(':choose');
-            } else {
-                return redirect($this->request->root() . '/');
-            }
+//            } else {
+//                return redirect($this->request->root() . '/');
+//            }
         } else {
         } else {
             return redirect($this->request->root() . '/');
             return redirect($this->request->root() . '/');
         }
         }