Merge branch 'zjl_iteration_20181127' into development

app/Http/Controllers/OrderController.php

@@ -358,8 +358,8 @@ Class OrderController extends Controller
         $info = $this->getOrderInfo($request, 1);
         $info['title'] = '平台订单';
 
-        // 若为京东自营、自营客服角色，则跳转到自营列表
-        if (in_array($info['role'], [6, 7])) {
+        // 若为京东自营、自营客服、财务角色，则跳转到自营列表
+        if (in_array($info['role'], [6, 7, 9])) {
             return redirect('self_order');
         }
 

public/js/order.js

@@ -1678,7 +1678,7 @@
 
                         content += '<div>';
 
-                        if (trans_amount == order_amount) {
+                        if (parseFloat(trans_amount) == parseFloat(order_amount)) {
                             content += '<p><i class="fa fa-check-circle" style="color:green;"></i> 应付金额和对账金额一致</p>'; 
                         } else {
                             content += '<p><i class="fa fa-warning error"></i> 应付金额和对账金额不一致，请谨慎核对！</p>';