From 4c6ad4c0dc6495d7186649afcf6e52c0fb6d76cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Mon, 1 Aug 2022 01:47:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=95=86=E5=93=81=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=A0=B8=E9=94=80=E5=90=8E=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=8A=B6=E6=80=81=E4=BB=8D=E7=84=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=90=8C=E6=AD=A5=E5=A4=B4=E5=83=8F=E5=8F=8A=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=8F=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A1=A8=EF=BC=8C=E6=9C=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=9D=A5=E6=BA=90=E8=A1=A8=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coreshop-payments/coreshop-paymentsByWx.vue | 17 +++++++++-------- .../member/serviceOrder/details/details.vue | 9 +++++++-- .../CoreCmsUserServicesOrderController.cs | 10 ++++++++++ .../views/order/servicesOrder/details.html | 8 ++++---- .../views/user/wechatuserinfo/index.html | 2 +- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue index a480be6b..4135137c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByWx.vue @@ -13,7 +13,7 @@ 当前余额：{{userInfo.balance}}元 - + {{item.memo}} @@ -110,7 +110,7 @@ payments = payments.filter(item => item.code !== 'alipay') // 如果是充值订单,服务订单 过滤余额支付 过滤非线上支付方式 - if (this.type == this.$globalConstVars.paymentType.recharge || this.type === this.$globalConstVars.paymentType.serviceOrder) { + if (this.type == this.$globalConstVars.paymentType.recharge) { payments = payments.filter(item => item.code !== 'balancepay' || item.isOnline === false) } @@ -129,18 +129,19 @@ let data = { payment_code: code, payment_type: this.type, - params: { - trade_type: 'JSAPI', - } + params: {} } data['ids'] = (this.type == this.$globalConstVars.paymentType.common || this.type == this.$globalConstVars.paymentType.pinTuan || this.type == this.$globalConstVars.paymentType.group || this.type == this.$globalConstVars.paymentType.skill || this.type == this.$globalConstVars.paymentType.bargain || this.type == this.$globalConstVars.paymentType.giveaway || this.type == this.$globalConstVars.paymentType.solitaire || this.type == this.$globalConstVars.paymentType.transactionComponent || this.type == this.$globalConstVars.paymentType.serviceOrder) ? this.orderId : this.uid // 判断订单支付类型 if (this.type == this.$globalConstVars.paymentType.recharge && this.recharge) { - data.params.money = this.recharge; - + data['params'] = { + money: this.recharge + } } else if ((this.type == this.$globalConstVars.paymentType.formPay || this.type == this.$globalConstVars.paymentType.formOrder) && this.recharge) { - data.ids = this.orderId; + data['ids'] = this.orderId; + data['params'] = { + } } let _this = this switch (code) { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue index 05adfeef..a14689df 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/serviceOrder/details/details.vue @@ -58,8 +58,13 @@ {{item.validityStartTime}} 至 {{item.validityEndTime}} - - {{item.statusStr}} + + + + + + + diff --git a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs index fba81520..8eb4e17b 100644 --- a/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs @@ -951,6 +951,16 @@ namespace CoreCms.Net.Web.Admin.Controllers return jm; } oldModel.isVerification = (bool)entity.data; + if (oldModel.isVerification) + { + oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.已核销; + oldModel.verificationTime = DateTime.Now; + } + else + { + oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.正常; + oldModel.verificationTime = null; + } var bl = await _coreCmsUserServicesTicketServices.UpdateAsync(oldModel); jm.code = bl ? 0 : 1; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/details.html index 3b0c7c78..d6a4bd8d 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/details.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/servicesOrder/details.html @@ -111,7 +111,7 @@ pagebar: '#LAY-app-CoreCmsUserServicesTicket-pagebar', className: 'pagebarbox', defaultToolbar: ['filter', 'print', 'exports'], - height: 'full-227',//面包屑142px,搜索框4行172,3行137,2行102,1行67 + height: 'full-230',//面包屑142px,搜索框4行172,3行137,2行102,1行67 page: true, limit: 30, limits: [10, 15, 20, 25, 30, 50, 100, 200], @@ -126,7 +126,7 @@ //{ field: 'serviceId', title: '关联服务项目id', sort: false, width: 105 }, //{ field: 'userId', title: '关联用户id', sort: false, width: 105 }, { - field: 'status', title: '状态', sort: false, width: 70, templet: function (data) { + field: 'status', title: '状态', sort: false, width: 60, templet: function (data) { for (var i = 0; i < d.params.data.servicesTicketStatus.length; i++) { if (data.status == d.params.data.servicesTicketStatus[i].value) { return d.params.data.servicesTicketStatus[i].description; @@ -150,7 +150,7 @@ { field: 'validityStartTime', title: '核销开始时间', width: 130, sort: false }, { field: 'validityEndTime', title: '核销结束时间', width: 130, sort: false }, { field: 'createTime', title: '创建时间', width: 130, sort: false }, - { field: 'isVerification', title: '是否核销', width: 65, templet: '#switch_isVerification', sort: false, unresize: true }, + { field: 'isVerification', title: '是否核销', width: 75, templet: '#switch_isVerification', sort: false, unresize: true }, { field: 'verificationTime', title: '核销时间', width: 130, sort: false }, { width: 60, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserServicesTicket-tableBox-bar' } ] @@ -254,7 +254,7 @@ layui.form.on('switch(switch_isVerification)', function (obj) { coreHelper.Post("Api/CoreCmsUserServicesOrder/DoSetisVerification", { id: this.value, data: obj.elem.checked }, function (e) { if (debug) { console.log(e); } //开启调试返回数据 - //table.reloadData('LAY-app-CoreCmsUserServicesTicket-tableBox'); + table.reloadData('LAY-app-CoreCmsUserServicesTicket-tableBox'); layer.msg(e.msg); }); }); diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html index e16366c8..a9d06197 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/user/wechatuserinfo/index.html @@ -132,7 +132,7 @@ { field: 'avatar', title: '头像', sort: false, templet: function (d) { - if (d.avatarImage) { + if (d.avatar) { return ''; } else { return '';