三观

app/love/controller/AdminActiveController.php

@@ -254,9 +254,9 @@ class AdminActiveController extends AdminBaseController
             foreach ($outlook_woman as $woman) {
                 $item                   = [];
                 $item['man_nickname']   = $man['user_nickname'];
-                $item['man_no']         = empty($active[$man['user_id']]) ? '未签到' : $active[$man['user_id']];
+                $item['man_no']         = isset($active[$man['user_id']]) ? $active[$man['user_id']] : '未报名';
                 $item['woman_nickname'] = $woman['user_nickname'];
-                $item['woman_no']       = empty($active[$woman['user_id']]) ? '未签到' : $active[$woman['user_id']];;
+                $item['woman_no']       = isset($active[$woman['user_id']]) ? $active[$woman['user_id']] : '未报名';
                 $item['match_num'] = $this->_matchOption($man, $woman);
                 $item['match']     = $item['match_num'] . '0%';
                 $item['title1']    = "男：" . $options[$man['question1']] . "，女：" . $options[$woman['question1']] . "。";

app/portal/controller/IndexController.php

@@ -29,13 +29,17 @@ class IndexController extends LoveBaseController
         $user_id = cmf_get_current_user_id();
 
         //判断三观
-        $active = ActiveApplyModel::where('user_id',$user_id)->where('active_id',2)->find();
-        if ($active) {
-            $outlook = UserOutlookModel::where('user_id',$user_id)->find();
-            if (empty($outlook)) {
-                return redirect('/love/my/outlook');
-            }
+        $outlook = UserOutlookModel::where('user_id',$user_id)->find();
+        if (empty($outlook)) {
+            return redirect('/love/my/outlook');
         }
+//        $active = ActiveApplyModel::where('user_id',$user_id)->where('active_id',2)->find();
+//        if ($active) {
+//            $outlook = UserOutlookModel::where('user_id',$user_id)->find();
+//            if (empty($outlook)) {
+//                return redirect('/love/my/outlook');
+//            }
+//        }
 
         $user    = UserModel::get($user_id);
         $matting = UserMatingModel::where('user_id', $user_id)->find();