Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/order.php

@@ -139,7 +139,7 @@ if($search_auth == 1){
         $excel[] = array('软件服务费数据导出','软件服务费数据导出', 'agent/lib/order.out_softorder');
     }
 }
-
+$search_pmid = Dever::input('search_in_parent_mid');
 
 $invite_type = array
 (
@@ -192,7 +192,7 @@ return array
             'desc'      => '代理商',
             'match'     => 'is_string',
             'update'    => 'text',
-            'search'    => array
+            'search'    => $search_pmid ? false : array
             (
                 'api' => 'agent/member-getSearch',
                 'col' => 'col',
@@ -276,7 +276,7 @@ return array
             'desc'      => '邀请人',
             'match'     => 'is_string',
             //'update'    => 'text',
-            'search'    => array
+            'search'    => $search_pmid ? false : array
             (
                 'api' => 'agent/member-getSearch',
                 'col' => 'col',

service/agent/lib/Member.php

@@ -703,7 +703,7 @@ class Member
         $temp = array();
         $sell = 0;
         $max = count($info);
-        if ($max > 1) {
+        if ($max > 0) {
             foreach ($info as $key => $val) {
                 $temp[] = $val['total']; // 用一个空数组来承接字段
                 $sell += $val['total'];
@@ -720,7 +720,6 @@ class Member
             }
             $total = sprintf ('%01.2f',$total);
         }
-        
         return $total;
     }
     #新增正常业绩