diff --git a/public/static/admin/js/mall/goods.js b/public/static/admin/js/mall/goods.js index 1a689fcf..ff0270ec 100644 --- a/public/static/admin/js/mall/goods.js +++ b/public/static/admin/js/mall/goods.js @@ -27,14 +27,14 @@ define(["jquery", "easy-admin"], function ($, ea) { icon: 'fa fa-plus ', extend: 'data-full="true"', }], - 'delete', 'export'], + 'delete'], cols: [[ {type: "checkbox"}, {field: 'id', width: 80, title: 'ID'}, {field: 'sort', width: 80, title: '排序', edit: 'text'}, - {field: 'cate.title', minWidth: 80, title: '商品分类'}, + {field: 'cate.title', minWidth: 80, title: '商品分类',search: 'select',selectList: '/'+CONFIG.ADMIN+'/mall.cate/index|title,title'}, {field: 'title', minWidth: 80, title: '商品名称'}, - {field: 'logo', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image}, + {field: 'cate.image', minWidth: 80, title: '分类图片', search: false, templet: ea.table.image}, {field: 'market_price', width: 100, title: '市场价', templet: ea.table.price}, {field: 'discount_price', width: 100, title: '折扣价', templet: ea.table.price}, {field: 'total_stock', width: 100, title: '库存统计'}, diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js index bc4a572b..280585a3 100644 --- a/public/static/plugs/easy-admin/easy-admin.js +++ b/public/static/plugs/easy-admin/easy-admin.js @@ -297,17 +297,28 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine case 'select': d.searchOp = '='; var selectHtml = ''; - $.each(d.selectList, function (sI, sV) { - var selected = ''; - if (sI === d.searchValue) { - selected = 'selected=""'; + var data_select = ''; + var data_fields = ''; + if(typeof d.selectList === 'string'){ + var url = d.selectList.split('|'); + if(url.length === 2){ + data_select=url[0]; + data_fields=url[1]; } - selectHtml += '/n'; - }); + }else{ + $.each(d.selectList, function (sI, sV) { + var selected = ''; + if (sI === d.searchValue) { + selected = 'selected=""'; + } + selectHtml += '/n'; + }); + } + formHtml += '\t
\n' + '\n' + '
\n' + - '\n' + ' \n' + selectHtml + '\n' + @@ -1190,7 +1201,9 @@ define(["jquery", "tableSelect", "ckeditor"], function ($, tableSelect, undefine if (typeof preposeCallback === 'function') { dataField = preposeCallback(dataField); } - admin.api.form(url, dataField, ok, no, ex, refresh); + if(dataField!==false){ + admin.api.form(url, dataField, ok, no, ex, refresh); + } return false; });