Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Home-Data

application/admin/controller/Certification.php

@@ -37,6 +37,9 @@ class Certification extends AdminControl
             if($user_list[$i]['user_status'] == 1){
                 $user_list[$i]['user_status'] = '已实名认证';
             }
+            if($user_list[$i]['user_status'] == 3){
+                $user_list[$i]['user_status'] = '实名认证失败';
+            }
 
             if($user_list[$i]['user_type'] == 1){
                 $user_list[$i]['user_type'] = '个人用户';
@@ -77,6 +80,9 @@ class Certification extends AdminControl
             if($user_list[$i]['user_status'] == 1){
                 $user_list[$i]['user_status'] = '已实名认证';
             }
+            if($user_list[$i]['user_status'] == 3){
+                $user_list[$i]['user_status'] = '实名认证失败';
+            }
 
             if($user_list[$i]['user_type'] == 1){
                 $user_list[$i]['user_type'] = '个人用户';
@@ -102,11 +108,20 @@ class Certification extends AdminControl
 //        print_r($user_id);
         if (request()->isPost()){
             $user_id = input('post.user_id');
-            $update_info = array(
-                'user_status' => 1
-            );
-            db('user')->where('user_id', $user_id)->update($update_info);
-            return $this->redirect('Admin/Certification/personal');
+            if(input('post.pass') == '通过审核'){
+                $update_info = array(
+                    'user_status' => 1
+                );
+                db('user')->where('user_id', $user_id)->update($update_info);
+                return $this->redirect('Admin/Certification/personal');
+            }
+            if(input('post.nopass') == '未通过审核'){
+                $update_info = array(
+                    'user_status' => 3
+                );
+                db('user')->where('user_id', $user_id)->update($update_info);
+                return $this->redirect('Admin/Certification/personal');
+            }
 
         }else{
             $user = Model('User');
@@ -148,11 +163,21 @@ class Certification extends AdminControl
 //        print_r($user_id);
         if (request()->isPost()){
             $user_id = input('post.user_id');
-            $update_info = array(
-                'user_status' => 1
-            );
-            db('user')->where('user_id', $user_id)->update($update_info);
-            return $this->redirect('Admin/Certification/enterprise');
+            //$inputval = input('post.pass');
+            if(input('post.pass') == '通过审核'){
+                $update_info = array(
+                    'user_status' => 1
+                );
+                db('user')->where('user_id', $user_id)->update($update_info);
+                return $this->redirect('Admin/Certification/enterprise');
+            }
+            if(input('post.nopass') == '未通过审核'){
+                $update_info = array(
+                    'user_status' => 3
+                );
+                db('user')->where('user_id', $user_id)->update($update_info);
+                return $this->redirect('Admin/Certification/enterprise');
+            }
         }else{
             $user = Model('User');
 

application/admin/controller/User.php

@@ -51,6 +51,9 @@ class User extends AdminControl
             if ($user_list[$i]['user_status'] == 1) {
                 $user_list[$i]['user_status'] = '已实名认证';
             }
+            if ($user_list[$i]['user_status'] == 3){
+                $user_list[$i]['user_status'] = '实名认证失败';
+            }
 
             if ($user_list[$i]['user_type'] == 1) {
                 $user_list[$i]['user_type'] = '个人用户';

application/admin/model/User.php

@@ -8,6 +8,8 @@ class User extends Model
 {
     protected $pk = 'user_id';
 
+    public $page_info;
+
     public function uorder()
     {
         return $this->hasMany('Order', 'user_id', 'user_id');
@@ -26,4 +28,43 @@ class User extends Model
         return $return ;
     }
 
+    /**
+     * 用户列表
+     * @access public
+     * @author csdeshang
+     * @param array $condition 条件
+     * @param string $field 字段
+     * @param number $page 分页
+     * @param string $order 排序
+     * @return array
+     */
+    public function getUserList($condition = array(), $field = '*', $page = 0, $order = 'user_addTime desc')
+    {
+        if ($page) {
+            $user_list = db('user')
+                ->alias('a')
+                ->join('userinfo b','b.user_id = a.user_id')
+                ->where($condition)
+                ->order($order)
+                ->paginate($page, false, ['query' => request()->param()]);
+            $this->page_info = $user_list;
+            return $user_list->items();
+        } else {
+            return db('user')->where($condition)->order($order)->select();
+        }
+    }
+
+    /**
+     * 取单个用户
+     */
+    public function getUserInfo($user_id)
+    {
+        $userinfo = db('user')
+            ->alias('a')
+            ->join('userinfo b','b.user_id = a.user_id')
+            ->where('b.user_id',$user_id)
+            ->find();
+        return $userinfo;
+    }
+
 }

application/admin/view/certification/enterprise.html

@@ -75,7 +75,7 @@
                         <td class="align-center">
                             <div style="text-align: center;">
                                 <a href="/Admin/Certification/enterprise_detail.html?{$user.user_id}" class="layui-btn layui-btn-xs">详情</a>
-                                <a href="" class="layui-btn layui-btn-xs layui-btn-danger">审核</a>
+                                <!--<a href="" class="layui-btn layui-btn-xs layui-btn-danger">审核</a>-->
                             </div>
                         </td>
                     </tr>

application/admin/view/certification/enterprise_detail.html

@@ -82,7 +82,8 @@
 
                 <div class="layui-form-item">
                     <div class="layui-input-block">
-                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit value="通过审核"/>
+                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit name="pass" value="通过审核"/>
+                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit name="nopass" value="未通过审核" style="background-color: red;"/>
                         <input type="button" class="layui-btn layui-btn-normal" id="canael" lay-submit value="取消" style="background-color: grey;"/>
                     </div>
                 </div>

application/admin/view/certification/personal.html

@@ -60,7 +60,7 @@
                         <td class="align-center">
                             <div style="text-align: center;">
                                 <a href="/Admin/Certification/personal_detail.html?{$user.user_id}" class="layui-btn layui-btn-xs">详情</a>
-                                <a href="" class="layui-btn layui-btn-xs layui-btn-danger">审核</a>
+                                <!--<a href="" class="layui-btn layui-btn-xs layui-btn-danger">审核</a>-->
                             </div>
                         </td>
                     </tr>

application/admin/view/certification/personal_detail.html

@@ -58,7 +58,8 @@
 
                 <div class="layui-form-item">
                     <div class="layui-input-block">
-                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit value="通过审核"/>
+                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit name="pass" value="通过审核"/>
+                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit name="nopass" value="未通过审核" style="background-color: red;"/>
                         <input type="button" class="layui-btn layui-btn-normal" id="canael" lay-submit value="取消" style="background-color: grey;"/>
                     </div>
                 </div>

application/user/controller/Certification.php

@@ -22,15 +22,18 @@ class Certification extends UserControl
     {
         $user_info = $this->getAdminInfo();
         $user = db('user')->where('user_email',$user_info['user_email'])->find();
-        if($user['user_status'] ==1){
+        if($user['user_status'] == 1){
             $user['user_status'] = '已实名认证';
         }
-        if($user['user_status'] ==-1){
+        if($user['user_status'] == -1){
             $user['user_status'] = '未实名认证';
         }
-        if($user['user_status'] ==2){
+        if($user['user_status'] == 2){
             $user['user_status'] = '实名认证中';
         }
+        if($user['user_status'] == 3){
+            $user['user_status'] = '实名认证失败';
+        }
 
         $this->assign('user', $user);
         return $this->fetch();
@@ -96,15 +99,18 @@ class Certification extends UserControl
         }else{
             $user = db('user')->where('user_email',$user_info['user_email'])->find();
             $userinfo = db('userinfo')->where('user_id',$user_info['user_id'])->find();
-            if($user['user_status'] ==1){
+            if($user['user_status'] == 1){
                 $user['user_status_cn'] = '已实名认证';
             }
-            if($user['user_status'] ==-1){
+            if($user['user_status'] == -1){
                 $user['user_status_cn'] = '未实名认证';
             }
-            if($user['user_status'] ==0){
+            if($user['user_status'] == 2){
                 $user['user_status_cn'] = '实名认证中';
             }
+            if($user['user_status'] == 3){
+                $user['user_status_cn'] = '实名认证失败';
+            }
 
             if($user['user_type'] ==1){
                 $user['user_type_cn'] = '个人用户';
@@ -185,15 +191,18 @@ class Certification extends UserControl
         }else{
             $user = db('user')->where('user_email',$user_info['user_email'])->find();
             $userinfo = db('userinfo')->where('user_id',$user_info['user_id'])->find();
-            if($user['user_status'] ==1){
+            if($user['user_status'] == 1){
                 $user['user_status_cn'] = '已实名认证';
             }
-            if($user['user_status'] ==-1){
+            if($user['user_status'] == -1){
                 $user['user_status_cn'] = '未实名认证';
             }
-            if($user['user_status'] ==0){
+            if($user['user_status'] == 2){
                 $user['user_status_cn'] = '实名认证中';
             }
+            if($user['user_status'] == 3){
+                $user['user_status_cn'] = '实名认证失败';
+            }
 
             if($user['user_type'] ==1){
                 $user['user_type_cn'] = '个人用户';

application/user/controller/Member.php

@@ -48,6 +48,9 @@ class Member extends UserControl
             if($user['user_status'] ==2){
                 $user['user_status'] = '实名认证中';
             }
+            if($user['user_status'] ==3){
+                $user['user_status'] = '实名认证失败';
+            }
 
             if($user['user_type'] ==1){
                 $user['user_type'] = '个人用户';