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

application/admin/controller/AdminControl.php

@@ -240,6 +240,16 @@ class AdminControl extends Controller
                     ),
                 ),
             ),
+            'bank-fill' => array(
+                'name' => 'Information_manage',
+                'text' => '信息管理',
+                'children' => array(
+                    'Information' => array(
+                        'text' => '企业信息管理',
+                        'url' => url('Server/index'),
+                    ),
+                ),
+            ),
             'content_manage' => array(
                 'name' => 'content_manage',
                 'text' => lang('ds_content_manage'),

application/admin/controller/User.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 use think\Validate;
 use think\Lang;
+use app\admin\model\Userinfo;
 
 class User extends AdminControl
 {
@@ -23,46 +24,59 @@ class User extends AdminControl
         $model_user = Model('User');
         $title = input('post.title');
         $time = input('post.timeRang');
-        if(!empty($time)){
+        if (!empty($time)) {
             $gap = explode(' - ', $time);
             $begin = strtotime($gap[0]);
             $end = strtotime($gap[1]);
         }
         $condition = array();
-        if($title){
+        if ($title) {
             $condition['user_email|user_phone'] = $title;
         }
-        if($time && $begin && $end){
+        if ($time && $begin && $end) {
             $condition['user_addTime'] = array('between', array($begin, $end));
         }
         $user_list = $model_user->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']);
+        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']);
 
-            if($user_list[$i]['user_status'] == -1){
+            if ($user_list[$i]['user_status'] == -1) {
                 $user_list[$i]['user_status'] = '未实名认证';
             }
-            if($user_list[$i]['user_status'] == 2){
+            if ($user_list[$i]['user_status'] == 2) {
                 $user_list[$i]['user_status'] = '实名认证中';
             }
-            if($user_list[$i]['user_status'] == 1){
+            if ($user_list[$i]['user_status'] == 1) {
                 $user_list[$i]['user_status'] = '已实名认证';
             }
 
-            if($user_list[$i]['user_type'] == 1){
+            if ($user_list[$i]['user_type'] == 1) {
                 $user_list[$i]['user_type'] = '个人用户';
             }
-            if($user_list[$i]['user_type'] == 2){
+            if ($user_list[$i]['user_type'] == 2) {
                 $user_list[$i]['user_type'] = '企业用户';
             }
         }
         $allpower = $this->qxhans();
-        $this->assign('allpower',$allpower);
+        $this->assign('allpower', $allpower);
         $this->assign('user_list', $user_list);
         $this->assign('show_page', $model_user->page_info->render());
         $this->setAdminCurItem('index');
         return $this->fetch();
     }
+
+    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);
+    }
+
+
     public function recharge()
     {
         $money = input('post.money');
@@ -72,7 +86,7 @@ class User extends AdminControl
             $userInfo = Model('userinfo');
             $userMessage = Model('userMessage');
             $capitalMovements = Model('CapitalMovements');
-            $getUserInfo = $userInfo->getUserInfo(['user_id'=>$user_id]);
+            $getUserInfo = $userInfo->getUserInfo(['user_id' => $user_id]);
             $userInfo->startTrans();
             $userMessage->startTrans();
             $capitalMovements->startTrans();
@@ -84,7 +98,7 @@ class User extends AdminControl
                     $balance = $getUserInfo->userInfo_money - $money;
                     $msg = '扣款';
                 }
-                $userInfo->updateUserInfo(['user_id'=>$user_id], ['userInfo_money'=>$balance]);
+                $userInfo->updateUserInfo(['user_id' => $user_id], ['userInfo_money' => $balance]);
                 $nowDate = date('Y-m-d H:i:s');
                 $userMessageData = [
                     'user_id' => $user_id,

application/admin/model/Userinfo.php

@@ -14,6 +14,7 @@ class Userinfo extends Model
 
         return $result;
     }
+
     public function getUserInfo($condition)
     {
         $result = $this
@@ -23,5 +24,68 @@ class Userinfo extends Model
         return $result;
     }
 
+    public function findOne($uid, $format = 0)
+    {
+        $ret = $this->where(['user_id' => $uid])->find();
+        if (!$ret) {
+            return false;
+        }
+        if ($format) {
+            return $this->FormatData($ret);
+        } else {
+            return $ret;
+        }
+    }
+
+    private function FormatData($model)
+    {
+        $return = [];
+        $arr = $model->toArray();
+        $allKey = $this->KeyMap();
+        $skipF = ['userInfo_id', 'user_id'];
+        $imgF = ['userInfo_header', 'img_front', 'img_back', 'businesslicense'];
+
+        foreach ($arr as $key => $val) {
+            if (in_array($key, $skipF)) {
+                continue;
+            }
+            if (!empty($val)) {
+                $kname = $allKey[$key];
+                if (in_array($key, $imgF)) {
+                    $return[$kname] = "<a href='$val' target='_blank'><img width='120' src='$val'></a>";
+                } else {
+                    $return[$kname] = $val;
+                }
+            }
+        }
+        return $return;
+    }
+
+    private function KeyMap()
+    {
+        return [
+            'userInfo_id' => '用户信息自增ID',
+            'user_id' => '用户ID',
+            'userInfo_money' => '用户余额',
+            'userInfo_header' => '用户头像',
+            'userInfo_name' => '真实姓名',
+            'userInfo_identity' => '身份证号码',
+            'userInfo_bank_card' => '银行卡卡号',
+            'userInfo_debit_card' => '借记卡卡号',
+            'img_front' => '证件正面',
+            'img_back' => '证件反面',
+            'enterprise' => '企业名称',
+            'area' => '企业地区',
+            'enterprise_location' => '企业所在地',
+            'enterprise_address' => '企业通讯地址',
+            'contact_name' => '联系人姓名',
+            'whether' => '是否三证合一',
+            'credit_code' => '社会信用代码',
+            'bank_location' => '开户银行所在地',
+            'bank' => '银行名称',
+            'bankbranch' => '银行支行名称',
+            'businesslicense' => '营业执照',
+        ];
+    }
 
 }

application/admin/view/user/index.html

@@ -1,15 +1,19 @@
 {extend name="layout:home" /}
 {block name="container"}
 <div class="layui-tab layui-tab-card">
-    <div class="layui-layer-shade recharge-layui-layer-shade4" id="layui-layer-shade4" times="4" style="display: none;"></div>
-    <div style="display: none;" class="layui-layer layui-layer-dialog recharge-layui-layer2" id="layui-layer3" type="dialog" times="2" showtime="0" contype="string">
+    <div class="layui-layer-shade recharge-layui-layer-shade4" id="layui-layer-shade4" times="4"
+         style="display: none;"></div>
+    <div style="display: none;" class="layui-layer layui-layer-dialog recharge-layui-layer2" id="layui-layer3"
+         type="dialog" times="2" showtime="0" contype="string">
         <div id="layui-layer-content2" class="layui-layer-content"></div>
-        <span class="layui-layer-setwin" onclick="hiddenTips2()"><a class="layui-layer-ico layui-layer-close layui-layer-close2"
-                                                                    href="javascript:;"></a></span>
+        <span class="layui-layer-setwin" onclick="hiddenTips2()"><a
+                class="layui-layer-ico layui-layer-close layui-layer-close2"
+                href="javascript:;"></a></span>
         <div class="layui-layer-btn layui-layer-btn-" onclick="hiddenTips2()"><a class="layui-layer-btn0">确定</a></div>
         <span class="layui-layer-resize"></span>
     </div>
-    <div style="display: none;" class="layui-layer layui-layer-dialog recharge-layui-layer2" id="layui-layer2" type="dialog" times="2" showtime="0" contype="string">
+    <div style="display: none;" class="layui-layer layui-layer-dialog recharge-layui-layer2" id="layui-layer2"
+         type="dialog" times="2" showtime="0" contype="string">
         <div class="layui-tab">
             <div class="layui-tab-content page-tab-content">
                 <div class="layui-tab-item layui-show" style="width: 300px; height: 150px">
@@ -18,7 +22,7 @@
                     <div class="layui-form-item" id="oajax">
                         <label class="layui-form-label" style="width: 100px" id="moneyLabel"></label>
                         <div class="layui-input-block">
-                            <input id="money" class="layui-input field-name" name="money" style="width: 120px" />
+                            <input id="money" class="layui-input field-name" name="money" style="width: 120px"/>
                         </div>
                     </div>
                     <div class="layui-form-item" style="margin-top: 60px">
@@ -39,19 +43,20 @@
     <div class="layui-tab-content page-tab-content">
         <!-- 搜索框开始 -->
         <div class="search-form">
-        <form class="" method="post">
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <input type="text" name="title"  placeholder="输入名称或电话" autocomplete="off" class="layui-input">
-                </div>
-                <div class="layui-inline">
-                    <input type="text" class="layui-input" name="timeRang" id="timeRang" placeholder="选择时间段" style="width: 170px;">
-                </div>
-                <div class="layui-inline">
-                    <button type="submit" class="layui-btn search-subBtn">搜索</button>
+            <form class="" method="post">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <input type="text" name="title" placeholder="输入名称或电话" autocomplete="off" class="layui-input">
+                    </div>
+                    <div class="layui-inline">
+                        <input type="text" class="layui-input" name="timeRang" id="timeRang" placeholder="选择时间段"
+                               style="width: 170px;">
+                    </div>
+                    <div class="layui-inline">
+                        <button type="submit" class="layui-btn search-subBtn">搜索</button>
+                    </div>
                 </div>
-            </div>
-        </form>
+            </form>
         </div>
         <!-- 搜索框结束 -->
         <table class="layui-table lay-even">
@@ -84,6 +89,7 @@
                 <td>
                     <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>
                 </td>
             </tr>
             {/volist}
@@ -95,8 +101,11 @@
         {$show_page}
     </div>
 </div>
+
+
 <script type="text/javascript">
     const myHost = "http://" + window.location.host;
+
     function recharge(user_id, type) {
         $("#user_id").val(user_id);
         $("#type").val(type);
@@ -105,18 +114,60 @@
         } else {
             $("#moneyLabel").html("扣款金额");
         }
-        $("#layui-layer2").attr("style","display: block")
-        $("#layui-layer-shade4").attr("style","display: block")
+        $("#layui-layer2").attr("style", "display: block")
+        $("#layui-layer-shade4").attr("style", "display: block")
     }
+
+    //用户详情
+    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);
+                }
+            })
+        });
+    }
+
+    function makeTable(arr) {
+        var table = "";
+        table += "";
+
+    }
+
     function hiddenTips() {
-        $("#layui-layer2").attr("style","display: none")
-        $("#layui-layer-shade4").attr("style","display: none")
+        $("#layui-layer2").attr("style", "display: none")
+        $("#layui-layer-shade4").attr("style", "display: none")
     }
+
     function hiddenTips2() {
-        $("#layui-layer3").attr("style","display: none")
-        $("#layui-layer-shade4").attr("style","display: none")
+        $("#layui-layer3").attr("style", "display: none")
+        $("#layui-layer-shade4").attr("style", "display: none")
         window.location.href = myHost + "/Admin/user/index.html";
     }
+
     function submit() {
         let url = myHost + "/Admin/user/recharge.html";
         let user_id = $("#user_id").val();
@@ -130,28 +181,29 @@
             dataType: "json",
             success: function (msg) {
                 $("#layui-layer-content2").html(msg['msg'])
-                $("#layui-layer3").attr("style","display: block")
-                $("#layui-layer-shade4").attr("style","display: block")
+                $("#layui-layer3").attr("style", "display: block")
+                $("#layui-layer-shade4").attr("style", "display: block")
             },
             error: function () {
                 $("#layui-layer-content2").html("错误：链接不到服务器")
-                $("#layui-layer3").attr("style","display: block")
-                $("#layui-layer-shade4").attr("style","display: block")
+                $("#layui-layer3").attr("style", "display: block")
+                $("#layui-layer-shade4").attr("style", "display: block")
             }
         });
     }
-    layui.use('laydate', function(){
-      var laydate = layui.laydate;
 
-      //执行一个laydate实例
-      laydate.render({
-        elem: '#creatTime' //指定元素
-      });
+    layui.use('laydate', function () {
+        var laydate = layui.laydate;
+
+        //执行一个laydate实例
+        laydate.render({
+            elem: '#creatTime' //指定元素
+        });
         laydate.render({
-            elem:'#timeRang',
-            range:true,
+            elem: '#timeRang',
+            range: true,
             format: 'yyyy/MM/dd',
-            done: function(value, date){
+            done: function (value, date) {
                 /* 时间选择完成后的回调 */
             }
         })