From eebfbc27f6231bc72de81918073fa3fef14b392d Mon Sep 17 00:00:00 2001 From: JianWeie Date: Thu, 15 Sep 2022 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=EF=BC=8C=E5=A4=B4=E6=9D=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=8A=9F=E8=83=BD=E3=80=82=E5=AE=8C=E5=96=84=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E6=96=B0=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreCms.Net.Uni-App.csproj | 3 + .../components/coreshop-fab/coreshop-fab.scss | 2 +- .../coreshop-share-alipay.vue | 130 --------- .../coreshop-share-tt/coreshop-share-tt.vue | 124 --------- .../groupBuyingDetails/groupBuyingDetails.vue | 6 - .../pinTuan/pinTuanDetails/pinTuanDetails.vue | 6 - .../seckill/seckillDetails/seckillDetails.vue | 6 - .../solitaireDetails/solitaireDetails.vue | 6 - .../pages/goods/goodDetails/goodDetails.vue | 258 +++++++----------- .../order/invitationGroup/invitationGroup.vue | 6 - .../static/style/style.mp.scss | 9 + 11 files changed, 117 insertions(+), 439 deletions(-) delete mode 100644 CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-alipay/coreshop-share-alipay.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-tt/coreshop-share-tt.vue diff --git a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj index 526a3e0e..0fcf7300 100644 --- a/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj +++ b/CoreCms.Net.Uni-App/CoreCms.Net.Uni-App.csproj @@ -7,10 +7,13 @@ + + + diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-fab/coreshop-fab.scss b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-fab/coreshop-fab.scss index 77de1206..3b6c5953 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-fab/coreshop-fab.scss +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-fab/coreshop-fab.scss @@ -12,7 +12,7 @@ &.left { left: 0; } &.right { right: 0; } &.top { top: 0; } - &.bottom { bottom: 0; } + &.bottom { bottom: 3px; } .icon-jia { color: #ffffff; font-size: 25px; transition: all 0.3s; width: 22px; height: 22px; &.active { transform: rotate(90deg); } } diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-alipay/coreshop-share-alipay.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-alipay/coreshop-share-alipay.vue deleted file mode 100644 index 62f98d63..00000000 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-alipay/coreshop-share-alipay.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-tt/coreshop-share-tt.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-tt/coreshop-share-tt.vue deleted file mode 100644 index 4709e0f3..00000000 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/components/coreshop-share-tt/coreshop-share-tt.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue index 363fbee0..53873220 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/groupBuying/groupBuyingDetails/groupBuyingDetails.vue @@ -148,12 +148,6 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue index 902133af..a366c373 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/pinTuan/pinTuanDetails/pinTuanDetails.vue @@ -299,12 +299,6 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue index 912dc2de..41fd240f 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/seckill/seckillDetails/seckillDetails.vue @@ -151,12 +151,6 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue index 8b6928df..d123e2c8 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/activity/solitaire/solitaireDetails/solitaireDetails.vue @@ -114,12 +114,6 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue index 0c4f6a8b..64a916b9 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/goods/goodDetails/goodDetails.vue @@ -15,7 +15,7 @@ - + ¥ @@ -23,31 +23,34 @@ {{ priceSection }} - - - 兑换价:{{pointDiscountedProportion * product.pointsDeduction }}{{ pointShowName}}+{{ product.price - product.pointsDeduction}} 元 - - 买就送:{{product.points}}{{ pointShowName}} - - - - 买就送:{{product.points}}{{ pointShowName}} - - + + + + 兑换价:{{pointDiscountedProportion * product.pointsDeduction }}{{ pointShowName}}+{{ product.price - product.pointsDeduction}}元 + + 买就送:{{product.points}}{{ pointShowName}} + + + + 买就送:{{product.points}}{{ pointShowName}} + + + + {{ goodsInfo.name || '' }} {{ goodsInfo.brief || '' }} - - + + @@ -70,12 +73,12 @@ - + - + 促销 - + {{item.name}} @@ -89,100 +92,117 @@ - + - - 服务 + + 服务 - - + + - + - + - - 发货 + + 发货 - - {{item.description}} + + {{item.description}} - - 规格 + + 规格 - + {{ product.spesDesc || ''}} - + - - - - 评价({{goodsComments.length}}) + + + + 评价({{goodsComments.length}}) - - + + - + - - - - - + + + + + + + + + {{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }} + {{ item.contentBody || ''}} + + + + + + + {{ item.createTime || ''}} {{ item.addon || ''}} + - - {{ (item.nickName && item.nickName != '')?item.nickName:item.mobile }} - {{ item.contentBody || ''}} - - - - - - - {{ item.createTime || ''}} {{ item.addon || ''}} + + + + 该商品暂无评价 + + + + + + + 参数 + + + + + {{item.name}} + + + {{item.value}} + + + 详情介绍 + + - - - - - - {{ item.name || ''}}: - {{ item.value || ''}} - - - - - - - + + + + @@ -195,12 +215,6 @@ - - - - - - @@ -209,13 +223,12 @@ - - - + + + 常见问题 - - + {{item.title}} @@ -223,70 +236,19 @@ - 查看更多问题 - - - - - - - - - - {{shopName}} - {{shareTitle}} - - 联系商家 - - - - - - 可直接获取商家地理位置信息 - - - 去地图 - - - - - - 本店推荐 - - - - - - - {{items.name}} - - {{items.price}}元 - - - - - - + 查看更多问题 - - - - - - - 为您推荐 - - - - - + + + 为您推荐 + - + - + @@ -305,13 +267,14 @@ + - + @@ -330,22 +293,21 @@ - + 加购物车 - + 立即购买 - @@ -417,7 +379,6 @@ product: {}, // 货品详情 priceSection: '', shopRecommendData: [], // 本店推荐数据 - otherRecommendData: [], // 其他数据 goodsParams: [], // 商品参数信息 goodsComments: [], // 商品评论信息 type: 2, // 1加入购物车 2购买 @@ -768,17 +729,6 @@ _this.$u.toast(res.msg) } }); - - let data = { - id: 10 - } - _this.$u.api.getGoodsRecommendList(data).then(res => { - if (res.status) { - _this.otherRecommendData = _this.$u.randomArray(res.data); - } else { - _this.$u.toast(res.msg) - } - }); }, // 获取购物车数量 getCartNums() { diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/order/invitationGroup/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/order/invitationGroup/invitationGroup.vue index b5b02c17..632893bc 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/order/invitationGroup/invitationGroup.vue +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/pages/member/order/invitationGroup/invitationGroup.vue @@ -46,12 +46,6 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/static/style/style.mp.scss b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/static/style/style.mp.scss index b76425ee..29198f77 100644 --- a/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/static/style/style.mp.scss +++ b/CoreCms.Net.Uni-App/CoreShopProfessional-UniApp/static/style/style.mp.scss @@ -677,3 +677,12 @@ u-icon { line-height: 0; } .contact-btn { margin: 0 auto; } + +/*商品参数*/ +.goods-param-box { border: 0.5px solid #c3c3c3; border-radius: 6px; margin-top: 12rpx; } +.goods-param-line { border-bottom: 0.5px solid #c3c3c3; display: flex; height: 34px; line-height: 34px; } + .goods-param-line:last-child { border-bottom: 0; } + .goods-param-line .name { background: #f3f3f3; border-right: 0.5px solid #c3c3c3; color: #616161; font-size: 12px; height: 34px; line-height: 34px; text-align: center; width: 95px; } + .goods-param-line .value { color: #2f2f2f; font-size: 12px; padding-left: 12px; width: 215px; } + +.line-70 { background: #c3c3c3; height: 1px; margin-top: 3px; width: 34.5px; }