解决冲突

This commit is contained in:
xuexb
2017-08-31 23:09:32 +08:00
41 changed files with 452 additions and 171 deletions

View File

@@ -34,8 +34,8 @@ layui.use('layedit', function(){
var index = layedit.build('demo', {
//hideTool: ['image']
uploadImage: {
url: '/upload/test/'
,type: 'post'
url: 'json/upload/demoLayEdit.json'
,type: 'get'
}
//,tool: []
//,height: 100