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

application/admin/controller/AdminControl.php

@@ -166,10 +166,6 @@ class AdminControl extends Controller
                 'name' => 'personnel_manage',
                 'text' => '管理员管理',
                 'children' => array(
-                    'member' => array(
-                        'text' => lang('ds_member'),
-                        'url' => url('User/index'),
-                    ),
                     'admin' => array(
                         'text' => lang('ds_admin'),
                         'url' => url('Recharge/index'),
@@ -216,10 +212,6 @@ class AdminControl extends Controller
                         'text' => lang('ds_order_list'),
                         'url' => url('Order/index'),
                     ),
-                    'examine' => array(
-                        'text' => '充值审核',
-                        'url' => url('Recharge/examine'),
-                    ),
                 ),
             ),
             'detail' => array(

application/admin/controller/Certification.php

@@ -23,6 +23,7 @@ class Certification extends AdminControl
 
         $condition = array();
         $condition['user_type'] = '1';
+        $condition['user_status'] = '2';
         $user_list = $userinfo->getUserList($condition, '*', 10);
         for($i=0;$i<count($user_list);$i++){
             $user_list[$i]['user_addTime'] = date("Y-m-d H:i:s",$user_list[$i]['user_addTime']);
@@ -36,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'] = '个人用户';
@@ -62,6 +66,7 @@ class Certification extends AdminControl
 
         $condition = array();
         $condition['user_type'] = '2';
+        $condition['user_status'] = '2';
         $user_list = $userinfo->getUserList($condition, '*', 10);
         for($i=0;$i<count($user_list);$i++){
             $user_list[$i]['user_addTime'] = date("Y-m-d H:i:s",$user_list[$i]['user_addTime']);
@@ -75,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'] = '个人用户';
@@ -98,33 +106,52 @@ class Certification extends AdminControl
     public function personal_detail() {
         $user_id = $_SERVER['QUERY_STRING'];
 //        print_r($user_id);
-        $user = Model('User');
+        if (request()->isPost()){
+            $user_id = input('post.user_id');
+            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');
+            }
 
-        $userinfo = $user->getUserInfo($user_id);
+        }else{
+            $user = Model('User');
 
-        $userinfo['user_addTime'] = date("Y-m-d H:i:s",$userinfo['user_addTime']);
+            $userinfo = $user->getUserInfo($user_id);
 
-        if($userinfo['user_status'] == -1){
-            $userinfo['user_status'] = '未实名认证';
-        }
-        if($userinfo['user_status'] == 2){
-            $userinfo['user_status'] = '实名认证中';
-        }
-        if($userinfo['user_status'] == 1){
-            $userinfo['user_status'] = '已实名认证';
-        }
+            $userinfo['user_addTime'] = date("Y-m-d H:i:s",$userinfo['user_addTime']);
 
-        if($userinfo['user_type'] == 1){
-            $userinfo['user_type'] = '个人用户';
-        }
-        if($userinfo['user_type'] == 2){
-            $userinfo['user_type'] = '企业用户';
-        }
+            if($userinfo['user_status'] == -1){
+                $userinfo['user_status'] = '未实名认证';
+            }
+            if($userinfo['user_status'] == 2){
+                $userinfo['user_status'] = '实名认证中';
+            }
+            if($userinfo['user_status'] == 1){
+                $userinfo['user_status'] = '已实名认证';
+            }
 
-        $allpower = $this->qxhans();
-        $this->assign('allpower',$allpower);
-        $this->assign('userinfo',$userinfo);
-        return $this->fetch('personal_detail');
+            if($userinfo['user_type'] == 1){
+                $userinfo['user_type'] = '个人用户';
+            }
+            if($userinfo['user_type'] == 2){
+                $userinfo['user_type'] = '企业用户';
+            }
+
+            $allpower = $this->qxhans();
+            $this->assign('allpower',$allpower);
+            $this->assign('userinfo',$userinfo);
+            return $this->fetch('personal_detail');
+        }
     }
 
     /**
@@ -134,33 +161,52 @@ class Certification extends AdminControl
     public function enterprise_detail() {
         $user_id = $_SERVER['QUERY_STRING'];
 //        print_r($user_id);
-        $user = Model('User');
+        if (request()->isPost()){
+            $user_id = input('post.user_id');
+            //$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');
 
-        $userinfo = $user->getUserInfo($user_id);
+            $userinfo = $user->getUserInfo($user_id);
 
-        $userinfo['user_addTime'] = date("Y-m-d H:i:s",$userinfo['user_addTime']);
+            $userinfo['user_addTime'] = date("Y-m-d H:i:s",$userinfo['user_addTime']);
 
-        if($userinfo['user_status'] == -1){
-            $userinfo['user_status'] = '未实名认证';
-        }
-        if($userinfo['user_status'] == 2){
-            $userinfo['user_status'] = '实名认证中';
-        }
-        if($userinfo['user_status'] == 1){
-            $userinfo['user_status'] = '已实名认证';
-        }
+            if($userinfo['user_status'] == -1){
+                $userinfo['user_status'] = '未实名认证';
+            }
+            if($userinfo['user_status'] == 2){
+                $userinfo['user_status'] = '实名认证中';
+            }
+            if($userinfo['user_status'] == 1){
+                $userinfo['user_status'] = '已实名认证';
+            }
 
-        if($userinfo['user_type'] == 1){
-            $userinfo['user_type'] = '个人用户';
-        }
-        if($userinfo['user_type'] == 2){
-            $userinfo['user_type'] = '企业用户';
-        }
+            if($userinfo['user_type'] == 1){
+                $userinfo['user_type'] = '个人用户';
+            }
+            if($userinfo['user_type'] == 2){
+                $userinfo['user_type'] = '企业用户';
+            }
 
-        $allpower = $this->qxhans();
-        $this->assign('allpower',$allpower);
-        $this->assign('userinfo',$userinfo);
-        return $this->fetch('enterprise_detail');
+            $allpower = $this->qxhans();
+            $this->assign('allpower',$allpower);
+            $this->assign('userinfo',$userinfo);
+            return $this->fetch('enterprise_detail');
+        }
     }
 
 

application/admin/controller/Order.php

@@ -4,6 +4,10 @@ namespace app\admin\controller;
 
 use think\Validate;
 use think\Lang;
+use app\admin\model\User;
+use app\admin\model\Product;
+
+use think\Db;
 
 class Order extends AdminControl
 {
@@ -22,34 +26,38 @@ class Order extends AdminControl
     {
         $model_order = Model('Order');
         $order_identity = input('order_identity', '');
-        $user_id = intval(input('user_id', 0));
-        $product_id = intval(input('product_id', 0));
+        $user_id = trim(input('user_id', ''));
+        $product_id = trim(input('product_id', ''));
         $timeRang = trim(input('timeRang', ''));
 
-         $where = [];
+        $where = [];
         if ($order_identity != '') {
             $where['order_identity'] = $order_identity;
         }
 
         if ($user_id) {
-            $where['user_id'] = $user_id;
+            $umodel = (new User())->getIdsByEmailLike($user_id);
+            $uids = array_merge([0], $umodel);
+            $where['user_id'] = ['IN', $uids];
         }
 
         if ($product_id) {
-            $where['product_id'] = $product_id;
+            $pmodel = (new Product())->getIdsByNameLike($product_id);
+            $pids = array_merge([0], $pmodel);
+            $where['product_id'] = ['IN', $pids];
         }
 
-        if ($timeRang){
-            $t1 = substr($timeRang,0,10);
-            $t2 = substr($timeRang,-10,10);
-            $where['order_buyTime']=[[">=",$t1],['<=',$t2]];
+        if ($timeRang) {
+            $t1 = substr($timeRang, 0, 10);
+            $t2 = substr($timeRang, -10, 10);
+            $where['order_buyTime'] = [[">=", $t1], ['<=', $t2]];
         }
 
         $order_list = $model_order->getOrdList($where, '*', 10);
         $this->assign('order_list', $order_list);
         $this->assign('show_page', $order_list->render());
         $this->setAdminCurItem('index');
-        $this->assign('oinput', ['order_identity' => input("order_identity",''), 'user_id' => input("user_id",''), 'product_id' => input("product_id",""),'timeRang'=>$timeRang]);
+        $this->assign('oinput', ['order_identity' => input("order_identity", ''), 'user_id' => input("user_id", ''), 'product_id' => input("product_id", ""), 'timeRang' => $timeRang]);
         return $this->fetch();
     }
 

application/admin/controller/Server.php

@@ -290,9 +290,9 @@ class Server extends AdminControl
     public function userServer()
     {
         $UserProductModel = Model('Userproduct');
-        $userName = input('get.user_name');
-        $productName = input('get.product_name');
-        $userProductIdentity = input('get.userProduct_identity');
+        $userName = input('post.user_name');
+        $productName = input('post.product_name');
+        $userProductIdentity = input('post.userProduct_identity');
         $userProductWhere = [];
         if ($userName) {
             $userProductWhere['user_email'] = $userName;

application/admin/controller/User.php

@@ -5,6 +5,8 @@ namespace app\admin\controller;
 use think\Validate;
 use think\Lang;
 use app\admin\model\Userinfo;
+use app\common\model\User as UserModel;
+use  app\admin\model\CapitalMovements;
 
 class User extends AdminControl
 {
@@ -21,7 +23,7 @@ class User extends AdminControl
      */
     public function index()
     {
-        $model_user = Model('User');
+        $model_user = new UserModel();
         $title = input('post.title');
         $time = input('post.timeRang');
         if (!empty($time)) {
@@ -49,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'] = '个人用户';
@@ -65,15 +70,23 @@ class User extends AdminControl
         return $this->fetch();
     }
 
-    public function userInfo()
+    public function userinfo()
     {
         $uid = intval(input("uid", 0));
-        $model = new Userinfo();
-        $model = $model->findOne($uid, 1);
-        if (empty($model)) {
-            ds_json_encode(0, 'no user!');
-        }
-        ds_json_encode(1, 'success', $model);
+        $model = (new Userinfo())->findOne($uid, 1);
+        $this->assign('userinfo', $model);
+        return $this->fetch();
+    }
+
+    public function  usercapitalmovements(){
+        $uid = intval(input('uid'),0);
+        $model_user = new CapitalMovements();
+        $list = $model_user->where(['user_id'=>$uid])->order('capitalMovements_id','desc')->paginate(10);
+
+        $this->assign('list', $list);
+        $this->assign('show_page', $list->render());
+
+        return $this->fetch();
     }
 
 

application/admin/model/Order.php

@@ -6,17 +6,29 @@ use think\Model;
 
 class Order extends Model
 {
+    protected $pk = 'order_id';
+
+    public function user()
+    {
+        return $this->belongsTo('User', 'user_id', 'user_id');
+    }
+
+    public function product()
+    {
+        return $this->belongsTo('Product', 'product_id', 'product_id');
+    }
+
     public function getOrdList($condition, $fileds = '*', $limit = 10)
     {
         if (empty($condition)) {
             $result = $this
                 ->field($fileds)
-                ->order('order_id','desc')
+                ->order('order_id', 'desc')
                 ->paginate($limit);
         } else {
             $result = $this
                 ->where($condition)
-                ->order('order_id','desc')
+                ->order('order_id', 'desc')
                 ->paginate($limit);
         }
         return $result;

application/admin/model/Product.php

@@ -6,6 +6,28 @@ use think\Model;
 
 class Product extends Model
 {
+    protected $pk = 'product_id';
+
+    public function porder()
+    {
+        return $this->hasMany('Order', 'product_id', 'product_id');
+    }
+
+
+    //模糊查询时使用,返回地商品的ID数组
+    public function getIdsByNameLike($name)
+    {
+        $return = [];
+        $ret = $this->field('product_id')->where(['product_name' => ['like', "%$name%"]])->select();
+        if ($ret) {
+            foreach ($ret as $val) {
+                $return[] = $val->product_id;
+            }
+        }
+        return $return;
+    }
+
+
     public function getSonList($condition)
     {
         $result = $this
@@ -13,6 +35,7 @@ class Product extends Model
             ->paginate(10);
         return $result;
     }
+
     public function getFartherList()
     {
         $result = $this
@@ -20,6 +43,7 @@ class Product extends Model
             ->select();
         return $result;
     }
+
     public function findProduct($condition)
     {
         $result = $this
@@ -27,6 +51,7 @@ class Product extends Model
             ->find();
         return $result;
     }
+
     public function updateProduct($id, $data)
     {
         $result = $this
@@ -34,12 +59,14 @@ class Product extends Model
             ->update($data);
         return $result;
     }
+
     public function addProduct($data)
     {
         $result = $this
             ->insert($data);
         return $result;
     }
+
     public function deleteProduct($condition)
     {
         $result = $this

application/admin/model/User.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+class User extends Model
+{
+    protected $pk = 'user_id';
+
+    public $page_info;
+
+    public function uorder()
+    {
+        return $this->hasMany('Order', 'user_id', 'user_id');
+    }
+
+    //模糊查询时使用,返回地用户的ID数组
+    public function getIdsByEmailLike($email)
+    {
+        $return = [] ;
+        $ret = $this->field('user_id')->where(['user_email'=>['like', "%$email%"]])->select();
+        if ($ret){
+            foreach ($ret as $val){
+                $return[] = $val->user_id;
+            }
+        }
+        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

@@ -32,7 +32,7 @@
                         <!--<th><input type="checkbox" onclick="javascript:$('input[name*=tables]').prop('checked', this.checked);">全选</th>-->
                         <th>用户登陆邮箱</th>
                         <th>企业名称</th>
-                        <th>企业地区</th>
+                        <!--<th>企业地区</th>-->
                         <th>企业所在地</th>
                         <th>联系人姓名</th>
                         <th>是否三证合一</th>
@@ -54,9 +54,9 @@
                         <td class="align-center">
                             {$user.enterprise}
                         </td>
-                        <td class="align-center">
-                            {$user.area}
-                        </td>
+                        <!--<td class="align-center">-->
+                            <!--{$user.area}-->
+                        <!--</td>-->
                         <td class="align-center">
                             {$user.enterprise_location}
                         </td>
@@ -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

@@ -1,88 +1,90 @@
 {extend name="layout:home" /}
 
 {block name="container"}
+<style>
+    table{
+        margin: 20px 100px;
+    }
+    table td{
+        height: 40px;
+        line-height: 40px;
+    }
+    td.info_problem{
+        width: 150px;
+    }
+    td.info_answer{
+        width: 300px;
+    }
+    td.info_answer img{
+        width:300px ;
+    }
+</style>
 <form class="layui-form layui-form-pane" method="post" action="" enctype="multipart/form-data">
     <div class="layui-tab layui-tab-card">
         <div class="layui-tab-content page-tab-content">
             <div class="layui-tab-item layui-show ">
-
-                <div class="layui-form-item">
-                    <label class="layui-form-label">用户登陆邮箱</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input user_email" name="user_email" id="user_email" value="{$userinfo.user_email}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise" name="enterprise" id="enterprise" value="{$userinfo.enterprise}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业所在地区</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input area" name="area" id="area" value="{$userinfo.area}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业所在地</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise_location" name="enterprise_location" id="enterprise_location" value="{$userinfo.enterprise_location}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业通讯地址</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise_address" name="enterprise_address" id="enterprise_address" value="{$userinfo.enterprise_address}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">联系人姓名</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input contact_name" name="contact_name" id="contact_name" value="{$userinfo.contact_name}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">是否三证合一</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input whether" name="whether" id="whether" value="{$userinfo.whether}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">社会信用代码</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input credit_code" name="credit_code" id="credit_code" value="{$userinfo.credit_code}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">开户银行所在地</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bank_location" name="bank_location" id="bank_location" value="{$userinfo.bank_location}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">银行名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bank" name="bank" id="bank" value="{$userinfo.bank}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">银行支行名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bankbranch" name="bankbranch" id="bankbranch" value="{$userinfo.bankbranch}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">营业执照</label>
-                    <div class="layui-input-inline">
-                        <img src="{$userinfo.businesslicense}" alt="">
-                        <!--<input type="text" class="layui-input businesslicense" name="businesslicense" id="businesslicense" value="{$userinfo.businesslicense}" lay-verify="" autocomplete="off" placeholder="" required />-->
-                    </div>
-                </div>
+                <div class="title" style="margin:20px 200px;font-size: 15px;">企业实名认证审核</div>
+                <input type="text" style="display: none;" name="user_id" value="{$userinfo.user_id}">
+                <table>
+                    <tr>
+                        <td class="info_problem">用户登陆邮箱</td>
+                        <td class="info_answer">{$userinfo.user_email}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">企业名称</td>
+                        <td class="info_answer">{$userinfo.enterprise}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">企业所在地区</td>
+                        <td class="info_answer">{$userinfo.area}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">企业所在地</td>
+                        <td class="info_answer">{$userinfo.enterprise_location}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">企业通讯地址</td>
+                        <td class="info_answer">{$userinfo.enterprise_address}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">联系人姓名</td>
+                        <td class="info_answer">{$userinfo.contact_name}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">是否三证合一</td>
+                        <td class="info_answer">{$userinfo.whether}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">社会信用代码</td>
+                        <td class="info_answer">{$userinfo.credit_code}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">开户银行所在地</td>
+                        <td class="info_answer">{$userinfo.bank_location}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">银行名称</td>
+                        <td class="info_answer">{$userinfo.bank}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">银行支行名称</td>
+                        <td class="info_answer">{$userinfo.bankbranch}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">借记卡卡号</td>
+                        <td class="info_answer">{$userinfo.userInfo_debit_card}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">营业执照</td>
+                        <td class="info_answer"> <img src="{$userinfo.businesslicense}" alt=""></td>
+                    </tr>
+                </table>
 
                 <div class="layui-form-item">
                     <div class="layui-input-block">
-                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit value="{:lang('ds_submit')}"/>
+                        <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>
             </div>
@@ -90,6 +92,9 @@
     </div>
 </form>
 <script>
+    $("#canael").click(function(){
+        history.go(-1);
+    });
     layui.use('form', function () {
         var form = layui.form;
     });

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

@@ -1,87 +1,66 @@
 {extend name="layout:home" /}
 
 {block name="container"}
+<style>
+    table{
+        margin: 20px 100px;
+    }
+    table td{
+        height: 40px;
+        line-height: 40px;
+    }
+    td.info_problem{
+        width: 150px;
+    }
+    td.info_answer{
+        width: 300px;
+    }
+    td.info_answer img{
+        width:300px ;
+    }
+</style>
 <form class="layui-form layui-form-pane" method="post" action="" enctype="multipart/form-data">
     <div class="layui-tab layui-tab-card">
         <div class="layui-tab-content page-tab-content">
             <div class="layui-tab-item layui-show ">
-
-                <div class="layui-form-item">
-                    <label class="layui-form-label">用户登陆邮箱</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input user_email" name="user_email" id="user_email" value="{$userinfo.user_email}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise" name="enterprise" id="enterprise" value="{$userinfo.enterprise}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业所在地区</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input area" name="area" id="area" value="{$userinfo.area}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业所在地</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise_location" name="enterprise_location" id="enterprise_location" value="{$userinfo.enterprise_location}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">企业通讯地址</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input enterprise_address" name="enterprise_address" id="enterprise_address" value="{$userinfo.enterprise_address}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">联系人姓名</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input contact_name" name="contact_name" id="contact_name" value="{$userinfo.contact_name}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">是否三证合一</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input whether" name="whether" id="whether" value="{$userinfo.whether}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">社会信用代码</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input credit_code" name="credit_code" id="credit_code" value="{$userinfo.credit_code}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">开户银行所在地</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bank_location" name="bank_location" id="bank_location" value="{$userinfo.bank_location}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">银行名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bank" name="bank" id="bank" value="{$userinfo.bank}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">银行支行名称</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input bankbranch" name="bankbranch" id="bankbranch" value="{$userinfo.bankbranch}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">营业执照</label>
-                    <div class="layui-input-inline">
-                        <input type="text" class="layui-input businesslicense" name="businesslicense" id="businesslicense" value="{$userinfo.businesslicense}" lay-verify="" autocomplete="off" placeholder="" required />
-                    </div>
-                </div>
+                <input type="text" style="display: none;" name="user_id" value="{$userinfo.user_id}">
+                <div class="title" style="margin:20px 200px;font-size: 15px;">个人实名认证审核</div>
+                <table>
+                    <tr>
+                        <td class="info_problem">用户登陆邮箱</td>
+                        <td class="info_answer">{$userinfo.user_email}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">真实姓名</td>
+                        <td class="info_answer">{$userinfo.userInfo_name}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">身份证号码</td>
+                        <td class="info_answer">{$userinfo.userInfo_identity}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">银行卡卡号</td>
+                        <td class="info_answer">{$userinfo.userInfo_bank_card}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">借记卡卡号</td>
+                        <td class="info_answer">{$userinfo.userInfo_debit_card}</td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">证件正面</td>
+                        <td class="info_answer"> <img src="{$userinfo.img_front}" alt=""></td>
+                    </tr>
+                    <tr>
+                        <td class="info_problem">证件反面</td>
+                        <td class="info_answer"> <img src="{$userinfo.img_back}" alt=""></td>
+                    </tr>
+                </table>
 
                 <div class="layui-form-item">
                     <div class="layui-input-block">
-                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit value="{:lang('ds_submit')}"/>
+                        <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>
             </div>
@@ -89,6 +68,9 @@
     </div>
 </form>
 <script>
+    $("#canael").click(function(){
+        history.go(-1);
+    });
     layui.use('form', function () {
         var form = layui.form;
     });

application/admin/view/order/index.html

@@ -50,11 +50,11 @@
                                value="{$oinput.order_identity}" class="layui-input">
                     </div>
                     <div class="layui-inline">
-                        <input type="text" name="user_id" placeholder="用户ID" autocomplete="off"
+                        <input type="text" name="user_id" placeholder="用户邮箱" autocomplete="off"
                                value="{$oinput.user_id}" class="layui-input">
                     </div>
                     <div class="layui-inline">
-                        <input type="text" name="product_id" placeholder="产品ID" autocomplete="off"
+                        <input type="text" name="product_id" placeholder="产品名称" autocomplete="off"
                                value="{$oinput.product_id}" class="layui-input">
                     </div>
 
@@ -84,8 +84,8 @@
             <tr>
                 <th>{$Think.lang.order_id}</th>
                 <th>{$Think.lang.order_identity}</th>
-                <th>{$Think.lang.order_uid}</th>
-                <th>{$Think.lang.order_pid}</th>
+                <th>用户邮箱</th>
+                <th>产品名称</th>
                 <th>{$Think.lang.order_daynumber}</th>
                 <th>{$Think.lang.order_buytime}</th>
                 <th>{$Think.lang.order_money}</th>
@@ -98,8 +98,8 @@
             <tr>
                 <th>{$order.order_id}</th>
                 <th>{$order.order_identity}</th>
-                <th>{$order.user_id}</th>
-                <th>{$order.product_id}</th>
+                <th>{$order.user.user_email}</th>
+                <th>{$order.product.product_name}</th>
                 <th>{$order.order_dayNumber}</th>
                 <th>{$order.order_buyTime}</th>
                 <th>{$order.order_money}</th>

application/admin/view/server/userServer.html

@@ -30,6 +30,7 @@
             </colgroup>
             <thead>
             <tr>
+                <th>订单号</th>
                 <th>服务名称</th>
                 <th>用户名</th>
                 <th>购买总时长</th>
@@ -41,6 +42,7 @@
             {if count($userproduct)}
             {volist name="userproduct" id="value"}
             <tr>
+                <td>{$value.userProduct_identity}</td>
                 <td>{$value.product_name}</td>
                 <td>{$value.user_email}</td>
                 <td>{$value.userProduct_dayNumber}</td>

application/admin/view/user/index.html

@@ -90,6 +90,7 @@
                     <a onclick="recharge({$user.user_id}, 1)" class="layui-btn layui-btn-xs">充值</a>
                     <a onclick="recharge({$user.user_id}, 2)" class="layui-btn layui-btn-xs">扣款</a>
                     <a onclick="userInfo({$user.user_id})" class="layui-btn layui-btn-xs">详情</a>
+                    <a onclick="userInfomoney({$user.user_id})" class="layui-btn layui-btn-xs">流水</a>
                 </td>
             </tr>
             {/volist}
@@ -120,43 +121,29 @@
 
     //用户详情
     function userInfo(uid) {
-        var retmsg = '';
-
-        function dodata(key, val) {
-            retmsg += key + " : " + val + "<br>";
-        }
-
-        layui.use('layer', function () {
-            $.ajax({
-                type: "get",
-                url: '/admin/user/userInfo',
-                data: {uid: uid},
-                dataType: "json",
-                success: function (msg) {
-                    if (msg.code == 1) {
-                        var datas = msg.result;
-                        for (var i in datas) {
-                            dodata(i, datas[i]);
-                        }
-                    }
-
-                    $("#layui-layer-content2").html(retmsg)
-                    $("#layui-layer3").attr("style", "display: block")
-                    $("#layui-layer-shade4").attr("style", "display: block")
-                },
-                error: function (d) {
-                    alert(d);
-                }
-            })
+       var url = '/admin/user/userinfo?uid='+uid;
+        parent.layer.open({
+            type: 2,
+            title: '用户详情',
+            area: ["900px","500px"],
+            fixed: false, //不固定
+            content: url
         });
     }
 
-    function makeTable(arr) {
-        var table = "";
-        table += "";
+    function userInfomoney(uid){
+        var url = '/admin/user/usercapitalmovements?uid='+uid;
+        parent.layer.open({
+            type: 2,
+            title: '流水记录',
+            area: ["1200px","500px"],
+            fixed: false, //不固定
+            content: url
+        });
 
     }
 
+
     function hiddenTips() {
         $("#layui-layer2").attr("style", "display: none")
         $("#layui-layer-shade4").attr("style", "display: none")
@@ -193,6 +180,7 @@
     }
 
     layui.use('laydate', function () {
+
         var laydate = layui.laydate;
 
         //执行一个laydate实例

application/admin/view/user/usercapitalmovements.html

@@ -0,0 +1,42 @@
+{extend name="layout:home" /}
+{block name="container"}
+<div class="layui-tab layui-tab-card">
+    <div class="layui-tab-content page-tab-content">
+        <table class="layui-table lay-even">
+            <thead>
+            <tr>
+                <th>交易id</th>
+                <th>创建时间</th>
+                <th>修改时间</th>
+                <th>金额</th>
+                <th>类型</th>
+                <th>剩余金额</th>
+                <th>操作人</th>
+                <th>描述</th>
+            </tr>
+            </thead>
+            <tbody>
+            {if $list}
+            {volist name="list" id="user"}
+            <tr>
+                <td>{$user.capitalMovements_identity}</td>
+                <td>{$user.capitalMovements_create}</td>
+                <td>{$user.capitalMovements_update}</td>
+                <td>{$user.capitalMovements_money}</td>
+                <td>{$user.capitalMovements_type==1? '增加':'减少'}</td>
+                <td>{$user.capitalMovements_cash}</td>
+                <td>{$user.capitalMovements_operator}</td>
+                <td>{$user.capitalMovements_describe}</td>
+            </tr>
+            {/volist}
+            {else}
+            <td>无数据</td>
+            {/if}
+            </tbody>
+        </table>
+        {$show_page}
+    </div>
+</div>
+
+
+{/block}

application/admin/view/user/userinfo.html

@@ -0,0 +1,24 @@
+{extend name="layout:home" /}
+{block name="container"}
+    <table id="uinfotable" class="layui-table  lay-even">
+        <thead>
+        <tr>
+            <th>名称</th>
+            <th>值</th>
+        </tr>
+        </thead>
+        <tbody>
+        {if count($userinfo)}
+        {volist name="userinfo" id="user"}
+        <tr>
+            <td>{$key}</td>
+            <td>{$user}</td>
+        </tr>
+        {/volist}
+        {else}
+        <td>无数据</td>
+        {/if}
+        </tbody>
+    </table>
+{/block}
+

application/admin/view/wlcome/index.html

@@ -1,7 +1,7 @@
 {extend name="layout:home" /}
 {block name="container"}
 <div class="layui-tab-content page-tab-content">
-    <h1>{$Think.lang.wel_version_info}</h1>
+    <!--<h1>{$Think.lang.wel_version_info}</h1>
     <table class="layui-table lay-even">
         <colgroup>
             <col width="300">
@@ -27,7 +27,7 @@
             <td><a href="http://bbs.csdeshang.com" target="_blank">{$Think.lang.wel_communication_bbs}</a></td>
         </tr>
         </tbody>
-    </table>
+    </table>-->
 
     <h1>{$Think.lang.wel_sys_info}</h1>
     <table class="layui-table lay-even">
@@ -82,4 +82,4 @@
     </table>
 </div>
 
-{/block}
+{/block}

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();
@@ -63,7 +66,7 @@ class Certification extends UserControl
                 'userInfo_debit_card' => $debit_card
             );
 
-            $imgurl = DS_THEME_STYLE_URL . 'images/certification';
+            $imgurl = DS_THEME_USER_URL . 'images/certification';
             $numurl = '/static/user/images/certification';
             $img_front = request()->file('img_front');
             $img_back = request()->file('img_back');
@@ -84,28 +87,30 @@ class Certification extends UserControl
                 }
             }
             $res = db('userinfo')->where('user_id', $user_info['user_id'])->update($update_info);
-            if($res == 1){
-                $date = array(
-                    'user_status' => 0
-                );
-                $result = db('user')->where('user_id', $user_info['user_id'])->update($date);
-                if($result == 1){
-                    return $this->redirect('User/Certification/index');
-                }
-            }
+            $date = array(
+                'user_status' => 2,
+                'user_type' => 1
+            );
+            $result = db('user')->where('user_id', $user_info['user_id'])->update($date);
+
+            return $this->redirect('User/Certification/index');
+
 
         }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'] = '个人用户';
@@ -161,7 +166,7 @@ class Certification extends UserControl
                 'userInfo_debit_card' => $debit_card
             );
 
-            $imgurl = DS_THEME_STYLE_URL . 'images/certification';
+            $imgurl = DS_THEME_USER_URL . 'images/certification';
             $numurl = '/static/user/images/certification';
             $file = request()->file('images');
 //            print_r($file->getInfo());
@@ -176,7 +181,8 @@ class Certification extends UserControl
             }
 //            print_r($update_info);
             $date = array(
-                'user_status' => 0
+                'user_status' => 2,
+                'user_type' => 2
             );
             $res = db('userinfo')->where('user_id', $user_info['user_id'])->update($update_info);
             $result = db('user')->where('user_id', $user_info['user_id'])->update($date);
@@ -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'] = '个人用户';