From a2e189fe76db6b836a94b8cea767a3a07b59b905 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 15 Feb 2022 01:30:19 +0800 Subject: [PATCH] =?UTF-8?q?#=202022-02-15=20###=201.3.6=20=E5=BC=80?= =?UTF-8?q?=E6=BA=90=E7=A4=BE=E5=8C=BA=E7=89=88=EF=BC=9A=20=E3=80=90?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91=E5=BA=94=E5=B9=BF=E5=A4=A7=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E9=9C=80=E6=B1=82=EF=BC=8C=E5=B9=B3=E5=8F=B0=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E4=BB=8E=E8=A3=81?= =?UTF-8?q?=E5=89=AA=E4=B8=8A=E4=BC=A0=EF=BC=8C=E8=B0=83=E6=95=B4=E5=90=8E?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=BD=95=E5=85=A5=E5=9B=BE=E7=89=87=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=88=96=E6=9C=AC=E5=9C=B0=E9=9D=9E=E8=A3=81=E5=89=AA?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=82=20###=200.1.8=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=B8=93=E4=B8=9A=E7=89=88=EF=BC=9A=20=E3=80=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91=E5=B9=B3=E5=8F=B0=E8=AE=BE=E8=AE=A1=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E4=BB=8E=E8=A3=81=E5=89=AA=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=8C=E8=B0=83=E6=95=B4=E5=90=8E=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E6=88=96?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E9=9D=9E=E8=A3=81=E5=89=AA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=8B=E5=8D=95=E5=9C=B0=E5=9D=80=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?2=E8=A1=8C=E8=A2=AB=E9=81=AE=E6=8C=A1=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=8B=E5=8D=95=E5=9C=B0=E5=9D=80=E6=9C=AA=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=97=E9=81=93=E5=9C=B0=E5=9D=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=AE=A2=E5=8D=95=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E8=AF=AF=E5=B7=AE=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=A0=B8=E9=94=80=E3=80=90=E6=8F=90?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E3=80=91=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=9C=AA=E9=99=90=E5=88=B6=E5=A4=A7=E5=B0=8F=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=AE=B9=E6=98=93=E8=A2=AB=E6=92=91=E7=A0=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B8=E9=94=80=E3=80=90=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=88=B8=E3=80=91=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87=E6=9C=AA?= =?UTF-8?q?=E9=99=90=E5=88=B6=E5=A4=A7=E5=B0=8F=E5=AF=BC=E8=87=B4=E5=AE=B9?= =?UTF-8?q?=E6=98=93=E8=A2=AB=E6=92=91=E7=A0=B4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=85=BE=E8=AE=AF=E4=BA=91COS=E4=BA=91=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E7=BB=84=E4=BB=B6=E3=80=82=20=E3=80=90=E9=99=8D?= =?UTF-8?q?=E7=BA=A7=E3=80=91SixLabors.ImageSharp=E6=B5=B7=E6=8A=A5?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=99=8D=E7=BA=A7=E5=88=B01.04=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E3=80=82=E8=A7=A3=E5=86=B3=E6=B5=B7=E6=8A=A5=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=97=AE=E9=A2=98=E3=80=82#I4SWCC=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8E=A5=E9=BE=99?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=88=97=E8=A1=A8=E5=9B=BE=E7=89=87=E6=9C=AA?= =?UTF-8?q?=E9=99=90=E5=88=B6=E5=A4=A7=E5=B0=8F=E5=AF=BC=E8=87=B4=E5=AE=B9?= =?UTF-8?q?=E6=98=93=E8=A2=AB=E6=92=91=E7=A0=B4=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Auth/CoreCms.Net.Auth.csproj | 2 +- .../CoreCms.Net.Caching.csproj | 2 +- .../CoreCms.Net.IServices.csproj | 2 +- .../CoreCms.Net.Services.csproj | 4 +- .../Order/CoreCmsOrderServices.cs | 2 +- .../Share/CoreCmsShareServices.cs | 53 +++++-------- .../pages/activity/solitaire/list/list.vue | 8 +- .../member/merchant/takeDelivery/index.vue | 4 +- .../pages/member/serviceOrder/index/index.vue | 6 +- .../pages/placeOrder/index/index.scss | 2 +- .../CoreCms.Net.Web.Admin.csproj | 8 +- .../wwwroot/lib/custom/js/main.js | 47 ++++++------ .../wwwroot/views/common/getUpLoad.html | 76 +++++++++++++++++++ .../CoreCms.Net.Web.WebApi.csproj | 6 +- 14 files changed, 142 insertions(+), 80 deletions(-) create mode 100644 CoreCms.Net.Web.Admin/wwwroot/views/common/getUpLoad.html diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj index ebbde3bf..9987c226 100644 --- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj +++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj index c930f48a..3c05858d 100644 --- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj +++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj index 813acb0b..943358a9 100644 --- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj +++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj index b511cb0b..1ffe2500 100644 --- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj +++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj @@ -13,10 +13,10 @@ - + - + diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs index c043b0c4..fc5188a2 100644 --- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs +++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs @@ -435,7 +435,7 @@ namespace CoreCms.Net.Services //快递邮寄 order.shipAreaId = userShipInfo.areaId; - order.shipAddress = userShipInfo.address; + order.shipAddress = userShipInfo.street + " " + userShipInfo.address; order.shipName = userShipInfo.name; order.shipMobile = userShipInfo.mobile; diff --git a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs index 17c039fe..90874094 100644 --- a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs +++ b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs @@ -32,7 +32,6 @@ using Newtonsoft.Json.Linq; using SixLabors.Fonts; using SixLabors.ImageSharp; using SixLabors.ImageSharp.Drawing.Processing; -using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SKIT.FlurlHttpClient.Wechat.Api; @@ -855,10 +854,7 @@ namespace CoreCms.Net.Services //文件硬地址 var savePath = _webHostEnvironment.WebRootPath + "/static/poster/"; - //用户二维码头像 var qrCodeDir = _webHostEnvironment.WebRootPath + "/static/qrCode/weChat/" + otherData; - - //如果文件夹不存在，则创建文件夹 if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath); @@ -886,13 +882,14 @@ namespace CoreCms.Net.Services var images = goodModel.images.Split(","); if (images.Any()) { + var image = images[0]; //创建一个背景宽度为400X600的底图 using var imageTemple = new SixLabors.ImageSharp.Image(400, 600); //设置底图的背景色为白色 imageTemple.Mutate(x => x.BackgroundColor(SixLabors.ImageSharp.Color.White)); //绘制商品图片（网络下载图片） HttpClient client = new HttpClient(); - HttpResponseMessage response = await client.GetAsync(goodModel.image); + HttpResponseMessage response = await client.GetAsync(image); response.EnsureSuccessStatusCode(); var stream = await response.Content.ReadAsStreamAsync(); //载入下载的图片流 @@ -904,22 +901,15 @@ namespace CoreCms.Net.Services }); //将商品大图合并到背景图上 imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1)); - - //如果已经存在用户头像的情况下。则附加渲染二维码 - //QrCode 根目录 - if (File.Exists(qrCodeDir)) + //将用户的分享二维码合并大背景图上 + var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); + //将二维码缩略至120X120 + imageQrcode.Mutate(x => { - //将用户的分享二维码合并大背景图上 - var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); - //将二维码缩略至120X120 - imageQrcode.Mutate(x => - { - x.Resize(120, 120); - }); - //将二维码图片合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); - } - + x.Resize(120, 120); + }); + //将二维码图片合并到背景图上 + imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); //构建字体//装载字体(ttf)（而且字体一定要支持简体中文的） var fonts = new FontCollection(); SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf"); @@ -992,22 +982,15 @@ namespace CoreCms.Net.Services }); //将商品大图合并到背景图上 imageTemple.Mutate(x => x.DrawImage(imageThumbnail, new SixLabors.ImageSharp.Point(0, 0), 1)); - - //如果已经存在用户头像的情况下。则附加渲染二维码 - //QrCode 根目录 - if (File.Exists(qrCodeDir)) + //将用户的分享二维码合并大背景图上 + var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); + //将二维码缩略至120X120 + imageQrcode.Mutate(x => { - //将用户的分享二维码合并大背景图上 - var imageQrcode = await SixLabors.ImageSharp.Image.LoadAsync(qrCodeDir); - //将二维码缩略至120X120 - imageQrcode.Mutate(x => - { - x.Resize(120, 120); - }); - //将二维码图片合并到背景图上 - imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); - } - + x.Resize(120, 120); + }); + //将二维码图片合并到背景图上 + imageTemple.Mutate(x => x.DrawImage(imageQrcode, new SixLabors.ImageSharp.Point(275, 420), 1)); //构建字体//装载字体(ttf)（而且字体一定要支持简体中文的） var fonts = new FontCollection(); SixLabors.Fonts.FontFamily fontFamily = fonts.Install(_webHostEnvironment.WebRootPath + "/fonts/SourceHanSansK-Normal.ttf"); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue index 18651efd..e93023db 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/solitaire/list/list.vue @@ -34,7 +34,9 @@ {{item.title}} - + + + {{item.description}} 截止时间：{{ $u.timeFormat(item.endTime, 'yyyy-mm-dd hh:MM:ss') }} @@ -59,9 +61,9 @@ + + + \ No newline at end of file diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj index 38888c78..5a34400d 100644 --- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj +++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.csproj @@ -57,17 +57,17 @@ - + - + - +