Your Name 3 年之前
父節點
當前提交
2c8b995239

+ 9 - 8
service/agent/database/member.php

@@ -140,7 +140,8 @@ return array
             'desc'      => '',
             'update'    => 'date',
             'callback'  => 'maketime',
-            'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
+            // 'list'        => '{rdate} > 0 ? date("Y-m-d H:i", {rdate}) : "无"',
+            'list'      => 'Dever::load("agent/lib/member.set_rdate", {id})',
         ),
 
         'avatar'		=> array
@@ -224,7 +225,7 @@ return array
                 'result' => 'id',
                 'col' => 'parent_mid',
             ),
-            'list_name' => '邀请人',
+            'list_name' => '上级',
             'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("agent/lib/member.getOne", {parent_mid})',
         ),
 
@@ -255,9 +256,9 @@ return array
         'code'        => array
         (
             'type'      => 'varchar-50',
-            'name'      => '邀请码',
+            'name'      => '代理商邀请码',
             'default'   => '',
-            'desc'      => '邀请码',
+            'desc'      => '代理商邀请码',
             'match'     => 'option',
             //'update'    => 'text',
             'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("invite/api.code", {id})',
@@ -292,9 +293,9 @@ return array
 		'area'       => array
         (
             'type'      => 'varchar-500',
-            'name'      => '区域',
+            'name'      => '代理区域',
             'default'   => '',
-            'desc'      => '区域',
+            'desc'      => '代理区域',
             'match'     => 'option',
             'search'    => 'linkage',
             //'update'    => 'linkage',
@@ -471,8 +472,8 @@ return array
             'desc'      => '是否导入数据',
             'match'     => 'is_numeric',
             'option'    => $import,
-            //'search'    => 'select',
-            //'list'      => true,
+            'search'    => 'select',
+            'list'      => true,
         ),
 
         'state'     => array

+ 1 - 0
service/agent/database/member_agreement.php

@@ -204,6 +204,7 @@ return array
             'desc'      => '身份证号码',
             'match'     => 'is_string',
             'update'    => 'text',
+            'search'    => 'fulltext',
         ),
 
         'idcard_front'     => array

+ 5 - 3
service/agent/database/order.php

@@ -297,7 +297,8 @@ return array
             'desc'      => '金额',
             'match'     => 'option',
             'update'    => 'text',
-            'list'		=> true,
+            // 'list'		=> true,
+            'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
             'list_order' => 6,
         ),
 
@@ -573,13 +574,14 @@ return array
         'cdate'     => array
         (
             'type'      => 'int-11',
-            'name'      => '申请时间',
+            'name'      => '处理时间',
             'match'     => array('is_numeric', time()),
             'desc'      => '',
             # 只有insert时才生效
             //'insert'    => true,
             'search'    => 'date',
-            'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            // 'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            'list'      => 'Dever::load("agent/lib/order.set_cdate", {id})',
             'list_order' => 2,
         ),
     ),

+ 21 - 0
service/agent/lib/Member.php

@@ -467,4 +467,25 @@ class Member
             return $info['id'];
         }
     }
+    #认证时间
+    public function set_rdate($id){
+        $info=Dever::db('agent/member')->one(array('id'=>$id,'state'=>1));
+        if($info['cdate']){
+            $data['注册时间']=date('Y-m-d H:i',$info['cdate']);
+        }else{
+            $data['注册时间']='-';
+        }
+        if($info['status']==2){
+            if($info['rdate']){
+                $data['认证完成时间']=date('Y-m-d H:i',$info['rdate']);
+            }else{
+                $data['认证完成时间']='-';
+            }
+        }else{
+            $data['认证完成时间']='-';
+        }
+        // $html = Dever::table($data);
+        return '注册时间:'.$data['注册时间'].'<br/>认证完成时间:'.$data['认证完成时间'];
+    
+    }
 }

+ 38 - 0
service/agent/lib/Order.php

@@ -962,4 +962,42 @@ class Order
             'content' => $table
         );
     }
+    public function set_cdate($id){
+        $info=Dever::db('agent/order')->one(array('id'=>$id,'state'=>1));
+        if($info['cdate']){
+            $data['注册时间']=date('Y-m-d H:i',$info['cdate']);
+        }else{
+             $data['注册时间']='-';
+        }
+        $order_process=Dever::db('agent/order_process')->one(array('status'=>1,'order_id'=>$info['id'],'state'=>1));
+        if($order_process['cdate']){
+            $data['初审时间']=date('Y-m-d H:i',$order_process['cdate']);
+        }else{
+            $data['初审时间']='-';
+        }
+        
+        $order_process=Dever::db('agent/order_process')->one(array('status'=>2,'order_id'=>$info['id'],'state'=>1));
+        if($order_process['cdate']){
+            $data['终审时间']=date('Y-m-d H:i',$order_process['cdate']);
+        }else{
+            $data['终审时间']='-';
+        }
+        if($info['fdate']){
+            $data['完成时间']=date('Y-m-d H:i',$info['fdate']);
+        }else{
+            $data['完成时间']='-';
+        }
+        $html=Dever::table($data);
+        return $html;
+        // '注册时间:'.$zhuce.'<br/>初审时间:'.$chushen.'<br/>终审时间:'.$zhongshen.'<br/>完成时间:'.$wancheng;
+    }
+    public function set_price($id){
+        $info=Dever::db('agent/order')->one(array('id'=>$id,'state'=>1));
+        $data['注册金额']=$info['f_price'];
+        $data['实付金额']=$info['price'];
+        $data['代理费']=$info['agent_cash'];
+        $data['软件服务费']=$info['soft_cash'];
+        $html=Dever::table($data);
+        return $html;
+    }
 }

+ 1 - 0
service/bill/database/cash.php

@@ -103,6 +103,7 @@ return array
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
             'list'      => true,
+            'search'    => 'fulltext',
             'list_order' => 3,
         ),
 

+ 1 - 0
service/bill/database/tixian.php

@@ -78,6 +78,7 @@ return array
             # 读取另外表的关联方式
             'sync'      => array('mid', 'id'),
             'list'      => true,
+            'search'    => 'fulltext',
             'list_order' => 3,
         ),