Merge branch 'zjl_hide_sendbtn_0301' into 'master'

调整订单金额统计

See merge request !14

app/Http/Controllers/OrderController.php

@@ -260,7 +260,7 @@ Class OrderController extends Controller
         $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
         $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
         $data['p']   = $request->input('p', 1); // 当前页码
         $data['p']   = $request->input('p', 1); // 当前页码
         $data['map'] = $map;
         $data['map'] = $map;
-// dd(curlApi($url, $data));
+
         $response = json_decode(curlApi($url, $data), true); 
         $response = json_decode(curlApi($url, $data), true); 
 
 
         // 分页
         // 分页
@@ -271,7 +271,7 @@ Class OrderController extends Controller
         $info['condition'] = $map; 
         $info['condition'] = $map; 
         $info['sale_list'] = $sale_list; 
         $info['sale_list'] = $sale_list; 
         $info['list']      = $response['data']['data']; 
         $info['list']      = $response['data']['data']; 
-        // $info['pay_count'] = $response['data']['pay_count']; 
+        $info['pay_count'] = $response['data']['pay_count']; 
         $info['count']     = $response['data']['count']; 
         $info['count']     = $response['data']['count']; 
         $info['page']      = $show; 
         $info['page']      = $show; 
 
 
@@ -297,7 +297,6 @@ Class OrderController extends Controller
         }
         }
 
 
         /* 查看ERP订单 */
         /* 查看ERP订单 */
-        // $map['online_order'] = 2;
         $map['offline_order'] = [2, 3]; // 2-ERP, 3-JD
         $map['offline_order'] = [2, 3]; // 2-ERP, 3-JD
 
 
         // 获取所有的业务员 （包括经理和交易员）
         // 获取所有的业务员 （包括经理和交易员）
@@ -314,7 +313,7 @@ Class OrderController extends Controller
         $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
         $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
         $data['p']   = $request->input('p', 1); // 当前页码
         $data['p']   = $request->input('p', 1); // 当前页码
         $data['map'] = $map;
         $data['map'] = $map;
-// dd(curlApi($url, $data));
+
         $response = json_decode(curlApi($url, $data), true); 
         $response = json_decode(curlApi($url, $data), true); 
 
 
         // 分页
         // 分页
@@ -325,7 +324,7 @@ Class OrderController extends Controller
         $info['condition'] = $map; 
         $info['condition'] = $map; 
         $info['sale_list'] = $sale_list; 
         $info['sale_list'] = $sale_list; 
         $info['list']      = $response['data']['data']; 
         $info['list']      = $response['data']['data']; 
-        // $info['pay_count'] = $response['data']['pay_count']; 
+        $info['pay_count'] = $response['data']['pay_count']; 
         $info['count']     = $response['data']['count']; 
         $info['count']     = $response['data']['count']; 
         $info['page']      = $show; 
         $info['page']      = $show; 
 
 

app/Http/Controllers/OrderCountController.php

@@ -154,9 +154,7 @@ Class OrderCountController extends Controller
         $data['p'] = isset($_REQUEST['p']) ? $_REQUEST['p'] : 1; // 当前页码
         $data['p'] = isset($_REQUEST['p']) ? $_REQUEST['p'] : 1; // 当前页码
         $data['map'] = $map;
         $data['map'] = $map;
 
 
-        $request = curlApi($url, $data);
-
-        $response = json_decode($request, true); // 调用接口
+        $response = json_decode(curlApi($url, $data), true); // 调用接口
   
   
         // API返回
         // API返回
         if ($response['err_code'] == 0) {
         if ($response['err_code'] == 0) {

resources/views/erpOrder/content.blade.php

@@ -253,7 +253,10 @@
         </div>
         </div>
         <div class="row-fluid pagination">
         <div class="row-fluid pagination">
             <span>
             <span>
-	            共{{$count ? $count : 0}}单 
+                共{{$count ? $count : 0}}单，
+                应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}，   ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 
+                实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
+                ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
             </span>
             </span>
 
 
             <?php echo $page; ?>
             <?php echo $page; ?>

resources/views/orderlist/content.blade.php

@@ -320,7 +320,10 @@
         </div>
         </div>
         <div class="row-fluid pagination">
         <div class="row-fluid pagination">
             <span>
             <span>
-	            共{{$count ? $count : 0}}单   
+                共{{$count ? $count : 0}}单，
+                应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}，   ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 
+                实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
+                ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
             </span>
             </span>
 
 
             <?php echo $page; ?>
             <?php echo $page; ?>