edit

service/agent/database/member.php

@@ -94,6 +94,7 @@ if ($search_api_parent_mid && $getInfo != 1) {
     $button = array
     (
         '返回上一页' => array('location', 'l=project/database/list&project=agent&table=member_area&page_type=1&mid=' . $parent_mid),
+        //'返回上一页' => array('onclick', 'history.back()'),
     );
 }
 
@@ -112,6 +113,11 @@ if ($pmid) {
     );
 }
 
+$list_button = array
+(
+    'list' => array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"'),
+);
+
 # id小于50000为导入的数据
 return array
 (
@@ -280,12 +286,12 @@ return array
         'code'        => array
         (
             'type'      => 'varchar-50',
-            'name'      => '代理商邀请码',
+            'name'      => '邀请码',
             'default'   => '',
             'desc'      => '代理商邀请码',
             'match'     => 'option',
             //'update'    => 'text',
-            'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("invite/api.code", {id})',
+            //'list'      => ($parent_mid || $pmid) ? false : 'Dever::load("invite/api.code", {id})',
             'list_order'=>1,
         ),
 

service/agent/lib/Import.php

@@ -73,7 +73,7 @@ class Import
         $index = $index - 1;
         $limit = 1000;
         
-        $data = $this->db->fetchAll('select * from ims_ewei_shop_member where '.$this->get_yes_where().' order by id asc limit ' . $index . ', ' . $limit);
+        $data = $this->db->fetchAll('select * from ims_ewei_shop_member where isagent = 1 order by id asc limit ' . $index . ', ' . $limit);
 
         if (!$data) {
             return false;
@@ -217,18 +217,28 @@ class Import
                     } else {
                         $data['status'] = 1;
                     }
-                    $mc_member = $this->db->fetch('select * from ims_mc_members where uid = ' . $v['uid']);
-                    $data['rdate'] = $v['agenttime'];
-                    $data['cash'] = ($mc_member && $mc_member['credit2']) ? $mc_member['credit2'] : $v['credit2'];
-                    $data['group_sell'] = $v['allcommission'];
-
-                    Dever::load('invite/api')->setRelation($data['mid'], $data['parent_mid']);
-                    if (!$member) {
-                        Dever::db('agent/member')->insert($data);
-                    } else {
-                        $data['where_id'] = $member['id'];
-                        Dever::db('agent/member')->update($data);
+
+                    if ($data['status'] == 2) {
+                        $mc_member = $this->db->fetch('select * from ims_mc_members where uid = ' . $v['uid']);
+                        $data['rdate'] = $v['agenttime'];
+                        $data['cash'] = ($mc_member && $mc_member['credit2']) ? $mc_member['credit2'] : $v['credit2'];
+                        $data['group_sell'] = $v['allcommission'];
+
+                        if (!$member) {
+                            Dever::db('agent/member')->insert($data);
+                        } else {
+                            $data['where_id'] = $member['id'];
+                            Dever::db('agent/member')->update($data);
+                        }
+
+                        if ($data['parent_mid']) {
+                            Dever::load('invite/api')->setRelation($data['mid'], $data['parent_mid']);
+                            # 为上级增加增加业绩
+                            Dever::load('bill/lib/sell')->up($data['parent_mid'], 1, $data['f_price'], $data['role'], $order_id, '直推业绩', 1, $data['cdate']);
+                            Dever::load('bill/lib/sell')->up($data['parent_mid'], 2, $data['f_price'], $data['role'], $order_id, '团队业绩', 1, $data['cdate']);
+                        }
                     }
+                    
                     echo 1;
                     echo "\r\n";
                 }

service/agent/lib/Member.php

@@ -14,11 +14,17 @@ class Member
         $member = Dever::db($table)->find($id);
         if ($member) {
             $member['role'] = Dever::db('setting/role')->find($member['role']);
+            $url = Dever::url('project/database/list?project=agent&table=member&search_option_pmid=-1&search_option_parent_mid='.$member['id'].'&' . Dever::refer('manage'), 'manage');
+            $member['name'] = '<a href="'.$url.'">' . $member['name'] . '</a>';
             $string = $member['name'] . '<br />' . $member['mobile'] . '<br />' . $member['role']['name'];
             if (isset($member['level_id']) && $member['level_id'] && $member['level_id'] > 0) {
                 $member['level'] = Dever::db('setting/level')->find($member['level_id']);
                 $string .= '（'.$member['level']['name'].'）';
             }
+            $code = Dever::load("invite/api.code", $member['id']);
+            if ($code) {
+                $string .= '<br />[' . $code . ']';
+            }
             return $string;
             
         } else {
@@ -367,16 +373,10 @@ class Member
                 'name' => '设置直推上级',
             );
         }
-        
-        $url = Dever::url('project/database/list?project=agent&table=member', 'manage');
-        $search_type = Dever::input('search_type');
-        if ($search_type) {
-            $url .= '&search_option_pmid=-1';
-        }
         $head_btn[] = array
         (
             'type' => 'link',
-            'link' => $url,
+            'link' => 'refer',
             'name' => '返回上一页',
         );
         $head = array
@@ -507,15 +507,15 @@ class Member
         }
         if($info['status']==2){
             if($info['rdate']){
-                $data['认证完成时间']=date('Y-m-d H:i',$info['rdate']);
+                $data['认证时间']=date('Y-m-d H:i',$info['rdate']);
             }else{
-                $data['认证完成时间']='-';
+                $data['认证时间']='-';
             }
         }else{
-            $data['认证完成时间']='-';
+            $data['认证时间']='-';
         }
         // $html = Dever::table($data);
-        return '注册时间：'.$data['注册时间'].'<br/>认证完成时间：'.$data['认证完成时间'];
+        return '注册时间：'.$data['注册时间'].'<br/>认证时间：'.$data['认证时间'];
     
     }
     #更改收件人信息

service/agent/src/My.php

@@ -694,6 +694,7 @@ class My extends Core
         if ($cash > $this->user['cash']) {
             Dever::alert('您的可提现金额不足');
         }
+        /*
         $name = Dever::input('name');
         if (!$name) {
             Dever::alert('姓名不能为空');
@@ -717,6 +718,7 @@ class My extends Core
         if ($card != $ycard) {
             Dever::alert('银行卡号和确认银行卡号不同');
         }
+        */
         $sign = Dever::input('sign');
         if(!$sign){
             //Dever::alert('手写签名不能为空');
@@ -727,7 +729,7 @@ class My extends Core
         $ycash = $cash;
         $cash = $cash - $cash*$tax;
 
-        $id = Dever::load('bill/lib/tixian')->up($this->uid, $ycash, $cash, $name, $bank, $bankname, $card,$sign);
+        $id = Dever::load('bill/lib/tixian')->up($this->uid, $ycash, $cash,$sign);
 
         if ($id) {
             $cash_id = Dever::load('bill/lib/cash')->up($this->uid, 11, $ycash, $this->user['role'], $id, '提现到'.substr($card, -4).'银行卡', 1);

service/bill/database/tixian.php

@@ -150,46 +150,6 @@ return array
             'list_order' => 8,
         ),
 
-        'name'      => array
-        (
-            'type'      => 'varchar-100',
-            'name'      => '姓名',
-            'default'   => '',
-            'desc'      => '姓名',
-            'match'     => 'is_string',
-            'update'    => 'text',
-        ),
-
-        'bank'      => array
-        (
-            'type'      => 'int-11',
-            'name'      => '银行',
-            'default'   => '',
-            'desc'      => '银行',
-            'match'     => 'is_numeric',
-            'update'    => 'text',
-        ),
-
-        'bankname'      => array
-        (
-            'type'      => 'varchar-100',
-            'name'      => '开户行',
-            'default'   => '',
-            'desc'      => '开户行',
-            'match'     => 'is_string',
-            'update'    => 'text',
-        ),
-
-        'card'      => array
-        (
-            'type'      => 'varchar-200',
-            'name'      => '卡号',
-            'default'   => '',
-            'desc'      => '卡号',
-            'match'     => 'is_string',
-            'update'    => 'text',
-        ),
-
         'cash_id'      => array
         (
             'type'      => 'int-11',

service/bill/lib/Sell.php

@@ -37,7 +37,7 @@ class Sell
     }
 
     # 更新数据
-    public function up($mid, $type, $num, $role, $type_id, $desc, $stype = 1)
+    public function up($mid, $type, $num, $role, $type_id, $desc, $stype = 1, $cdate = false)
     {
         if ($num == 0) {
             return;
@@ -54,6 +54,9 @@ class Sell
             $info = Dever::db('bill/sell')->find($where);
             if (!$info) {
                 $data = $where;
+                if ($cdate) {
+                    $data['cdate'] = $cdate;
+                }
                 $data['order_num'] = $this->getOrderId();
                 $data['num'] = $num;
                 $data['role'] = $role;

service/bill/lib/Tixian.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Tixian
 {
-    public function up($mid, $ycash, $cash, $name, $bank, $bankname, $card,$sign)
+    public function up($mid, $ycash, $cash,$sign)
     {
         $member = Dever::db('agent/member')->find(array('id' => $mid, 'clear' => true));
         if ($member['status'] <= 2) {
@@ -17,10 +17,6 @@ class Tixian
     		$data['yue'] = $member['cash'] + $ycash;
     		$data['ycash'] = $ycash;
     		$data['cash'] = $cash;
-    		$data['name'] = $name;
-    		$data['bank'] = $bank;
-    		$data['bankname'] = $bankname;
-    		$data['card'] = $card;
             $data['sign'] = $sign;
             $data['status'] = -1;
     		return Dever::db('bill/tixian')->insert($data);