Your Name 3 éve
szülő
commit
f026b0bbb5

+ 10 - 2
tool/work/assets/pc/html/index.html

@@ -228,11 +228,19 @@ body{
 
 
   <div class="layui-row onebor">
-    <div class="layui-col-xs6">
+  <div>
+      <div class="grid-demo" style="margin-top:20px;margin-bottom:20px;">姓名:<{$info['user_name']}><span style="margin-left:200px;"><{$info['role_name']}></span></div>
+      <div style="margin-bottom:20px;">手机号:<{$info['mobile']}><span style="margin-left:200px;"><{$info['idcard']}></span></div>
+      <div class="grid-demo" style="margin-bottom:20px;">类别:<{$info['cate_name']}></div>
+      <div class="grid-demo grid-demo-bg desc">描述:<{$info['desc']}></div>
+  </div>
+    <!-- <div class="layui-col-xs6">
       <div class="grid-demo">姓名:<{$info['user_name']}></div>
     </div>
     <div class="layui-col-xs6 role">
+    <{if(isset($info['role_name']) && $info['role_name']):}>
       <div class="grid-demo">代理商角色:<{$info['role_name']}></div>
+      <{endif}>
     </div>
     <div class="layui-col-xs6 ">
       <div class="grid-demo">手机号:<{$info['mobile']}></div>
@@ -245,7 +253,7 @@ body{
     </div>
   <div class="layui-col-bg layui-col-md8 ">
       <div class="grid-demo grid-demo-bg desc">描述:<{$info['desc']}></div>
-    </div>
+    </div> -->
     <div class="layui-row">
     <{if(isset($info['video']) && $info['video']):}>
     <div style="float:left;">

+ 15 - 1
tool/work/database/info.php

@@ -84,6 +84,7 @@ if ($search_auth == 2) {
 $button = array();
 if ($search_auth == 1) {
     $button['回调界面'] = array('location',Dever::url('lib/appoint.back','work')); 
+    $button['电话回调界面'] = array('location',Dever::url('lib/appoint.callback','work')); 
 }
 $excel = false;
 if (Dever::load('manage/auth')->checkFunc('work.info', 'infoedit', '数据导出')) {
@@ -138,7 +139,7 @@ return array
             'name'      => '手机号/姓名',
             'default'   => '',
             'desc'      => '请输入手机号',
-            'match'     => 'option',
+            'match'     => 'is_numeric',
             'update'    => 'text',
             'search'    => array
             (
@@ -278,6 +279,18 @@ return array
             // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
         ),
 
+        'question'       => array
+        (
+            'type'      => 'int-11',
+            'name'      => '问题',
+            'default'   => '',
+            'desc'      => '问题',
+            'match'     => 'option',
+            // 'search'    => 'linkage',
+            'update'    => 'hidden',
+            // 'option'    => Dever::url('lib/appoint.get?level_total=2', 'work'),
+        ),
+
         'branch_id'       => array
         (
             'type'      => 'varchar-500',
@@ -457,6 +470,7 @@ return array
             'option' => array
             (
                 'group' => 'yes',
+                'question' => 'yes',
                 'state' => 1,
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),

+ 10 - 4
tool/work/database/question.php

@@ -12,9 +12,13 @@ $cate = function()
 $branch = function()
 {
     $array = array();
-    $data = Dever::db('manage/group')->state();
+    $data = Dever::db('work/branch')->state();
     if($data)
     {
+        foreach ($data as $k => $v) {
+            $group = Dever::db('manage/group')->find($v['group_id']);
+            $data[$k]['name'] = $group['name'];
+        }
         $array += $data;
     }
     return $array;
@@ -117,9 +121,10 @@ return array
             'default'   => '-1',
             'desc'      => '关联部门',
             'match'     => 'is_string',
-            'search'    => 'linkage',
-            'update'    => 'linkage',
-            'option'    => Dever::url('lib/appoint.get?level_total=1', 'work'),
+            'search'    => 'select',
+            'update'    => 'select',
+            'option'    => $branch,
+            // Dever::url('lib/appoint.get?level_total=1', 'work'),
             'list'      => 'Dever::load("work/lib/manage.branch",{branch_id})',
         ),
 
@@ -213,6 +218,7 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
+                'branch_id' => 'yes',
                 // 'id' => array('yes','>'),
                 'state' => 1,
             ),

+ 95 - 6
tool/work/lib/Appoint.php

@@ -168,7 +168,6 @@ Class Appoint
         $admin_id = false;
         if ($type == 2) {
             $info = Dever::db('work/branch')->find(array('group_id' => $level_id));
-        
             if ($info) {
                 $temp = explode(',', $info['group']);
                 $admin_id = $temp[1] . ',' . $info['coor'];
@@ -219,9 +218,6 @@ Class Appoint
         } else {
             $default = $this->cdefault;
         }
-        // if ($level_id < 0) {
-        //     Dever::alert('error');
-        // }
         if ($level_num == 1) {
             $data = Dever::db('work/q_cate')->getSearchAll();
 
@@ -237,6 +233,9 @@ Class Appoint
             array_unshift($data, $default);
         }
         $result['level_total'] = $level_total;
+        if ($level_num == 2) {
+            unset($data[0]);
+        }
         $result['list'] = $data;
         return $result;
     }
@@ -274,17 +273,21 @@ Class Appoint
         }
 		
 		$data['info']['role_name'] = '';
+        $data['info']['idcard'] = '';
 		$user = Dever::db('work/user')->find(array('mobile'=>$data['info']['mobile']));
 		if ($user) {
 			$data['info']['user_name'] = $user['name'];
 			$data['info']['mobile'] = $user['mobile'];
-			$data['info']['idcard'] = $user['idcard'];
+            if(isset($user['idcard']) && $user['idcard']) {
+                $data['info']['idcard'] = '身份证号码:'.$user['idcard'];
+            }
+			
 			if ($user['agent_uid'] && $user['agent_uid']>0) {
 				$member = Dever::db('agent/member')->find($user['agent_uid']);
 				if ($member && $member['role']) {
 					$role = Dever::db('setting/role')->find($member['role']);
 					if ($role) {
-						$data['info']['role_name'] = $role['name'];
+						$data['info']['role_name'] = '代理商角色:'.$role['name'];
 					}
 				}
 			}
@@ -503,4 +506,90 @@ Class Appoint
         }
         return Dever::render('back', $data);
     }
+
+    public function callback_api(){
+        $mobile = Dever::input('phone');
+        
+        $data = array();
+        if ($mobile) {
+            if(!preg_match('/^1[3|5|6|7|8|9]\d{9}$/', $mobile)){
+                // Dever::alert('代理商手机号不正确');
+            return  '代理商手机号不正确';
+        }
+            $user = Dever::db('work/user')->find(array('mobile'=>$mobile));
+            if (!$user) {
+                $data['user']['title'] = '电话号码';
+                $data['user']['mobile'] = $mobile;
+                $data['user']['username'] = $mobile;
+                $data['user']['type'] = '无系统关联关系';
+                $data['user']['work'] = Dever::url('project/database/update?project=work&table=info&menu=work&search_option_mobile='.$mobile, 'manage');
+                // print_R($data);die;
+                 return Dever::render('callback', $data);
+            }
+            if ($user){
+                $table = array();
+                $user['role_name'] = '';
+                $user['type'] = '';
+                $user['title'] = '名称/电话号码';
+                $user['username'] = $user['name'].'<br/>'.$user['mobile'];
+                if ($user['agent_uid'] && $user['agent_uid'] > 0) {
+                    $member = Dever::db('agent/member')->find($user['agent_uid']);
+                    
+                    if ($member['role']) {
+                        $role = Dever::db('setting/role')->find($member['role']);
+                        if ($role) {
+                            $user['role_name'] = $role['name'];
+                            $user['title'] = '名称/电话号码/角色';
+                            $user['username'] = $user['name'].'<br/>'.$user['mobile'].'<br/>'.$user['role_name'];
+                        }
+                    }
+                    $user['type'] = '代理商';
+                    if ($user['option_uid'] && $user['option_uid']>0) {
+                        $user['type'] = $user['type'].'<br/>期权账户';
+                    }
+                    if ($user['passport_uid'] && $user['passport_uid']>0) {
+                        $user['type'] = $user['type'].'<br/>小程序';
+                    }
+                    $user['type'] = $user['type'].'<br/>客服系统用户';
+                    
+                } else {
+                    if ($user['option_uid'] && $user['option_uid']>0) {
+                        $user['type'] = '期权账户';
+                        if ($user['passport_uid'] && $user['passport_uid']>0) {
+                            $user['type'] = $user['type'].'<br/>小程序';
+                        }
+                        $user['type'] = $user['type'].'<br/>客服系统用户';
+                    } else {
+                        if ($user['passport_uid'] && $user['passport_uid']>0) {
+                            $user['type'] = '小程序';
+                            $user['type'] = $user['type'].'<br/>客服系统用户';
+                        } else {
+                            $user['type'] = '客服系统用户';
+                            // $user['type'] = '无系统关联关系';
+                        }
+                    }
+                }
+                if ($user['agent_uid']) {
+                    $user['order'] = Dever::url('project/database/list?project=agent&table=order&p=1&search_option_mid='.$user['agent_uid'], 'manage');
+                    $user['order'] = Dever::url('home?link=' . urlencode($user['order']) , 'manage');
+
+                    $user['agent'] = Dever::url('project/database/list?project=agent&table=member_area&mid='.$user['agent_uid'].'&page_type=1&search_auth=1&page_type=1&jump=19','manage');
+                    $user['agent'] = Dever::url('home?link=' . urlencode($user['agent']) , 'manage');
+
+                    $user['soft'] = Dever::url('project/database/list?project=agent&table=soft_cash&search_option_mid='.$user['agent_uid'], 'manage');
+                    $user['soft'] = Dever::url('home?link=' . urlencode($user['soft']) , 'manage');
+                }
+                if ($user['option_uid']) {
+                    $user['option'] = Dever::url('project/database/list?project=option&table=member&search_option_id='.$user['option_uid'], 'manage');
+                    $user['option'] = Dever::url('home?link=' . urlencode($user['option']) , 'manage');
+                }
+
+                $user['work'] = Dever::url('project/database/update?project=work&table=info&menu=work&search_option_mobile='.$mobile, 'manage');
+                $user['work'] = Dever::url('home?link=' . urlencode($user['work']) , 'manage');
+
+                $data['user'] = $user; 
+            }
+        }
+        return Dever::render('callback', $data);
+    }
 }

+ 8 - 1
tool/work/lib/Manage.php

@@ -73,6 +73,7 @@ Class Manage
 	public function updateInfo($id,$name,$data) 
 	{
 		$mobile = Dever::param('mobile',$data);
+		$cate_id = Dever::param('cate_id',$data);
 		$name = Dever::param('name',$data);
 		$user = Dever::db('work/user')->find(array('mobile'=>$mobile));
 		if ($user) {
@@ -90,7 +91,7 @@ Class Manage
 			}
 			$passport = Dever::db('passport/user')->find(array('mobile'=>$mobile));
 			if ($passport) {
-				$insert['passport_uid'] = $passport['uid'];
+				$insert['passport_uid'] = $passport['id'];
 			}
 			if ($name) {
 				$insert['name'] = $name;
@@ -100,7 +101,13 @@ Class Manage
 				Dever::db('work/user')->insert($insert);
 			}
 		}
+		
 		$info = Dever::db('work/info')->find($id);
+		if ($info && !$info['question']) {
+			if (isset($cate_id) && $cate_id  && isset($cate_id[1]) && $cate_id[1]) {
+				$w['question'] = $cate_id[1];
+			}
+		}
 		if ($info && !$info['work_num']) {
 			$w['where_id'] = $id;
 			$w['work_num'] = $this->getWorkId();