Authored by leo

Fixed: 优化批量关联商品分类时,错误信息展示

... ... @@ -22,4 +22,8 @@
</table>
</div>
</div>
<div class="panel panel-primary-head" style="display:none;">
<div class="panel-body" id="message" style="overflow-y: scroll; height:400px;">
</div>
</div>
<%include '../../../common/views/__ui/footer'%>
\ No newline at end of file
... ...
... ... @@ -22,7 +22,7 @@
<script type="text/template" id="listTemplate">
<div class="addCategory" style="margin-bottom: 20px">
<a class="btn btn-success addBtn"><i class="fa fa-plus"></i> 新增商品分类</a>
<a href="/shop/shopCategory/batch" class="btn btn-primary large">批量(关联商品分类)</a>
<a href="/shop/shopCategory/batch" class="btn btn-primary large">批量关联类目</a>
<span style="float: right;font-size: 16px;line-height:37px;font-family:'simhei'">
当前店铺共有:<b style="color: #5cb85c;font-size: 20px">[[data.length]]</b>&nbsp;条商品分类,<font color="#f0ad4e">最多可以添加20条</font>
</span>
... ...
... ... @@ -25,7 +25,8 @@ function batchExport(el, type) {
if (response.code == 200) {
common.util.__tip(response.message, 'success');
} else {
common.util.__tip(response.message, 'warning');
$('#message').html('<pre><span class="red">' + response.message + '</span></pre>');
$('#message').parent().show();
}
$(el).parents('td').find('.file-name').text("请选择文件");
... ...
... ... @@ -31,7 +31,7 @@ var g1 = new common.grid({
{display: "商品名称", name: "productName"},
{display: "销售价(元)", name: "salePrice"},
{display: "分类", name: "productSort"},
{display: "销售类目", render: function (item) {
{display: "商品分类", render: function (item) {
var name = item.categoryName ? item.categoryName : '未分类';
var categoryList = '<span class="name" style="display: block; text-align: center">'+ name +'</span>';
if(item.saleCategory && item.saleCategory.length > 1){
... ... @@ -84,7 +84,7 @@ var g2 = new common.grid({
{display: "商品名称", name: "productName"},
{display: "销售价(元)", name: "salePrice"},
{display: "分类", name: "productSort"},
{display: "销售类目", render: function (item) {
{display: "商品分类", render: function (item) {
var name = item.categoryName ? item.categoryName : '未分类';
var categoryList = '<span class="name" style="display: block; text-align: center">'+ name +'</span>';
if(item.saleCategory && item.saleCategory.length > 1){
... ...