diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs index f992cf59..e3dfee57 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs @@ -36,7 +36,7 @@ namespace CoreCms.Net.Filter public void OnException(ExceptionContext context) { - NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "全局异常", "全局捕获异常", context.Exception); + NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "全局异常", context.Exception.Message, context.Exception); HttpStatusCode status = HttpStatusCode.InternalServerError; diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs index 0ff643a0..0c4e2a13 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs @@ -36,7 +36,7 @@ namespace CoreCms.Net.Filter public void OnException(ExceptionContext context) { - NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "全局异常", "全局捕获异常", context.Exception); + NLogUtil.WriteAll(NLog.LogLevel.Error, LogType.Web, "全局异常", context.Exception.Message, context.Exception); HttpStatusCode status = HttpStatusCode.InternalServerError; diff --git a/CoreCms.Net.Middlewares/ExceptionHandlerMiddForAdmin.cs b/CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForAdmin.cs similarity index 92% rename from CoreCms.Net.Middlewares/ExceptionHandlerMiddForAdmin.cs rename to CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForAdmin.cs index 77a7046e..06b0977d 100644 --- a/CoreCms.Net.Middlewares/ExceptionHandlerMiddForAdmin.cs +++ b/CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForAdmin.cs @@ -26,11 +26,11 @@ namespace CoreCms.Net.Middlewares; /// /// 异常错误统一返回记录 /// -public class ExceptionHandlerMiddForAdmin +public class ExceptionHandlerMiddlewareForAdmin { private readonly RequestDelegate _next; - public ExceptionHandlerMiddForAdmin(RequestDelegate next) + public ExceptionHandlerMiddlewareForAdmin(RequestDelegate next) { _next = next; } @@ -50,7 +50,7 @@ public class ExceptionHandlerMiddForAdmin private async Task HandleExceptionAsync(HttpContext context, Exception ex) { if (ex == null) return; - NLogUtil.WriteAll(LogLevel.Error, LogType.Web, "全局捕获异常", "全局捕获异常", new Exception("全局捕获异常", ex)); + NLogUtil.WriteAll(LogLevel.Error, LogType.Web, "全局捕获异常", ex.Message, ex); await WriteExceptionAsync(context, ex).ConfigureAwait(false); } diff --git a/CoreCms.Net.Middlewares/ExceptionHandlerMiddForClent.cs b/CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForClent.cs similarity index 92% rename from CoreCms.Net.Middlewares/ExceptionHandlerMiddForClent.cs rename to CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForClent.cs index 6acf793d..b5d5219a 100644 --- a/CoreCms.Net.Middlewares/ExceptionHandlerMiddForClent.cs +++ b/CoreCms.Net.Middlewares/ExceptionHandlerMiddlewareForClent.cs @@ -26,12 +26,12 @@ namespace CoreCms.Net.Middlewares; /// /// 异常错误统一返回记录 /// -public class ExceptionHandlerMiddForClent +public class ExceptionHandlerMiddlewareForClent { private readonly RequestDelegate _next; - public ExceptionHandlerMiddForClent(RequestDelegate next) + public ExceptionHandlerMiddlewareForClent(RequestDelegate next) { _next = next; } @@ -52,7 +52,7 @@ public class ExceptionHandlerMiddForClent { if (ex == null) return; - NLogUtil.WriteAll(LogLevel.Error, LogType.ApiRequest, "全局捕获异常", "全局捕获异常", new Exception("全局捕获异常", ex)); + NLogUtil.WriteAll(LogLevel.Error, LogType.ApiRequest, "全局捕获异常", ex.Message, ex); await WriteExceptionAsync(context, ex).ConfigureAwait(false); } diff --git a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs index 76eda593..1786f00e 100644 --- a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs +++ b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs @@ -38,7 +38,7 @@ namespace CoreCms.Net.Middlewares /// public static IApplicationBuilder UseExceptionHandlerMiddForAdmin(this IApplicationBuilder app) { - return app.UseMiddleware(); + return app.UseMiddleware(); } /// @@ -48,7 +48,7 @@ namespace CoreCms.Net.Middlewares /// public static IApplicationBuilder UseExceptionHandlerMiddForClent(this IApplicationBuilder app) { - return app.UseMiddleware(); + return app.UseMiddleware(); } /// diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.js b/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.js deleted file mode 100644 index 03426ff5..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.js +++ /dev/null @@ -1,210 +0,0 @@ -/** - * 格式化器 - * @Author: wenjm - * @Date: 2018-02-24 23:28:28 - * @Last Modified by: wenjm - * @Last Modified time: 2018-05-15 14:35:01 - */ -export default { - - formatDateTime(value) { - return this.formatDate(value, 'yyyy-MM-dd hh:mm:ss'); - }, - - /** - * 格式化时间显示方式 - * 用法:format="yyyy-MM-dd hh:mm:ss"; - */ - formatDate(value, format = 'yyyy-MM-dd') { - if (!value) return ""; - if (!format) format = "yyyy-MM-dd"; - let d = value; - if (typeof value === 'string') { - if (value.indexOf("/Date(") > -1) - d = new Date(parseInt(value.replace("/Date(", "").replace(")/", ""), 10)); - else - d = new Date(Date.parse(value.replace(/-/g, "/").replace("T", " ").split(".")[0])); //.split(".")[0] 用来处理出现毫秒的情况，截取掉.xxx，否则会出错 - } - let o = { - "M+": d.getMonth() + 1, //month - "d+": d.getDate(), //day - "h+": d.getHours(), //hour - "m+": d.getMinutes(), //minute - "s+": d.getSeconds(), //second - "q+": Math.floor((d.getMonth() + 3) / 3), //quarter - "S": d.getMilliseconds() //millisecond - }; - if (/(y+)/.test(format)) { - format = format.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length)); - } - for (let k in o) { - if (new RegExp("(" + k + ")").test(format)) { - format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)); - } - } - return format; - }, - - formatTime(t) { - if (isNaN(t) || t == 0) { return 0; } - - let n = 31536000000; - if (t >= n) { - return this.formatNumber(t / n, '#,##0.##') + ' 年'; - } - - n = 86400000; - if (t >= n) { - return this.formatNumber(t / n, '#,##0.##') + ' 日'; - } - - n = 3600000; - if (t >= n) { - return this.formatNumber(t / n, '#,##0.##') + ' 小时'; - } - - n = 60000; - if (t >= n) { - return this.formatNumber(t / n, '#,##0.##') + ' 分'; - } - - n = 1000; - if (t >= n) { - return this.formatNumber(t / n, '#,##0.##') + ' 秒'; - } - - return this.formatNumber(t, '#,##0.##') + ' 毫秒'; - }, - - /** - * 格式化数字显示方式 - * 用法 - * formatNumber(12345.999,'#,##0.00'); - * formatNumber(12345.999,'#,##0.##'); - * formatNumber(123,'000000'); - */ - formatNumber(value, pattern) { - if (value == null) - return value; - let strarr = value ? value.toString().split('.') : ['0']; - let fmtarr = pattern ? pattern.split('.') : ['']; - let retstr = ''; - // 整数部分 - let str = strarr[0]; - let fmt = fmtarr[0]; - let i = str.length - 1; - let comma = false; - for (let f = fmt.length - 1; f >= 0; f--) { - switch (fmt.substr(f, 1)) { - case '#': - if (i >= 0) retstr = str.substr(i--, 1) + retstr; - break; - case '0': - if (i >= 0) retstr = str.substr(i--, 1) + retstr; - else retstr = '0' + retstr; - break; - case ',': - comma = true; - retstr = ',' + retstr; - break; - } - } - if (i >= 0) { - if (comma) { - let l = str.length; - for (; i >= 0; i--) { - retstr = str.substr(i, 1) + retstr; - if (i > 0 && ((l - i) % 3) == 0) retstr = ',' + retstr; - } - } else retstr = str.substr(0, i + 1) + retstr; - } - retstr = retstr + '.'; - // 处理小数部分 - str = strarr.length > 1 ? strarr[1] : ''; - fmt = fmtarr.length > 1 ? fmtarr[1] : ''; - i = 0; - for (let f = 0; f < fmt.length; f++) { - switch (fmt.substr(f, 1)) { - case '#': - if (i < str.length) retstr += str.substr(i++, 1); - break; - case '0': - if (i < str.length) retstr += str.substr(i++, 1); - else retstr += '0'; - break; - } - } - return retstr.replace(/^,+/, '').replace(/\.$/, ''); - }, - - //格式化金额 - formatMoney(value, pattern) { - if (!value || value == 0) - return 0; - let sign = value < 0 ? '-' : ''; - return sign + this.formatNumber(Math.abs(value), pattern || '#,##0.00'); - }, - - formatMoneyCn(value) { - return '￥' + this.formatMoney(value); - }, - - formatWeek(value) { - let week = new Array("日", "一", "二", "三", "四", "五", "六"); - let datetimeReg = /^[1-9]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\s+(20|21|22|23|[0-1]\d):[0-5]\d:[0-5]\d$/; - if (datetimeReg.test(value)) { - value = value.replace(/-/g, "/"); - } - let day = new Date(value).getDay(); - - return "星期" + week[day]; - }, - - formatMoneyAuto(value, pattern = '#,##0.00') { - let unit = "元"; - if (value) { - let unitNum = { - // '千': 1000.00, - '万': 10000.00, - '千万': 10000000.00, - '亿': 100000000.00, - '百亿': 10000000000.00 - }; - let unitCount = { - // "4": '千', - "5": '万', - "8": '千万', - "9": '亿', - "11": '百亿' - }; - let count = 0; - let money = value; - - while (money >= 1) { - money = money / 10; - count++; - } - let tmp = unitCount[count + ""]; - while (count >= 4 && tmp === undefined) { - tmp = unitCount[(--count) + ""]; - } - unit = tmp === undefined ? unit : tmp; - value = (count >= 4) ? value / (unitNum[unit]) : value; - } - return this.formatMoney(value, pattern) + unit || ""; - }, - - formatFileSize(value) { - if (null == value || value == '') { - return "0 Bytes"; - } - var unitArr = new Array("Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"); - var index = 0; - var srcsize = parseFloat(value); - index = Math.floor(Math.log(srcsize) / Math.log(1024)); - var size = srcsize / Math.pow(1024, index); - size = size.toFixed(2); - return size + unitArr[index]; - } - -} \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.md b/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.md deleted file mode 100644 index 6ee94d3b..00000000 --- a/CoreCms.Net.Uni-App/CoreShop/common/utils/formatter.md +++ /dev/null @@ -1,51 +0,0 @@ -格式化器： -支持日期格式化、格式化数字显示、格式化金额、格式化星期、小写金额转大写、文件格式化 - -使用： -日期格式使用： -2018-02-24 23:28:28 : -var date=formatter.formatDateTime(new Date()); -2018-02-24 -var date=formatter.formatDate(new Date(),"yyyy-MM-dd"); -2018/02/24 -var date=formatter.formatDate(new Date(),"yyyy/MM/dd"); -2018-02-24 23:28 -var date=formatter.formatDate(new Date(),"yyyy-MM-dd HH:mm"); - -格式化数字显示方式: -123,45.999 -var money=formatter.formatNumber(12345.999,'#,##0.00'); -星期五 -var week=formatter.formatWeek("五"); -小写转大写 -一千二百三十四 -var chinese=formatter.formatMoneyAuto("1234"); -文件大小转化： -1Kb -var fileSize=formatter.formatFileSize("1024"); - -1Mb -var fileSize=formatter.formatFileSize("1024*1024"); - - -案例： - \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue index 6844a4c0..76227a7f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-imgSlide.vue @@ -1,6 +1,6 @@ @@ -16,7 +16,7 @@ data() { return { swiperItems: [], - swiperHeight: 130, + swiperHeight: 150, swiperDuration: 2500, }; }, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue index 59108c31..2ccb49a2 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue @@ -53,7 +53,7 @@ - + {{item.goodObj.name}} {{ item.productObj.spesDesc }} @@ -134,8 +134,6 @@ - - @@ -144,7 +142,6 @@ - \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html index e087a6d9..a7db6eb2 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/servicegoods/index.html @@ -1,4 +1,4 @@ -服务项目表 +服务购买表
@@ -10,70 +10,98 @@ -
-
+
- - - @@ -83,7 +111,7 @@ var debug = layui.setter.debug; layui.data.done = function (d) { //开启调试情况下获取接口赋值数据 - if (debug) { console.log(d.data); } + if (debug) { console.log(d); } indexData = d.data; layui.use(['index', 'table', 'laydate', 'util', 'coredropdown', 'coreHelper'], @@ -98,25 +126,22 @@ , util = layui.util , view = layui.view; - - //重载form - form.render(); var searchwhere; //监听搜索 - form.on('submit(LAY-app-CoreCmsServices-search)', + form.on('submit(LAY-app-CoreCmsUserServicesOrder-search)', function (data) { var field = data.field; searchwhere = field; //执行重载 - table.reloadData('LAY-app-CoreCmsServices-tableBox', { where: field }); + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox', { where: field }); }); //数据绑定 table.render({ - elem: '#LAY-app-CoreCmsServices-tableBox', - url: layui.setter.apiUrl + 'Api/CoreCmsServices/GetPageList', + elem: '#LAY-app-CoreCmsUserServicesOrder-tableBox', + url: layui.setter.apiUrl + 'Api/CoreCmsUserServicesOrder/GetPageList', method: 'POST', - toolbar: '#LAY-app-CoreCmsServices-toolbar', - pagebar: '#LAY-app-CoreCmsServices-pagebar', + toolbar: '#LAY-app-CoreCmsUserServicesOrder-toolbar', + pagebar: '#LAY-app-CoreCmsUserServicesOrder-pagebar', className: 'pagebarbox', defaultToolbar: ['filter', 'print', 'exports'], height: 'full-127',//面包屑142px,搜索框4行172,3行137,2行102,1行67 @@ -127,77 +152,36 @@ cols: [ [ { type: "checkbox", fixed: "left" }, - { field: 'id', title: '序列', width: 70, sort: false }, - { field: 'title', title: '项目名称', sort: false, width: 205 }, + { field: 'id', title: '序列', width: 50, sort: false }, + { field: 'serviceOrderId', title: '服务订单编号', sort: false, width: 125 }, { - field: 'thumbnail', title: '缩略图', sort: false, width: 85, - templet: function (d) { - if (d.thumbnail) { - return ''; - } else { - return ''; - } - }, width: 60 - }, - { field: 'money', title: '售价', sort: false, width: 80, templet: function (data) { return '￥' + data.money } }, - - //{ field: 'description', title: '项目概述', sort: false, width: 105 }, - //{ field: 'contentBody', title: '项目详细说明', sort: false, width: 105 }, - { - field: 'allowedMembership', title: '允许购买会员级别', sort: false, width: 305, templet: function (data) { - var arr = data.allowedMembership.split(','); - var outStr = ""; - for (var i = 0; i < arr.length; i++) { - for (var j = 0; j < d.data.userGrade.length; j++) { - if (d.data.userGrade[j].id == arr[i]) { - outStr += '' + d.data.userGrade[j].title + '  '; - } - } - } - return outStr; + field: 'userId', title: '关联用户', sort: false, width: 155, templet: function (d) { + return d.userId + '【' + d.userName + '】'; } }, + { field: 'serviceTitle', title: '关联服务', sort: false }, + { field: 'isPay', title: '是否支付', width: 95, templet: '#switch_isPay', sort: false, unresize: true }, + { field: 'payTime', title: '支付时间', width: 130, sort: false }, + { field: 'paymentId', title: '支付单号', sort: false, width: 125 }, { - field: 'status', - title: '项目状态', - sort: false, - width: 85, - templet: function (data) { - for (var j = 0; j < d.data.status.length; j++) { - if (d.data.status[j].value == data.status) { - return d.data.status[j].description; + field: 'status', title: '状态', sort: false, width: 80, templet: function (data) { + for (var i = 0; i < d.data.serviceOrderStatus.length; i++) { + if (data.status == d.data.serviceOrderStatus[i].value) { + return d.data.serviceOrderStatus[i].description; } } return ""; } }, - { field: 'maxBuyNumber', title: '项目重复购买次数', sort: false, width: 125 }, - { field: 'amount', title: '项目可销售数量', sort: false, width: 105 }, - { field: 'startTime', title: '项目开始时间', width: 130, sort: false }, - { field: 'endTime', title: '项目截止时间', width: 130, sort: false }, - { - field: 'validityType', title: '核销有效期类型', sort: false, width: 105, - templet: function (data) { - for (var j = 0; j < d.data.types.length; j++) { - if (d.data.types[j].value == data.validityType) { - return d.data.types[j].description; - } - } - return ""; - } - }, - { field: 'validityStartTime', title: '核销开始时间', width: 130, sort: false }, - { field: 'validityEndTime', title: '核销结束时间', width: 130, sort: false }, - { field: 'ticketNumber', title: '核销服务券数量', sort: false, width: 105 }, - { field: 'createTime', title: '项目创建时间', width: 130, sort: false }, - { field: 'updateTime', title: '项目更新时间', width: 130, sort: false }, - { width: 142, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsServices-tableBox-bar' } + { field: 'createTime', title: '订单创建时间', width: 130, sort: false }, + { field: 'servicesEndTime', title: '截止服务时间', width: 130, sort: false }, + { width: 122, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserServicesOrder-tableBox-bar' } ] ] }); //监听排序事件 - table.on('sort(LAY-app-CoreCmsServices-tableBox)', function (obj) { - table.reloadData('LAY-app-CoreCmsServices-tableBox', { + table.on('sort(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox', { initSort: obj, //记录初始排序，如果不设的话，将无法标记表头的排序状态。 where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式） orderField: obj.field, //排序字段 @@ -206,20 +190,14 @@ }); }); //监听行双击事件 - table.on('rowDouble(LAY-app-CoreCmsServices-tableBox)', function (obj) { + table.on('rowDouble(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { //查看详情 doDetails(obj); }); //头工具栏事件 - table.on('pagebar(LAY-app-CoreCmsServices-tableBox)', function (obj) { + table.on('pagebar(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch (obj.event) { - case 'addData': - doCreate(); - break; - case 'batchDelete': - doBatchDelete(checkStatus); - break; case 'selectExportExcel': doSelectExportExcel(checkStatus); break; @@ -229,139 +207,26 @@ }; }); //监听工具条 - table.on('tool(LAY-app-CoreCmsServices-tableBox)', + table.on('tool(LAY-app-CoreCmsUserServicesOrder-tableBox)', function (obj) { if (obj.event === 'detail') { doDetails(obj); - } else if (obj.event === 'del') { - doDelete(obj); - } else if (obj.event === 'edit') { - doEdit(obj) + } else if (obj.event === 'cancellation') { + doCancellation(obj); } }); - //执行创建操作 - function doCreate() { - coreHelper.Post("Api/CoreCmsServices/GetCreate", null, function (e) { - if (e.code === 0) { - admin.popup({ - shadeClose: false, - title: '创建数据', - area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-create', - success: function (layero, index) { - view(this.id).render('good/servicegoods/create', { data: e.data }).done(function () { - //监听提交 - form.on('submit(LAY-app-CoreCmsServices-createForm-submit)', - function (data) { - var field = data.field; //获取提交的字段 - field.contentBody = window.editor.getData(); - if (!!!field.contentBody) { - layer.msg('文章详情内容不能为空', { icon: 5 }); - return false; - } - - if (field.validityType == 2) { - if (!field.validityStartTime || !field.validityStartTime) { - layer.msg('请设置【核销有效时段】', { icon: 5 }); - return false; - } - } - - if (debug) { console.log(field); } //开启调试返回数据 - //提交 Ajax 成功后，关闭当前弹层并重载表格 - coreHelper.Post("Api/CoreCmsServices/DoCreate", field, function (e) { - console.log(e) - if (e.code === 0) { - layui.table.reloadData('LAY-app-CoreCmsServices-tableBox'); //重载表格 - layer.close(index); //再执行关闭 - layer.msg(e.msg); - } else { - layer.msg(e.msg); - } - }); - }); - }); - // 禁止弹窗出现滚动条 - //$(layero).children('.layui-layer-content').css('overflow', 'visible'); - } - , btn: ['确定', '取消'] - , yes: function (index, layero) { - layero.contents().find("#LAY-app-CoreCmsServices-createForm-submit").click(); - } - }); - } else { - layer.msg(e.msg); - } - }); - } - //执行编辑操作 - function doEdit(obj) { - coreHelper.Post("Api/CoreCmsServices/GetEdit", { id: obj.data.id }, function (e) { - if (e.code === 0) { - admin.popup({ - shadeClose: false, - title: '编辑数据', - area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-edit', - success: function (layero, index) { - view(this.id).render('good/servicegoods/edit', { data: e.data }).done(function () { - //监听提交 - form.on('submit(LAY-app-CoreCmsServices-editForm-submit)', - function (data) { - var field = data.field; //获取提交的字段 - - field.contentBody = window.editor.getData(); - if (!!!field.contentBody) { - layer.msg('文章详情内容不能为空', { icon: 5 }); - return false; - } - - if (field.validityType == 2) { - if (!field.validityStartTime || !field.validityStartTime) { - layer.msg('请设置【核销有效时段】', { icon: 5 }); - return false; - } - } - - if (debug) { console.log(field); } //开启调试返回数据 - //提交 Ajax 成功后，关闭当前弹层并重载表格 - coreHelper.Post("Api/CoreCmsServices/DoEdit", field, function (e) { - console.log(e) - if (e.code === 0) { - layui.table.reloadData('LAY-app-CoreCmsServices-tableBox'); //重载表格 - layer.close(index); //再执行关闭 - layer.msg(e.msg); - } else { - layer.msg(e.msg); - } - }); - }); - }) - // 禁止弹窗出现滚动条 - //$(layero).children('.layui-layer-content').css('overflow', 'visible'); - } - , btn: ['确定', '取消'] - , yes: function (index, layero) { - layero.contents().find("#LAY-app-CoreCmsServices-editForm-submit").click(); - } - }); - } else { - layer.msg(e.msg); - } - }); - } //执行预览操作 function doDetails(obj) { - coreHelper.Post("Api/CoreCmsServices/GetDetails", { id: obj.data.id }, function (e) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/GetDetails", { id: obj.data.id }, function (e) { if (e.code === 0) { admin.popup({ shadeClose: false, title: '查看详情', area: ['1200px', '90%'], - id: 'LAY-popup-CoreCmsServices-details', + id: 'LAY-popup-CoreCmsUserServicesOrder-details', success: function (layero, index) { - view(this.id).render('good/servicegoods/details', { data: e.data }).done(function () { + view(this.id).render('order/servicesOrder/details', { data: e.data }).done(function () { form.render(); }); // 禁止弹窗出现滚动条 @@ -373,40 +238,20 @@ } }); } - //执行单个删除 - function doDelete(obj) { - coreHelper.Post("Api/CoreCmsServices/DoDelete", { id: obj.data.id }, function (e) { + //执行作废订单 + function doCancellation(obj) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/DoCancellation", { id: obj.data.id }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - table.reloadData('LAY-app-CoreCmsServices-tableBox'); + table.reloadData('LAY-app-CoreCmsUserServicesOrder-tableBox'); layer.msg(e.msg); }); } - //执行批量删除 - function doBatchDelete(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); - }); - coreHelper.Post("Api/CoreCmsServices/DoBatchDelete", { id: delidsStr }, function (e) { - if (debug) { console.log(e); } //开启调试返回数据 - table.reloadData('LAY-app-CoreCmsServices-tableBox'); - layer.msg(e.msg); - }); - }); - } //执行查询条件导出excel function doQueryExportexcel() { layer.confirm('确定根据当前的查询条件导出数据吗？', function (index) { var field = searchwhere; - coreHelper.PostForm("Api/CoreCmsServices/QueryExportExcel", field, function (e) { + coreHelper.PostForm("Api/CoreCmsUserServicesOrder/QueryExportExcel", field, function (e) { if (debug) { console.log(e); } //开启调试返回数据 if (e.code === 0) { window.open(e.data); @@ -430,7 +275,7 @@ delidsStr.push(item.id); }); layer.close(index); - coreHelper.Post("Api/CoreCmsServices/SelectExportExcel", { id: delidsStr }, function (e) { + coreHelper.Post("Api/CoreCmsUserServicesOrder/SelectExportExcel", { id: delidsStr }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 if (e.code === 0) { window.open(e.data); @@ -440,27 +285,34 @@ }); }); } + + + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-payTime', + type: 'datetime', + range: '到', + }); + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-createTime', + type: 'datetime', + range: '到', + }); + laydate.render({ + elem: '#searchTime-CoreCmsUserServicesOrder-servicesEndTime', + type: 'datetime', + range: '到', + }); + //监听 表格复选框操作 - laydate.render({ - elem: '#searchTime-CoreCmsServices-startTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-endTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-validityStartTime', - type: 'datetime', - range: '到', - }); - laydate.render({ - elem: '#searchTime-CoreCmsServices-validityEndTime', - type: 'datetime', - range: '到', - }); + + //重载form + form.render(); }); }; - \ No newline at end of file + + + + + diff --git a/CoreCms.Net.Web.WebApi/Program.cs b/CoreCms.Net.Web.WebApi/Program.cs index a2ade68f..8cf4d7e9 100644 --- a/CoreCms.Net.Web.WebApi/Program.cs +++ b/CoreCms.Net.Web.WebApi/Program.cs @@ -28,7 +28,7 @@ namespace CoreCms.Net.Web.WebApi //确保NLog.config中连接字符串与appsettings.json中同步 NLogUtil.EnsureNlogConfig("NLog.config"); //其他项目启动时需要做的事情 - NLogUtil.WriteAll(LogLevel.Trace, LogType.Web, "接口启动", "接口启动成功"); + NLogUtil.WriteAll(LogLevel.Trace, LogType.ApiRequest, "接口启动", "接口启动成功"); host.Run(); }