edit

service/agent/database/member.php

@@ -1017,7 +1017,8 @@ return array
             # 匹配的正则或函数 选填项
             'option' => array
             (
-                'area' => array('yes','like'),
+                'area' => array('yes','='),
+                'role' => 'yes',
                 'state' => 1,
             ),
             // 'order' => array('id' => 'desc'),

service/mail/lib/Manage.php

@@ -631,10 +631,6 @@ class Manage
         
         $data = array();
         $data = Dever::db('shop/info')->getAreaAll(array('state'=>1));
-        // foreach($shop as $k=>$v){
-        //     $data[$v['city']]=$v;
-        // }
-        // print_R($data);die;
         foreach($data as $k => $v){
             $w['month'] = $where['start'];
             #城市
@@ -645,13 +641,13 @@ class Manage
                 $data[$k]['citys']['money'] = Dever::db('shop/buy_order')->getSerachMoney($where);
                 $data[$k]['citys']['price']= $jia * 0.01;
                 // $data[$k]['citys']['price']= round($data[$k]['citys']['money']['total']) * 0.3*0.01;
-                $mid = Dever::db('agent/member')->getAreaAll($where);
+                $mid = Dever::db('agent/member')->getAreaAll(array('area'=>$data[$k]['citys']['area'],'role'=>2));
                 $w['citys']['area'] = $v['city'];
                
                 if($mid && $mid['id']){
                     $data[$k]['citys']['mid'] = $mid['id'];
                 }else{
-                     $data[$k]['citys']['mid'] = '';
+                     $data[$k]['citys']['mid'] = '-1';
                 }
                 
                 $where['city'] = $v['city'];
@@ -700,11 +696,11 @@ class Manage
                 $jia = $this->caigou($where);
                 $data[$k]['countys']['price']= $jia *0.03;
                 // $data[$k]['countys']['price']= round($data[$k]['countys']['money']['total']) * 0.3*0.03;
-                $mid = Dever::db('agent/member')->getAreaAll($where);
+                $mid = Dever::db('agent/member')->getAreaAll(array('area'=>$data[$k]['countys']['area'],'role'=>3));
                 if($mid && $mid['id']){
                     $data[$k]['countys']['mid'] = $mid['id'];
                 }else{
-                    $data[$k]['countys']['mid'] = '';
+                    $data[$k]['countys']['mid'] = '-1';
                 }
                 $wh['county'] = $v['county'];
                 $data[$k]['countys']['num'] = Dever::db('shop/info')->getSerachNum($wh);
@@ -751,11 +747,11 @@ class Manage
                 $jia = $this->caigou($where);
                 $data[$k]['towns']['price'] = $jia * 0.05;
                 // $data[$k]['towns']['price']= round($data[$k]['towns']['money']['total']) * 0.3*0.05;
-                $mid = Dever::db('agent/member')->getAreaAll($where);
+                $mid = Dever::db('agent/member')->getAreaAll(array('area'=>$data[$k]['towns']['area'],'role'=>4));
                 if($mid && $mid['id']){
                     $data[$k]['towns']['mid'] = $mid['id'];
                 }else{
-                    $data[$k]['towns']['mid'] = '';
+                    $data[$k]['towns']['mid'] = '-1';
                 }
                 
                 $whe['town'] = $v['town'];