From 796a3f4c1bd4609a77c0d8da83a4f8dd704e430f Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sun, 31 Oct 2021 22:28:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreShop/static/style/coreCommon.scss | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss index 77bb3e4..70eaeb6 100644 --- a/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss +++ b/CoreCms.Net.Uni-App/CoreShop/static/style/coreCommon.scss @@ -784,3 +784,17 @@ page, .bg-page { background: #f7f7f7; } a { text-decoration: none; color: #999 !important; } } } + + +/*按钮无边框样式*/ +.noButtonStyle { -webkit-appearance: none; overflow: visible; color: #606266; border-color: #c0c4cc; background-color: #ffffff; position: relative; border: 0; display: inline-flex; overflow: visible; line-height: 1; display: flex; flex-direction: row; align-items: center; justify-content: center; cursor: pointer; z-index: 1; box-sizing: border-box; transition: all 0.15s; } + .noButtonStyle::after { border-top-width: 0; border-right-width: 0; border-bottom-width: 0; border-left-width: 0; } + + +/*顶部自定义效果*/ +.coreshop-header-slot-wrap { display: flex; align-items: center; padding: 0 20rpx; margin-top: -10rpx; + .coreshop-slot-btns { background: #111727; border: 1px solid #565b6f; padding: 8rpx 24rpx; border-radius: 500rpx; display: flex; align-items: center; z-index: 10075; + .coreshop-slot-cut-off { margin: 0 20rpx; color: #fff; width: 1rpx; border-left: 1px solid #fff; background: #fff; height: 35rpx; } + } + .coreshop-header-title { padding: 2rpx 20rpx; } +} From d322c00fe371839f36a062bff330491e9c6b370c Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sun, 14 Nov 2021 01:18:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8B=BC=E5=9B=A2objectId=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=8F=98undefined=E4=BA=86=E3=80=82#I4I0LM?= =?UTF-8?q?=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9C=8D=E5=8A=A1=E9=A1=B9=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C=E3=80=82=EF=BC=88=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=E6=94=BE=E4=B8=8D=E4=B8=8B=E4=B8=A4=E8=A1=8C=E4=B8=8D?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E3=80=82=EF=BC=89=20=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91=E6=8E=88=E6=9D=83=E5=90=8E=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?#I4HEUS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Expression/PredicateBuilder.cs | 2 +- .../CoreShop/common/mixins/mixinsHelper.js | 6 +++--- .../coreshop-login-modal/coreshop-login-modal.vue | 1 + .../components/coreshop-page/coreshop-pinTuan.vue | 2 +- .../CoreShop/pages/activity/pinTuan/list/list.vue | 2 +- .../pages/activity/seckill/details/details.vue | 2 +- .../CoreShop/pages/goods/goodDetails/goodDetails.vue | 2 +- .../CoreShop/pages/member/merchant/detail/detail.vue | 2 +- .../CoreShop/pages/member/order/detail/detail.vue | 2 +- README.md | 11 +++-------- 10 files changed, 14 insertions(+), 18 deletions(-) diff --git a/CoreCms.Net.Model/Entities/Expression/PredicateBuilder.cs b/CoreCms.Net.Model/Entities/Expression/PredicateBuilder.cs index 7961e1a..6c745a4 100644 --- a/CoreCms.Net.Model/Entities/Expression/PredicateBuilder.cs +++ b/CoreCms.Net.Model/Entities/Expression/PredicateBuilder.cs @@ -57,7 +57,7 @@ namespace CoreCms.Net.Model.Entities.Expression public static Expression> Or(this Expression> first, Expression> second) { - return first.Compose(second, System.Linq.Expressions.Expression.Or); + return first.Compose(second, System.Linq.Expressions.Expression.OrElse); } } } \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js index 9eca068..41a9007 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/mixins/mixinsHelper.js @@ -139,13 +139,13 @@ export const goods = { this.$u.route('/pages/activity/groupBuying/details/details', { id: id, groupId: groupId, }); }, //拼团详情页 - goPinTuanDetail(id, teamId) { + goPinTuanDetail(id, pinTuanId, teamId) { console.log(id); console.log(teamId); if (teamId) { - this.$u.route('/pages/activity/pinTuan/details/details', { id: id, teamId: teamId, }); + this.$u.route('/pages/activity/pinTuan/details/details', { id: id, pinTuanId: pinTuanId, teamId: teamId, }); } else { - this.$u.route('/pages/activity/pinTuan/details/details', { id: id }); + this.$u.route('/pages/activity/pinTuan/details/details', { id: id, pinTuanId: pinTuanId }); } }, // 查看秒杀列表 diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue index 82d5d30..2afc589 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue @@ -265,6 +265,7 @@ } else { _this.$u.toast('如未授权，您可尝试使用手机号+短信验证码登录'); } + _this.showLogin = false; }, //实际的去登陆 toGetPhoneNumber: function (data) { diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue index 8c11a0f..480e9ca 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-pinTuan.vue @@ -9,7 +9,7 @@ - + {{item.peopleNumber}}人团 diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue index 195c7c9..18b2d46 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/list/list.vue @@ -34,7 +34,7 @@ ￥{{ item.price }} - + diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue index 67a7678..11536aa 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue @@ -287,7 +287,7 @@ {{item.title}} - {{item.description}} + {{item.description}} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue index 8bde143..d3b0562 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -335,7 +335,7 @@ {{item.title}} - {{item.description}} + {{item.description}} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue index a69a9b7..319616d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/merchant/detail/detail.vue @@ -151,7 +151,7 @@ {{ item.name }} - {{ item.name }} + {{ item.name }} {{ item.addon}} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue index 306597f..4a2f8e4 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/detail/detail.vue @@ -181,7 +181,7 @@ {{ item.name }} - {{ item.name }} + {{ item.name }} {{ item.addon}} diff --git a/README.md b/README.md index 04b387c..7a618de 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ ------------------------------------------------------------------------ -官方网站：https://www.coreshop.cn/ 【建设中】 +官方网站：https://www.coreshop.cn/ QQ群：70494974 @@ -156,7 +156,7 @@ https://api.demo.coreshop.cn/job | Jwt | 授权认证 | [![nuget](https://img.shields.io/nuget/v/IdentityModel?cacheSeconds=10800)](https://www.nuget.org/packages/IdentityModel/) [![nuget](https://img.shields.io/nuget/dt/IdentityModel)](https://www.nuget.org/packages/IdentityModel/) | | HangFire | 定时任务 | [![nuget](https://img.shields.io/nuget/v/HangFire?cacheSeconds=10800)](https://www.nuget.org/packages/HangFire/) [![nuget](https://img.shields.io/nuget/dt/HangFire)](https://www.nuget.org/packages/HangFire/) | | Paylink | 在线支付 | [![nuget](https://img.shields.io/nuget/v/Essensoft.Paylink.WeChatPay?cacheSeconds=10800)](https://www.nuget.org/packages/Essensoft.Paylink.WeChatPay/) [![nuget](https://img.shields.io/nuget/dt/Essensoft.Paylink.WeChatPay)](https://www.nuget.org/packages/Essensoft.Paylink.WeChatPay/) | -| SKIT.FlurlHttpClient.Wechat | 微信SDK | [![nuget](https://img.shields.io/nuget/v/SKIT.FlurlHttpClient.Wechat?cacheSeconds=10800)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat/) [![nuget](https://img.shields.io/nuget/dt/SKIT.FlurlHttpClient.Wechat)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat/) | +| SKIT.FlurlHttpClient.Wechat | 微信SDK | [![nuget](https://img.shields.io/nuget/v/SKIT.FlurlHttpClient.Wechat.Api?cacheSeconds=10800)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat.Api/) [![nuget](https://img.shields.io/nuget/dt/SKIT.FlurlHttpClient.Wechat.Api)](https://www.nuget.org/packages/SKIT.FlurlHttpClient.Wechat.Api/) | | LayUIAdmin | 后端管理UI框架 | [![npm](https://img.shields.io/npm/v/layui.svg?sanitize=true)](https://www.layui.com/) [![github](https://img.shields.io/github/stars/sentsin/layui.svg?style=social)](https://www.layui.com/) | @@ -207,15 +207,10 @@ https://api.demo.coreshop.cn/job - [ ] （可选）易联云网络打印机 ### ⛵ 安装及说明文档 -- 由于文档内容较多，请加QQ群 【[70494974](https://jq.qq.com/?_wv=1027&k=y83TiQC7)】 后群附内下载多种文档，或git源代码从其目录【文档】中获取。 +- 由于文档内容较多，请加QQ群 【[70494974](https://jq.qq.com/?_wv=1027&k=y83TiQC7)】 后群附内下载多种文档，或访问官网[https://www.coreshop.cn](https://www.coreshop.cn)在线浏览。 - 已经支持linux下docker-compose部署，可实现一键部署coreshop应用、mysql、redis，请获取代码中【docker-compose.yaml】文件， -### ⚡ 进度及计划 -- 目前虽然完成了通用商城该有的功能开发，但是因为业务逻辑层面的功能繁多，不可否认存在一些较明显的bug。 -- 近阶段我们主要工作重心放在修复Bug、完善测试、优化业务逻辑、编写文档及官网的建设。 - - ### 🎏 版权须知 - 允许个人学习研究使用，支持二次开发。 - 允许商业用途，商用免费，但仅限自运营；如果商用必须保留版权信息，望自觉遵守。 From 0ae8e6b8fe938a8b33c575172d25fddc3a69b422 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Mon, 15 Nov 2021 23:57:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=95=86=E5=93=81=E7=9B=AE=E5=BD=95=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Web.WebApi/Controllers/GoodController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs index 55816c8..9c3f345 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/GoodController.cs @@ -196,7 +196,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers className = category.name; } - var childs = await _goodsCategoryServices.QueryListByClauseAsync(p => p.parentId == category.id); + var childs = await _goodsCategoryServices.QueryListByClauseAsync(p => p.parentId == catId); if (childs.Any()) { var ids = childs.Select(p => p.id).ToList(); From 13e06d01ba6352576482f229494ffb1b18bbc0b2 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Wed, 17 Nov 2021 23:17:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=AF=AF=E7=94=A8=E5=85=AC=E4=BC=97=E5=8F=B7?= =?UTF-8?q?=E6=8E=A8=E9=80=81=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=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=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF=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 --- CoreCms.Net.Middlewares/MiddlewareHelpers.cs | 2 +- .../SendWxTemplateMessageSubscribe.cs | 71 ++++++++++--------- CoreCms.Net.Web.Admin/Startup.cs | 2 +- CoreCms.Net.Web.WebApi/Startup.cs | 2 +- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs index 12daa3e..8ab9002 100644 --- a/CoreCms.Net.Middlewares/MiddlewareHelpers.cs +++ b/CoreCms.Net.Middlewares/MiddlewareHelpers.cs @@ -25,7 +25,7 @@ namespace CoreCms.Net.Middlewares /// /// /// - public static IApplicationBuilder UseReuestResponseLog(this IApplicationBuilder app) + public static IApplicationBuilder UseRequestResponseLog(this IApplicationBuilder app) { return app.UseMiddleware(); } diff --git a/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs b/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs index 862a5b2..3d90edd 100644 --- a/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs +++ b/CoreCms.Net.RedisMQ/Subscribe/SendWxTemplateMessageSubscribe.cs @@ -96,55 +96,55 @@ namespace CoreCms.Net.RedisMQ.Subscribe } - var templateMessageData = new Dictionary(); + var templateMessageData = new Dictionary(); var pageUrl = string.Empty; if (request.code == GlobalEnumVars.PlatformMessageTypes.CreateOrder.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["shipName"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["shipMobile"].ToString() }; - templateMessageData[templateData.data05] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["shipAddress"].ToString() }; - pageUrl = "/pages/member/order/orderdetail?orderId=" + parameters["orderId"]; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipName"].ToString() }; + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipMobile"].ToString() }; + templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["shipAddress"].ToString() }; + pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.RemindOrderPay.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = "订单即将失效，请及时付款！" }; - pageUrl = "/pages/member/order/orderdetail?orderId=" + parameters["orderId"]; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = "订单即将失效，请及时付款！" }; + pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.OrderPayed.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["paymentTime"].ToString() }; - pageUrl = "/pages/member/order/orderdetail?orderId=" + parameters["orderId"]; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentTime"].ToString() }; + pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.DeliveryNotice.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["logiName"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["logiNo"].ToString() }; - pageUrl = "/pages/member/order/orderdetail?orderId=" + parameters["orderId"]; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiName"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["logiNo"].ToString() }; + pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.AfterSalesPass.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["aftersalesStatus"].ToString() }; - pageUrl = "/pages/member/order/orderdetail?orderId=" + parameters["orderId"]; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["orderAmount"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesStatus"].ToString() }; + pageUrl = "/pages/member/order/detail/detail?orderId=" + parameters["orderId"]; } else if (request.code == GlobalEnumVars.PlatformMessageTypes.RefundSuccess.ToString()) { - templateMessageData[templateData.data01] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["sourceId"].ToString() }; - templateMessageData[templateData.data02] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; - templateMessageData[templateData.data03] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["money"].ToString() }; - templateMessageData[templateData.data04] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["paymentCode"].ToString() }; - templateMessageData[templateData.data05] = new CgibinMessageSubscribeBusinessSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; + templateMessageData[templateData.data01] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["sourceId"].ToString() }; + templateMessageData[templateData.data02] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["aftersalesId"].ToString() }; + templateMessageData[templateData.data03] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["money"].ToString() }; + templateMessageData[templateData.data04] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["paymentCode"].ToString() }; + templateMessageData[templateData.data05] = new CgibinMessageSubscribeSendRequest.Types.DataItem() { Value = parameters["createTime"].ToString() }; } var result = await Send(weChatUserInfo.openid, templateData.templateId, templateMessageData, pageUrl); @@ -223,20 +223,21 @@ namespace CoreCms.Net.RedisMQ.Subscribe /// 发送数据 /// 路径（如：pages/index/index） /// - private async Task Send(string openId, string templateId, Dictionary tmpData, string pageUrl) + private async Task Send(string openId, string templateId, Dictionary tmpData, string pageUrl) { var jm = new WebApiCallBack(); var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); - var request = new CgibinMessageSubscribeBusinessSendRequest(); - + var request = new CgibinMessageSubscribeSendRequest(); + request.AccessToken = accessToken; - request.Page = pageUrl; + request.MiniProgramPagePath = pageUrl; request.TemplateId = templateId; request.ToUserOpenId = openId; request.Data = tmpData; + request.MiniProgramState = "formal"; - var response = await client.ExecuteCgibinMessageSubscribeBusinessSendAsync(request); + var response = await client.ExecuteCgibinMessageSubscribeSendAsync(request); if (response.IsSuccessful()) { jm.status = true; diff --git a/CoreCms.Net.Web.Admin/Startup.cs b/CoreCms.Net.Web.Admin/Startup.cs index 0586e39..e6568f9 100644 --- a/CoreCms.Net.Web.Admin/Startup.cs +++ b/CoreCms.Net.Web.Admin/Startup.cs @@ -162,7 +162,7 @@ namespace CoreCms.Net.Web.Admin public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { // ¼뷵 (ע⿪ȨޣȻ޷д) - app.UseReuestResponseLog(); + app.UseRequestResponseLog(); // ûʼ¼(ŵ㣬Ȼ쳣ᱨΪܷ)(ע⿪ȨޣȻ޷д) app.UseRecordAccessLogsMildd(); // ¼ip (ע⿪ȨޣȻ޷д) diff --git a/CoreCms.Net.Web.WebApi/Startup.cs b/CoreCms.Net.Web.WebApi/Startup.cs index 56b1688..c83893a 100644 --- a/CoreCms.Net.Web.WebApi/Startup.cs +++ b/CoreCms.Net.Web.WebApi/Startup.cs @@ -179,7 +179,7 @@ namespace CoreCms.Net.Web.WebApi public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { // ¼뷵 (ע⿪ȨޣȻ޷д) - app.UseReuestResponseLog(); + app.UseRequestResponseLog(); // ûʼ¼(ŵ㣬Ȼ쳣ᱨΪܷ)(ע⿪ȨޣȻ޷д) app.UseRecordAccessLogsMildd(); // ¼ip (ע⿪ȨޣȻ޷д) From 1f7733fda8aab95d95a3a50fde43cafcdb58b8bc Mon Sep 17 00:00:00 2001 From: JianWeie Date: Thu, 18 Nov 2021 00:52:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E5=AF=BB=E4=B8=89=E7=BA=A7=E8=81=94=E5=8A=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8first=E5=AF=BC=E8=87=B4Sequence=20contains=20?= =?UTF-8?q?no=20matching=20element=20=E5=BC=82=E5=B8=B8=E3=80=82I4HBYB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Shop/CoreCmsAreaServices.cs | 2 +- .../coreshop-copyright/coreshop-copyright.vue | 5 +- CoreCms.Net.Uni-App/CoreShop/manifest.json | 316 +++++++++--------- .../CoreShop/pages/index/default/default.vue | 6 +- .../CoreShop/pages/index/member/member.vue | 8 +- 5 files changed, 168 insertions(+), 169 deletions(-) diff --git a/CoreCms.Net.Services/Shop/CoreCmsAreaServices.cs b/CoreCms.Net.Services/Shop/CoreCmsAreaServices.cs index bca30b4..812599f 100644 --- a/CoreCms.Net.Services/Shop/CoreCmsAreaServices.cs +++ b/CoreCms.Net.Services/Shop/CoreCmsAreaServices.cs @@ -322,7 +322,7 @@ namespace CoreCms.Net.Services.Basic private void GetParentArea(List cacheAreas, int id, List outAreas) { //获取当前级别 - var model = cacheAreas.First(p => p.id == id); + var model = cacheAreas.FirstOrDefault(p => p.id == id); if (model != null) { if (outAreas.All(p => p.id != model.id)) outAreas.Add(model); diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue index 052be75..e831c1f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-copyright/coreshop-copyright.vue @@ -1,7 +1,7 @@