From 93efdd425b15874f85ac400eeea0d21aab07c6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Wed, 11 May 2022 21:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9Esku=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=8C=BA=E9=97=B4=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E3=80=90=C2=A5100~395=E3=80=91=EF=BC=8C=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AAsku=E5=90=8E=E8=87=AA=E5=8A=A8=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E5=85=B6=E5=85=B7=E4=BD=93=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Good/CoreCmsGoodsPartial.cs      | 20 +++++++++++++++++++
 .../Good/CoreCmsGoodsServices.cs              |  9 +++++++++
 .../coreshop-spec/coreshop-spec.vue           |  3 ---
 .../pages/goods/goodDetails/goodDetails.vue   | 17 +++++++++++++---
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs b/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
index bd86af63..59891c5e 100644
--- a/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
+++ b/CoreCms.Net.Model/Entities/Good/CoreCmsGoodsPartial.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using CoreCms.Net.Model.FromBody;
 using SqlSugar;
 
 namespace CoreCms.Net.Model.Entities
@@ -108,6 +109,11 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)]
         public List<CoreCmsProducts> sku { get; set; } = new();
 
+        /// <summary>
+        /// 商品规格
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public Dictionary<string, Dictionary<string, DefaultSpesDesc>> specification { get; set; } = new();
 
         /// <summary>
         ///     是否收藏
@@ -176,5 +182,19 @@ namespace CoreCms.Net.Model.Entities
         [SugarColumn(IsIgnore = true)] public DateTime groupEndTime { get; set; }
 
         [SugarColumn(IsIgnore = true)] public int groupTimestamp { get; set; }
+
+
+        /// <summary>
+        ///     sku最小价格
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public decimal minPrice { get; set; } = 0;
+
+        /// <summary>
+        ///     sku最大价格
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public decimal maxPrice { get; set; } = 0;
+
     }
 }
\ No newline at end of file
diff --git a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
index c6ca0960..ef57b02f 100644
--- a/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
+++ b/CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs
@@ -538,6 +538,15 @@ namespace CoreCms.Net.Services
             model.freezeStock = getProductInfo.freezeStock;
             model.weight = getProductInfo.weight;
 
+            var minProduct = await _productsServices.QueryByClauseAsync(p => p.isDel == false && p.goodsId == id,
+                p => p.price, OrderByType.Asc);
+
+            var maxProduct = await _productsServices.QueryByClauseAsync(p => p.isDel == false && p.goodsId == id,
+                p => p.price, OrderByType.Desc);
+
+            model.minPrice = minProduct.price;
+            model.maxPrice = maxProduct.price;
+
             //获取品牌
             var brand = await _brandServices.QueryByIdAsync(model.brandId);
             model.brand = brand;
diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
index b6724634..d881f971 100644
--- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-spec/coreshop-spec.vue
@@ -1,6 +1,5 @@
 <template>
     <view class="coreshop-padding-bottom-10">
-        <view>dsdsads</view>
         <view class="select-item" v-for="(item, index) in specList" :key="index">
             <view class="coreshop-text-black coreshop-margin-10  coreshop-solid-bottom coreshop-padding-bottom-10">{{ index }}</view>
             <view class="select-btn">
@@ -30,8 +29,6 @@
             // #ifdef H5 || APP-PLUS
             this.specList = JSON.parse(this.spesData);
             // #endif
-            console.log(this.spesData);
-            console.log(this.specList);
         },
         watch: {
             spesData: function (val) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
index 67f882da..228be8a0 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue
@@ -13,9 +13,10 @@
         <!--幻灯片-->
         <u-swiper height="calc(750rpx * 6 / 6)" radius="0" :list="goodsInfo.album" :autoplay="autoplay" indicator indicatorMode="line" circular @click="clickImg"></u-swiper>
         <!--限时秒杀-->
-        <view class="coreshop-limited-seckill-box coreshop-bg-red">
-            <text class="coreshop-text-price coreshop-font-20">{{ product.price || '0.00' }}</text>
-            <view class="coreshop-font-xs coreshop-cost-price-num price-4">
+        <view class="coreshop-limited-seckill-box coreshop-bg-red coreshop-flex coreshop-justify-start">
+            <!--<text class="coreshop-text-price coreshop-font-20">{{ product.price || '0.00' }}</text>-->
+            <text class="coreshop-text-price coreshop-font-20">{{ priceSection }}</text>
+            <view class="coreshop-font-xs price-4 coreshop-margin-left-20">
                 <view v-if="pointSwitch==1 && pointExchangeModel==2 && pointShowExchangePrice==1 && product.pointsDeduction > 0">
                     <view class="coreshop-padding-bottom-5 coreshop-font-14">
                         兑换价：{{pointDiscountedProportion * product.pointsDeduction }}{{ pointShowName}}+{{ product.price - product.pointsDeduction}} 元
@@ -426,6 +427,7 @@
                 goodsInfo: {}, // 商品详情
                 cartNums: 0, // 购物车数量
                 product: {}, // 货品详情
+                priceSection:'',
                 shopRecommendData: [], // 本店推荐数据
                 otherRecommendData: [], // 其他数据
                 goodsParams: [], // 商品参数信息
@@ -607,6 +609,13 @@
                             let products = res.data.product;
                             _this.goodsInfo = info;
 
+                            //价格区间
+                            if (res.data.minPrice != res.data.maxPrice) {
+                                this.priceSection = res.data.minPrice + '~' + res.data.maxPrice;
+                            } else {
+                                this.priceSection = products.price;
+                            }
+                            
                             if (_this.goodsInfo.album) {
                                 var albums = [];
                                 for (var i = 0; i < _this.goodsInfo.album.length; i++) {
@@ -745,6 +754,8 @@
                             // 切换规格判断可购买数量
                             this.buyNum = res.data.stock >= this.minBuyNum ? this.minBuyNum : res.data.stock;
                             this.product = this.spesClassHandle(res.data);
+                            this.priceSection = this.product.price;
+
                         }
                     });
                     uni.showLoading({