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

service/agent/lib/Dhorder.php

@@ -1337,8 +1337,8 @@ class Dhorder
         return $res;
     }
     public function out_equity_api($data){
-        $start = Dever::input('search_option_start_rdate');
-        $end = Dever::input('search_option_end_rdate');
+        $start = Dever::input('search_option_start_udate');
+        $end = Dever::input('search_option_end_udate');
         if($start && $end){
             $where['start'] = $start;
             $where['end'] = $end;
@@ -1353,7 +1353,7 @@ class Dhorder
         $body = array();
         $pg = Dever::input('pg');
         if ($pg == 1) {
-            $body[] = array('代理商姓名', '角色', '电话', '区域','应收合计', '月份', '代理费', '产品费（商品）', '产品费（电器卡）','产品费（菜卡）');
+            $body[] = array('代理商姓名', '角色', '电话', '区域','应收合计', '代理费', '产品费（商品）', '产品费（电器卡）','产品费（菜卡）');
         }
         
         $i = 0;
@@ -1423,7 +1423,7 @@ class Dhorder
                 $member['mobile'],
                 $area,
                 $order['agent_cash'],
-                $month,
+                // $month,
                 0,
                 0,
                 0,
@@ -1467,10 +1467,10 @@ class Dhorder
                 $i++;
             }
             // $heji = $order['agent_cash'] + $product_cash + $dianqi_cash + $caipin_cash;
-            $d[6] = $order['agent_cash'] - $product_cash - $dianqi_cash - $caipin_cash;
-            $d[7] = $product_cash;
-            $d[8] = $dianqi_cash;
-            $d[9] = $caipin_cash;
+            $d[5] = $order['agent_cash'] - $product_cash - $dianqi_cash - $caipin_cash;
+            $d[6] = $product_cash;
+            $d[7] = $dianqi_cash;
+            $d[8] = $caipin_cash;
 
             foreach ($res[1] as $k1 => $v1) {
                 $d[$i] = 0;