wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-02-06 02:39:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

【升级】升级Asp.Net 6.0.11 到 Asp.Net 7.0.0

Browse Source 
【升级】升级所有组建包，移除一些不用或者版本弃用的组建。
【优化】优化升级npoi最新版后，出现导出数据兼容性的问题。
【优化】使用新的【NLog.Database】nlog数据库链接组件,解决nlog升级到5.x以后版本记录到数据库日志失败的问题。
This commit is contained in:
大灰灰
2022-11-09 19:06:05 +08:00
parent 543bb281f4
commit 2313bf6ac9
58 changed files with 154 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
View File

@@ -12,7 +12,7 @@ layui.define(['laytpl', 'layer', 'element', 'util'], function (exports) {
, pageTabs: false //是否开启页面选项卡功能。单页版不推荐开启
, name: '核心商城系统'
, version: '0.6.4'
, version: '0.6.5'
, tableName: 'CoreCms' //本地存储表名
, MOD_NAME: 'admin' //模块事件名

60
CoreCms.Net.Web.Admin/wwwroot/views/agent/agentOrder/index.html
View File

@@ -68,12 +68,6 @@
</div>
</div>
</script>
<script type="text/html" id="LAY-app-CoreCmsAgentOrder-pagebar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>选择导出</button>
<button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
</div>
</script>
<script type="text/html" id="LAY-app-CoreCmsAgentOrder-tableBox-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
</script>
@@ -125,8 +119,6 @@
url: layui.setter.apiUrl + 'Api/CoreCmsAgentOrder/GetPageList',
method: 'POST',
toolbar: '#LAY-app-CoreCmsAgentOrder-toolbar',
pagebar: '#LAY-app-CoreCmsAgentOrder-pagebar',
className: 'pagebarbox',
defaultToolbar: ['filter', 'print', 'exports'],
height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67
page: true,
@@ -174,18 +166,6 @@
//查看详情
doDetails(obj);
});
//头工具栏事件
table.on('pagebar(LAY-app-CoreCmsAgentOrder-tableBox)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
case 'selectExportExcel':
doSelectExportExcel(checkStatus);
break;
case 'queryExportExcel':
doQueryExportexcel();
break;
};
});
//监听工具条
table.on('tool(LAY-app-CoreCmsAgentOrder-tableBox)',
function (obj) {
@@ -228,46 +208,6 @@
layer.msg(e.msg);
});
}
//执行查询条件导出excel
function doQueryExportexcel() {
layer.confirm('确定根据当前的查询条件导出数据吗？',
function (index) {
var field = searchwhere;
coreHelper.PostForm("Api/CoreCmsAgentOrder/QueryExportExcel", field, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
if (e.code === 0) {
window.open(e.data);
} else {
layer.msg(e.msg);
}
});
});
}
//执行选择目录导出数据
function doSelectExportExcel(checkStatus) {
var checkData = checkStatus.data;
if (checkData.length === 0) {
return layer.msg('请选择您要导出的数据');
}
layer.confirm('确定导出选择的内容吗？',
function (index) {
var delidsStr = [];
layui.each(checkData,
function (index, item) {
delidsStr.push(item.id);
});
layer.close(index);
coreHelper.Post("Api/CoreCmsAgentOrder/SelectExportExcel", { id: delidsStr }, function (e) {
if (debug) { console.log(e); } //开启调试返回数据
if (e.code === 0) {
window.open(e.data);
} else {
layer.msg(e.msg);
}
});
});
}
//监听 表格复选框操作
});
};

2
CoreCms.Net.Web.Admin/wwwroot/views/financial/billpayments/index.html
View File

@@ -254,7 +254,7 @@
var delidsStr = [];
layui.each(checkData,
function (index, item) {
delidsStr.push(item.id);
delidsStr.push(item.paymentId);
});
layer.close(index);
coreHelper.Post("Api/CoreCmsBillPayments/SelectExportExcel", { id: delidsStr }, function (e) {

2
CoreCms.Net.Web.Admin/wwwroot/views/index.html
View File

@@ -129,7 +129,7 @@
<td>基于框架</td>
<td>
<script type="text/html" template>
Asp.Net Core 5.1
Asp.Net 7
</script>
</td>
</tr>

4
CoreCms.Net.Web.Admin/wwwroot/views/order/billaftersales/index.html
View File

@@ -168,7 +168,8 @@
});
//头工具栏事件
table.on('pagebar(LAY-app-CoreCmsBillAftersales-tableBox)', function (obj) {
var checkStatus = table.checkStatus(obj.config.aftersalesId);
console.log(obj);
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
case 'selectExportExcel':
doSelectExportExcel(checkStatus);
@@ -308,6 +309,7 @@
}
//执行选择目录导出数据
function doSelectExportExcel(checkStatus) {
console.log(checkStatus);
var checkData = checkStatus.data;
if (checkData.length === 0) {
return layer.msg('请选择您要导出的数据');

4
CoreCms.Net.Web.Admin/wwwroot/views/order/billreship/index.html
View File

@@ -168,7 +168,7 @@
});
//头工具栏事件
table.on('pagebar(LAY-app-CoreCmsBillReship-tableBox)', function (obj) {
var checkStatus = table.checkStatus(obj.config.reshipId);
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
case 'selectExportExcel':
doSelectExportExcel(checkStatus);
@@ -262,7 +262,7 @@
var delidsStr = [];
layui.each(checkData,
function (index, item) {
delidsStr.push(item.id);
delidsStr.push(item.reshipId);
});
layer.close(index);
coreHelper.Post("Api/CoreCmsBillReship/SelectExportExcel", { id: delidsStr }, function (e) {

7
CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html
View File

@@ -57,12 +57,6 @@
</script>
<script type="text/html" id="LAY-app-CoreCmsUserWeChatInfo-pagebar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" lay-event="selectExportExcel"><i class="layui-icon layui-icon-add-circle"></i>选择导出</button>
<button class="layui-btn layui-btn-sm" lay-event="queryExportExcel"><i class="layui-icon layui-icon-download-circle"></i>查询导出</button>
</div>
</script>
<script type="text/html" id="LAY-app-CoreCmsUserWeChatInfo-tableBox-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
</script>
@@ -109,7 +103,6 @@
url: layui.setter.apiUrl + 'Api/CoreCmsUserWeChatInfo/GetPageList',
method: 'POST',
toolbar: '#LAY-app-CoreCmsUserWeChatInfo-toolbar',
pagebar: '#LAY-app-CoreCmsUserWeChatInfo-pagebar',
css: [
'.layui-table-page{text-align: right;}'
,'.layui-table-pagebar{float: left;}'