diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html
index b5f81329..1ae85617 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html
@@ -68,15 +68,14 @@
customName: {
id: 'id',
pid: 'parentId',
- name: 'name',
- // isParent:'isParent'
+ name: 'title',
},
view: {
showIcon: false,
indent: 25
},
data: {
- isSimpleData: true,
+ //isSimpleData: true,
},
callback: {}
},
@@ -85,17 +84,17 @@
cols: [
[
{ field: 'id', title: '序列', width: 60, sort: false },
- { field: 'name', title: '名称', sort: false },
+ { field: 'title', title: '名称', sort: false },
{
field: 'sort', title: '排序', sort: false, width: 105, templet: function (d) {
- return d.sort;
+ return d.otherData.sort
}
},
{
field: 'imageUrl', title: '图片', width: 80, sort: false,
templet: function (d) {
- if (d.imageUrl) {
- return '
';
+ if (d.otherData.imageUrl) {
+ return '
';
} else {
return '
';
}
@@ -106,10 +105,7 @@
]
],
done: function (res, curr, count) {
- treeTable.expandAll('treeTableBox', true); // 打开全部节点
- //console.log(res); // 得到当前渲染的数据
- //console.log(curr); // 得到当前页码
- //console.log(count); // 得到数据总量
+ treeTable.expandAll('treeTableBox', true);
},
page: false
});
@@ -243,5 +239,5 @@
\ No newline at end of file
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html
index db531b61..668d8618 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html
@@ -84,7 +84,6 @@
id: 'id',
pid: 'parentId',
name: 'menuName',
- //isParent: 'isParent'
},
view: {
showIcon: false,
@@ -125,8 +124,12 @@
//{field: 'createTime', title: '创建时间'},
{title: '操作', toolbar: '#LAY-app-SysMenu-tableBox-bar', align: 'center', width: 180}
]],
- page: false
-
+ initSort: {
+ field: 'sortNumber',
+ type: 'asc'
+ },
+ //autoSort: false,
+ page: false
});
//重载form
form.render();
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
index 1927aabb..ab448627 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
@@ -272,7 +272,7 @@
优惠券接口
-
+
构造函数
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
index bd56011b..82dd30ac 100644
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@@ -18,7 +18,7 @@
"AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
"AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
"AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
- "AppVersion": "CoreShopProfessional v0.6.9"
+ "AppVersion": "CoreShopProfessional v0.7.0"
},
//redis为必须启动项,请保持redis为正常可用
"RedisConfig": {