Merge branch 'zjl_assign_20190812' into development

public/js/order.js

@@ -2175,6 +2175,8 @@
                                     layer.alert('网络异常');
                                 }
                             });
+
+                            layer.msg('订单对账中...', {icon: 16, time: 0, shade: 0.3});
                         },
                         btn2:function(){
                             return true;