From d0ab507251a85ed8ccd9c18b0f522a58e829f734 Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Mon, 3 Jun 2024 21:08:26 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=90=8E=E6=98=BE=E7=A4=BAUndefined=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue index da601e5..5a1951a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/details/details.vue @@ -6,7 +6,7 @@ - {{ info.title }} + {{ info.title||"" }} {{ info.createTime }} -- Gitee From 72fad34ad5f195a807c84f7502c83ee93808bd23 Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:48:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreShop/pages/activity/seckill/details/details.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 19e9b94..6495a55 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 @@ -387,7 +387,7 @@ current: 0, // init tab位 goodsId: 0, // 商品id groupId: 0, // 团购ID - goodsInfo: {}, // 商品详情 + goodsInfo: { album: [] }, // 商品详情 cartNums: 0, // 购物车数量 product: {}, // 规格详情 goodsParams: [], // 商品参数信息 -- Gitee From 25417795fe3035b2aed4c46331153a62292e5e56 Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:31:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=90=8E=E5=8F=B0[=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=B8=8B=E7=9A=84[=E6=99=AE=E9=80=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8]=E4=B8=AD=E7=82=B9=E5=87=BB[=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B]=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84[?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8D=95/=E9=80=80=E6=AC=BE=E5=8D=95]=20?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E9=80=80=E6=AC=BE=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BAHTML=E6=96=87=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html index c213d07..0f879c4 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html @@ -295,7 +295,7 @@ {{item.paymentCodeName}} {{item.tradeNo}} {{item.money}} - {{item.statusName}} + {{-item.statusName}} {{item.createTime}} {{# }); }} -- Gitee From 1c65ab7e89f20450251959b5bb94a88463a7cb2a Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Thu, 6 Jun 2024 07:30:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E6=B2=A1=E6=9C=89=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=97=A0=E6=95=88=E4=BB=A5=E5=8F=8A=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue index f530a1e..38729d8 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue @@ -71,7 +71,7 @@ beforePage.$vm.userShip = data; beforePage.$vm.params.areaId = data.areaId; - + this.$store.state.userShip = data; uni.navigateBack({ delta: 1 }); -- Gitee From 64935c31f36a27cdd64bc6e75e47b6e8c8bcab55 Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Sun, 23 Jun 2024 13:30:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81SKU?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E5=90=8E=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index 975245d..b5cfc5f 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -188,6 +188,11 @@ namespace CoreCms.Net.Repository obj.spesDesc = p.spesDesc; obj.isDefalut = p.isDefalut; obj.isDel = false; + obj.images = p.images; + if (string.IsNullOrWhiteSpace(obj.images) || !obj.images.Contains(".jpg")) + { + obj.images = goods.image; + } products.Add(obj); var pd = new CoreCmsProductsDistribution(); @@ -235,7 +240,8 @@ namespace CoreCms.Net.Repository obj.spesDesc = oldObj.spesDesc; obj.isDefalut = true; obj.isDel = false; - if (string.IsNullOrEmpty(obj.images) || !obj.images.Contains(".jpg")) + obj.images = oldObj.images; + if (string.IsNullOrWhiteSpace(obj.images) || !obj.images.Contains(".jpg")) { obj.images = goods.image; } -- Gitee From d7d14c1cc927c78d89b462a9e036825e5e004cab Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Sun, 23 Jun 2024 16:50:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E8=84=9A=E6=9C=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreShop/pages/activity/groupBuying/details/details.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue index c4f88a9..d7f5d9d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue @@ -382,7 +382,7 @@ current: 0, // init tab位 goodsId: 0, // 商品id groupId: 0, // 团购ID - goodsInfo: {}, // 商品详情 + goodsInfo: {album:[]}, // 商品详情 cartNums: 0, // 购物车数量 product: {}, // 规格详情 goodsParams: [], // 商品参数信息 -- Gitee From c043ded2146d0a6ec9133dfcf1fb41c7baf35436 Mon Sep 17 00:00:00 2001 From: finder <2289549+findersky@users.noreply.github.com> Date: Sun, 23 Jun 2024 23:38:19 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E7=A7=92=E6=9D=80=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=B5=B7=E6=8A=A5=E6=97=A0=E6=95=88=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=8E=A5=E5=8F=A3=E5=93=8D=E5=BA=94=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/coreshop-share/shareByWx.vue | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue index c0c7810..333b8bf 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByWx.vue @@ -79,6 +79,10 @@ // 生成海报 createPoster() { let data = {}; + let userToken = this.$db.get('userToken'); + if (userToken) { + data.token = userToken; + } if (this.shareType == 1) { //商品 data = { @@ -90,10 +94,7 @@ type: 3,//海报 client: 2 } - let userToken = this.$db.get('userToken') - if (userToken) { - data.token = userToken - } + } else if (this.shareType == 3) { //拼团 data = { @@ -107,9 +108,18 @@ type: 3,//海报 client: 2 } - let userToken = this.$db.get('userToken') - if (userToken) { - data.token = userToken + + } else if (this.shareType == 10) { + //团购秒杀 + data = { + page: 10, //商品 + url: 'pages/share/jump/jump', + params: { + goodsId: this.goodsId, + groupId: this.groupId, + }, + type: 3,//海报 + client: 2 } } this.$u.api.share(data).then(res => { -- Gitee