diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index 975245df3cc47cd4bddb3e8e5d0a81f1e8617e24..b5cfc5f1e9c38fa9e5addec197fc6f03489b15c5 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; } 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 c0c7810711c7bfbc68c412d52e8b1597bbe7cc14..333b8bf08676f0fbdc2fc8a027cdd6392947806a 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 => { 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 c4f88a9c268730a89cec1aa8ddc23d0ebfacf965..d7f5d9d8ec51454f65b15b2404f1677babb642dc 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: [], // 商品参数信息 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 19e9b9440ccf553650f30c146cd3db65e36c6196..6495a554eb4e42613d4751ebd32e1cd2b6422b93 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: [], // 商品参数信息 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 da601e50244791c210513c4a7abadf026299b6d0..5a1951ab1f4dcf91e807e5c33d30d86d3c29f4a0 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 }} 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 f530a1e6ba83718a5e9c11656c01ebbc3659b30b..38729d826ae447c71a75784b30179eaab4398d72 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 }); 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 c213d077d69e5b4e4496dd499e62151d6da59a95..0f879c4980fb9dbaac21dbf07868dce416c0379d 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}} {{# }); }}