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 @@ - + - + - +