Merge remote-tracking branch 'origin/master'

uis/views/customer/index.html

@@ -219,6 +219,8 @@
                             layer.msg('添加成功！', {icon: 1})
                         }
                         layer.close(index);
+                        //刷新表格
+                        table.reload('customer_log', {});
                         table.reload('customer_datagrid', {});
                     };
                     layui.submitChild();

uis/views/order/dispatch_process_edit.html

@@ -149,8 +149,6 @@
             admin.req({
                 url: url
                 , data: submitData
-                , contentType: false
-                , processData: false
                 , type: 'post'
                 , done: function (res) {
                     parent.layui.onSubmitChild(res);

uis/views/order/dispatch_process_index.html

@@ -156,7 +156,7 @@
                 btn1: function (index, layero) {
                     layer.close(index);//关闭当前按钮
                 },
-                content: 'detail.html'
+                content: 'detail.html?id=' + data.id
             });
             }else if(obj.event === "order_update"){
                 // 更新进度