diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index 8b6496bf..3d85d499 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -128,19 +128,19 @@ namespace CoreCms.Net.Repository goods.commentsCount = 0; goods.buyCount = 0; goods.viewCount = 0; + goods.goodsParamsIds = entity.goods.goodsParamsIds; + goods.parameters = entity.goods.parameters; if (goods.openSpec == 1) { goods.newSpec = entity.goods.newSpec; goods.spesDesc = entity.goods.spesDesc; - goods.parameters = entity.goods.parameters; goods.goodsTypeId = entity.goods.goodsTypeId; } else { goods.newSpec = ""; goods.spesDesc = ""; - goods.parameters = ""; goods.goodsTypeId = 0; } @@ -408,28 +408,28 @@ namespace CoreCms.Net.Repository oldModel.sort = model.sort; //oldModel.labelIds = model.labelIds; //oldModel.createTime = model.createTime; + + oldModel.goodsParamsIds = model.goodsParamsIds; + oldModel.parameters = model.parameters; + oldModel.openSpec = model.openSpec; if (oldModel.openSpec == 1) { oldModel.newSpec = model.newSpec; oldModel.spesDesc = model.spesDesc; - oldModel.parameters = model.parameters; oldModel.goodsTypeId = model.goodsTypeId; oldModel.goodsSkuIds = model.goodsSkuIds; - oldModel.goodsParamsIds = model.goodsParamsIds; - oldModel.parameters = model.parameters; + } else { oldModel.newSpec = ""; oldModel.spesDesc = ""; - oldModel.parameters = ""; oldModel.goodsTypeId = 0; oldModel.goodsSkuIds = ""; - oldModel.goodsParamsIds = ""; } diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html index 64e59632..6ba72bf1 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html @@ -222,7 +222,7 @@
-
+
@@ -674,6 +674,7 @@ height: '250px', data: d.data.paramsList, //model: { label: { type: 'text' } }, + filterable: true, name: 'goodsParamsIds', prop: { name: 'name', diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html index 7da56a07..05cf8606 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html @@ -213,7 +213,7 @@
-
+
@@ -407,16 +407,16 @@ {{# if(item.type && item.type==='radio'){ }} {{# layui.each(layui.coreHelper.stringToArray(item.value), function(indexRadio, itemRadio){ }} - + {{# }); }} {{# } else if (item.type && item.type==='checkbox'){ }} {{# layui.each(layui.coreHelper.stringToArray(item.value), function(indexCheckbox, itemCheckbox){ }} - + {{# }); }} {{# } else if (item.type && item.type==='text'){ }} - + {{# } else { }} {{# } }}
@@ -743,6 +743,7 @@ height: '250px', data: d.data.paramsList, //model: { label: { type: 'text' } }, + filterable: true, name: 'goodsParamsIds', prop: { name: 'name',