wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 20:33:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复升级最新版layuiadmin后存在的一些兼容性问题。

Browse Source
This commit is contained in:
大灰灰
2022-12-20 03:13:12 +08:00
parent 2910501266
commit 1c1707784d
11 changed files with 341 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CoreCms.Net.Web.Admin/Doc.xml
View File

@@ -1840,7 +1840,7 @@
商品表
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsGoodsController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsBrandServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsGoodsParamsServices,CoreCms.Net.IServices.ICoreCmsGoodsTypeSpecValueServices,CoreCms.Net.IServices.ICoreCmsGoodsGradeServices,CoreCms.Net.IServices.ICoreCmsProductsServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryExtendServices,CoreCms.Net.IServices.ICoreCmsLabelServices,CoreCms.Net.IServices.ICoreCmsProductsDistributionServices,CoreCms.Net.IServices.ICoreCmsGoodsTypeSpecServices)">
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsGoodsController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsGoodsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsBrandServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsGoodsParamsServices,CoreCms.Net.IServices.ICoreCmsGoodsTypeSpecValueServices,CoreCms.Net.IServices.ICoreCmsGoodsGradeServices,CoreCms.Net.IServices.ICoreCmsProductsServices,CoreCms.Net.IServices.ICoreCmsGoodsCategoryExtendServices,CoreCms.Net.IServices.ICoreCmsLabelServices,CoreCms.Net.IServices.ICoreCmsProductsDistributionServices,CoreCms.Net.IServices.ICoreCmsGoodsTypeSpecServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository)">
<summary>
构造函数
</summary>
@@ -2638,6 +2638,13 @@
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.GetPrintCloud(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
重打小票
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.GetPrintTpl(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
订单打印

2
CoreCms.Net.Web.Admin/NLog.config
View File

@@ -14,7 +14,7 @@
dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient"
connectionString="Server=127.0.0.1;Database=BaseMIS;User ID=sa;Password=123456"
-->
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=127.0.0.1;uid=CoreShopProfessional;pwd=CoreShopProfessional;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
<target name="log_database" xsi:type="Database" dbProvider="Microsoft.Data.SqlClient.SqlConnection, Microsoft.Data.SqlClient" connectionString="Server=120.25.243.235;uid=Cshop;pwd=XN6EcWzCFTtqWVk;Database=CoreShop.Nsts;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;">
<commandText>
INSERT INTO SysNLogRecords
(LogDate,LogLevel,LogType,LogTitle,Logger,Message,MachineName,MachineIp,NetRequestMethod

4
CoreCms.Net.Web.Admin/appsettings.json
View File

@@ -1,7 +1,7 @@
{
"ConnectionStrings": {
"DbType": "SqlServer", //数据库将支持两种模式【SqlServer,MySql】
"SqlConnection": "Server=127.0.0.1;uid=CoreShopProfessional;pwd=CoreShopProfessional;Database=CoreShopProfessional;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;"
"SqlConnection": "Server=120.25.243.235;uid=Cshop;pwd=XN6EcWzCFTtqWVk;Database=CoreShop.Nsts;MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;"
//SqlServer数据库连接字符串，需要开启数据库连接复用【MultipleActiveResultSets=true】
// 如果采用容器化部署Service 要写成mysql的服务名，否则写地址
@@ -23,7 +23,7 @@
"UseCache": true, //启用redis作为内存选择
"UseTimedTask": true, //启用redis作为定时任务
// 如果采用容器化部署Service 要写成redis的服务名，否则写地址
"ConnectionString": "127.0.0.1:6379,password=coreshop,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
"ConnectionString": "corecmsdemo.redis.rds.aliyuncs.com:6379,password=1q1q1q!@#,connectTimeout=30000,responseTimeout=30000,abortConnect=false,connectRetry=1,syncTimeout=10000,DefaultDatabase=9"
},
//jwt授权认证的一些设置
"JwtConfig": {

39
CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/extend/echarts.js Normal file
View File

File diff suppressed because one or more lines are too long

267
CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/extend/echartsTheme.js Normal file
View File

@@ -0,0 +1,267 @@
/**
@Name：echarts 主题
@License：GPL-2
*/
layui.define(function(exports) {
exports('echartsTheme', {
// 默认色板
color: [
'#009688','#1E9FFF','#5FB878','#FFB980','#D87A80',
'#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
'#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
'#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
],
// 图表标题
title: {
textStyle: {
fontWeight: 'normal',
color: '#666' // 主标题文字颜色
}
},
// 值域
dataRange: {
itemWidth: 15,
color: ['#009688','#e0ffff']
},
// 工具箱
toolbox: {
color : ['#1e90ff', '#1e90ff', '#1e90ff', '#1e90ff'],
effectiveColor : '#ff4500'
},
// 提示框
tooltip: {
backgroundColor: 'rgba(50,50,50,0.5)', // 提示背景颜色，默认为透明度为0.7的黑色
axisPointer : { // 坐标轴指示器，坐标轴触发有效
type : 'line', // 默认为直线，可选为：'line' | 'shadow'
lineStyle : { // 直线指示器样式设置
color: '#009688'
},
crossStyle: {
color: '#008acd'
},
shadowStyle : { // 阴影指示器样式设置
color: 'rgba(200,200,200,0.2)'
}
}
},
// 区域缩放控制器
dataZoom: {
dataBackgroundColor: '#efefff', // 数据背景颜色
fillerColor: 'rgba(182,162,222,0.2)', // 填充颜色
handleColor: '#008acd' // 手柄颜色
},
// 网格
grid: {
borderColor: '#eee'
},
// 类目轴 - X轴
categoryAxis: {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: '#009688'
}
},
axisTick: { //小标记
show: false
},
splitLine: { // 分隔线
lineStyle: { // 属性lineStyle（详见lineStyle）控制线条样式
color: ['#eee']
}
}
},
// 数值型坐标轴默认参数 - Y轴
valueAxis: {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: '#009688'
}
},
splitArea : {
show : true,
areaStyle : {
color: ['rgba(250,250,250,0.1)','rgba(200,200,200,0.1)']
}
},
splitLine: { // 分隔线
lineStyle: { // 属性lineStyle（详见lineStyle）控制线条样式
color: ['#eee']
}
}
},
polar : {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: '#ddd'
}
},
splitArea : {
show : true,
areaStyle : {
color: ['rgba(250,250,250,0.2)','rgba(200,200,200,0.2)']
}
},
splitLine : {
lineStyle : {
color : '#ddd'
}
}
},
timeline : {
lineStyle : {
color : '#009688'
},
controlStyle : {
normal : { color : '#009688'},
emphasis : { color : '#009688'}
},
symbol : 'emptyCircle',
symbolSize : 3
},
// 柱形图默认参数
bar: {
itemStyle: {
normal: {
barBorderRadius: 2
},
emphasis: {
barBorderRadius: 2
}
}
},
// 折线图默认参数
line: {
smooth : true,
symbol: 'emptyCircle', // 拐点图形类型
symbolSize: 3 // 拐点图形大小
},
// K线图默认参数
k: {
itemStyle: {
normal: {
color: '#d87a80', // 阳线填充颜色
color0: '#2ec7c9', // 阴线填充颜色
lineStyle: {
color: '#d87a80', // 阳线边框颜色
color0: '#2ec7c9' // 阴线边框颜色
}
}
}
},
// 散点图默认参数
scatter: {
symbol: 'circle', // 图形类型
symbolSize: 4 // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
},
// 雷达图默认参数
radar : {
symbol: 'emptyCircle', // 图形类型
symbolSize:3
//symbol: null, // 拐点图形类型
//symbolRotate : null, // 图形旋转控制
},
map: {
itemStyle: {
normal: {
areaStyle: {
color: '#ddd'
},
label: {
textStyle: {
color: '#d87a80'
}
}
},
emphasis: { // 也是选中样式
areaStyle: {
color: '#fe994e'
}
}
}
},
force : {
itemStyle: {
normal: {
linkStyle : {
color : '#1e90ff'
}
}
}
},
chord : {
itemStyle : {
normal : {
borderWidth: 1,
borderColor: 'rgba(128, 128, 128, 0.5)',
chordStyle : {
lineStyle : {
color : 'rgba(128, 128, 128, 0.5)'
}
}
},
emphasis : {
borderWidth: 1,
borderColor: 'rgba(128, 128, 128, 0.5)',
chordStyle : {
lineStyle : {
color : 'rgba(128, 128, 128, 0.5)'
}
}
}
}
},
gauge : {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: [[0.2, '#2ec7c9'],[0.8, '#5ab1ef'],[1, '#d87a80']],
width: 10
}
},
axisTick: { // 坐标轴小标记
splitNumber: 10, // 每份split细分多少段
length :15, // 属性length控制线长
lineStyle: { // 属性lineStyle控制线条样式
color: 'auto'
}
},
splitLine: { // 分隔线
length :22, // 属性length控制线长
lineStyle: { // 属性lineStyle（详见lineStyle）控制线条样式
color: 'auto'
}
},
pointer : {
width : 5
}
},
textStyle: {
fontFamily: '微软雅黑, Arial, Verdana, sans-serif'
}
});
});

4
CoreCms.Net.Web.Admin/wwwroot/views/content/notice/index.html
View File

@@ -60,7 +60,7 @@
, coreHelper = layui.coreHelper
, util = layui.util
, view = layui.view;
var searchwhere;
//监听搜索
form.on('submit(LAY-app-CoreCmsNotice-search)',
@@ -88,7 +88,7 @@
[
{ field: 'id', title: '序列', width: 60, sort: false },
{ field: 'title', title: '公告标题', sort: false },
{ field: 'contentBody', title: '公告内容', sort: false },
{ field: 'contentBody', title: '公告内容', sort: false, templet: function (data) { return data.contentBody } },
{ field: 'sort', title: '排序', sort: false, width: 105 },
{ field: 'createTime', title: '创建时间', width: 130, sort: false },
{ width: 122, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsNotice-tableBox-bar' }

3
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
View File

@@ -505,7 +505,7 @@
layui.data.done = function (d) {
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -516,7 +516,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

5
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
View File

@@ -168,7 +168,7 @@
<div class="layui-tab-item">
<div class="layui-form-item layui-form-text">
<div class="layui-input-block">
{{d.params.data.model.intro}}
{{-d.params.data.model.intro}}
</div>
</div>
</div>
@@ -355,7 +355,7 @@
types = d.params.data.types;
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -366,7 +366,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

3
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
View File

@@ -505,7 +505,7 @@
types = d.data.types;
//开启调试情况下获取接口赋值数据
if (debug) { console.log(d.data); }
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'layedit', 'util', 'cropperImg'],
layui.use(['admin', 'form', 'laydate', 'upload', 'coreHelper', 'dtree', 'view', 'laytpl', 'xmSelect', 'util', 'cropperImg'],
function () {
$ = layui.$;
var form = layui.form
@@ -516,7 +516,6 @@
, view = layui.view
, laytpl = layui.laytpl
, xmSelect = layui.xmSelect
, layedit = layui.layedit
, util = layui.util
, cropperImg = layui.cropperImg
, coreHelper = layui.coreHelper;

2
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
View File

@@ -44,7 +44,7 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单状态</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.statusText}}</div>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{-d.params.data.statusText}}</div>
<label class="layui-form-label">发货状态</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.shipStatusText}}</div>

40
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
View File

@@ -281,7 +281,11 @@
cols: [
[
{ type: 'checkbox' },
{ field: 'operating', title: '操作', width: 60, align: 'center' },
{
field: 'operating', title: '操作', width: 90, align: 'center', templet: function (data) {
return data.operating;
}
},
{
field: 'orderId',
title: '订单号',
@@ -334,15 +338,18 @@
title: '订单状态',
width: 80,
align: 'center',
templet: '#statusText'
//templet: function (data) {
// for (var i = 0; i < d.data.orderStatus.length; i++) {
// if (data.status == d.data.orderStatus[i].value) {
// return d.data.orderStatus[i].description;
// }
// }
// return "";
//}
templet: function (data) {
var html = '';
for (var i = 0; i < d.data.orderStatus.length; i++) {
if (data.status == d.data.orderStatus[i].value) {
html += d.data.orderStatus[i].description;
}
}
if (data.tcOrder) {
html += '<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-id="' + data.orderId + '" lay-active="showTcOrder" style="margin-left: 0px">直播订单</button>';
}
return html;
}
},
//{
// field: 'payStatus',
@@ -1372,19 +1379,6 @@
</script>
<!--直播订单-->
<script type="text/html" id="statusText">
{{# layui.each(orderStatus, function(index, item){ }}
{{# if(d.status == item.value){ }}
{{item.description}}
{{# } }}
{{# }); }}
{{# if(d.tcOrder){ }}
<button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-id="{{d.orderId}}" lay-active="showTcOrder" style="margin-left: 0px">直播订单</button>
{{# } }}
</script>
<!--用户地址-->
<script type="text/html" id="orderShip">
<div class="orderShip">