From 29630a8495167ad91582842144c81cf10a78473c Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Fri, 2 Jul 2021 15:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue                      | 14 +++++-----
 pages/product/product/goods/-goods-intro.vue | 28 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 6cddd8f..85be1ce 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -153,7 +153,7 @@
           <storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />
 
           <!-- 宝贝详情 -->
-          <GoodsIntro id="main9" :res="goodsDetail" :goodsId="goodsDetail.goodsId" v-if="goodsDetail.id" />
+          <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId" v-if="goodsDetail.id" />
 
           <!-- 宝贝推荐 -->
           <GoodsRecommend id="main11" :res="likeGoodsList" />
@@ -327,7 +327,8 @@ export default {
       header: {
         top: 0,
         height: 50,
-      },
+      },
+	  goodsParams: [], // 商品参数
       headerFlag: false, //顶部导航显示与否
       headerList: [
         //顶部导航文字按照规则来 详情全局搜索
@@ -470,7 +471,7 @@ export default {
           this.init(data[0], data[1], data[2]);
         }
       });
-    } else {
+    } else {
       this.init(
         this.routerVal.id,
         this.routerVal.goodsId,
@@ -499,15 +500,13 @@ export default {
         return true;
       }
     },
-	selectSku (idObj) {
-		console.log(idObj)
+	selectSku (idObj) { // 选择sku的回调
 		this.init(idObj.skuId,idObj.goodsId)
 	},
     /**
      * 初始化信息
      */
     async init(id, goodsId, distributionId) {
-		console.log(id, goodsId)
       this.isGroup = false; //初始化拼团
       this.productId = id; // skuId
       // 这里请求获取到页面数据  解析数据
@@ -533,7 +532,8 @@ export default {
       /**商品信息以及规格信息存储 */
       this.goodsDetail = response.data.result.data;
       this.goodsSpec = response.data.result.specs;
-      this.PromotionList = response.data.result.promotionMap;
+      this.PromotionList = response.data.result.promotionMap;
+	  this.goodsParams = response.data.result.goodsParamsDTOList || []
 
       // 判断是否拼团活动或者积分商品 如果有则显示拼团活动信息
       this.PromotionList &&
diff --git a/pages/product/product/goods/-goods-intro.vue b/pages/product/product/goods/-goods-intro.vue
index 9a40dbc..7ebd5b6 100644
--- a/pages/product/product/goods/-goods-intro.vue
+++ b/pages/product/product/goods/-goods-intro.vue
@@ -18,20 +18,19 @@
           <div class="goods-detail-box">
             <div class="goods-detail-item goods-active">商品参数</div>
           </div>
-          <u-divider>商品参数</u-divider>
-           <div class="param-list" v-if="!goodsDetail.goodsParamsList || goodsDetail.goodsParamsList.length == 0">
+          <!-- <u-divider>商品参数</u-divider> -->
+          <div class="param-list" v-if="goodsParams.length == 0">
               <u-empty text="暂无商品参数" mode="list"></u-empty>
           </div>
-          <div class="param-list"  v-if="goodsDetail.goodsParamsList && goodsDetail.goodsParamsList.length != 0">
-            <div class="param-item" v-for="(param,index) in goodsDetail.goodsParamsList" :key="index">
-              <div class="param-left">
-                {{param.paramName}}
-              </div>
-              <div class="param-right">
-                {{param.paramValue}}</div>
-            </div>
-          </div>
-         
+		  <div class="params-group" v-for="(group,groupIndex) in goodsParams" :key="groupIndex">
+			<view style="font-weight: bold;margin-left: 10px;">{{group.groupName}}</view> 
+			<div class="param-list">
+			  <div class="param-item" v-for="(param,index) in group.goodsParamsItemDTOList" :key="index">
+			    <div class="param-left">{{param.paramName}}</div>
+			    <div class="param-right">{{param.paramValue}}</div>
+			  </div>
+			</div>
+		  </div>
         </view>
       </view>
     </view>
@@ -43,11 +42,12 @@ import { getGoodsMessage } from "@/api/goods";
 export default {
   data() {
     return {
-      goodsDetail: "",
+      goodsDetail: ""
     };
   },
-  props: ["res", "goodsId"],
+  props: ["res", "goodsId", "goodsParams"],
   async mounted() {
+	  console.log(this.res)
     let res = await getGoodsMessage(this.goodsId);
     if (res.data.success) {
       this.goodsDetail = res.data.result;