From 89e2b353cb22e38dbe0a7144b26fa69766cf7f9b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 10:12:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/resources/templates/febs/views/modules/goods/detailGoods.html |   76 ++++++++++++++++++++++++++++++++-----
 1 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/detailGoods.html b/src/main/resources/templates/febs/views/modules/goods/detailGoods.html
index 2e55f91..9c45f8b 100644
--- a/src/main/resources/templates/febs/views/modules/goods/detailGoods.html
+++ b/src/main/resources/templates/febs/views/modules/goods/detailGoods.html
@@ -75,17 +75,17 @@
                 <input type="text" name="goodsIntrodution" autocomplete="off" class="layui-input" >
             </div>
         </div>
-        <div class="layui-row layui-col-space10 layui-form-item">
-            <div class="layui-col-lg6">
-                <label class="layui-form-label">规格:</label>
-                <div class="layui-input-block">
-                    <input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">
-                </div>
-            </div>
-            <div class="layui-col-lg6">
-                <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" id="test3" >添加</button>
-            </div>
-        </div>
+<!--        <div class="layui-row layui-col-space10 layui-form-item">-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <label class="layui-form-label">规格:</label>-->
+<!--                <div class="layui-input-block">-->
+<!--                    <input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="layui-col-lg6">-->
+<!--                <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" id="test3" >添加</button>-->
+<!--            </div>-->
+<!--        </div>-->
         <div id="attrWrap"></div>
         <div class="layui-form-item">
             <label class="layui-form-label">缩略图链接:</label>
@@ -161,11 +161,65 @@
 
         initUserValue();
 
+        function appendSku(sku,skuIndex){
+                var index = skuIndex;
+                let attrNameVal = sku.skuName;
+                let stockVal = sku.stock;
+                let skuVolume = sku.skuVolume;
+                let originalPrice = sku.originalPrice;
+                let presentPrice = sku.presentPrice;
+                let skuImage = sku.skuImage;
+                $('#attrWrap').append(`
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">规格详情:</label>
+                        <div class="layui-input-block layui-form-item item">
+                            <div style="float:left" >
+                                <div>
+                                    <input type="text" class="layui-input" value="` + attrNameVal + `" readonly >
+                                </div>
+                            </div>
+                            <div  style="float:left" >
+                                <div>
+                                    <img class="layui-upload-img" src="` + skuImage + `" style="width: 100px" readonly>
+                                </div>
+                            </div>
+                            <div style="float:left" >
+                                <div>
+                                    <input type="text" value="` + stockVal + `" placeholder="库存" autocomplete="off" class="layui-input" readonly>
+                                </div>
+                            </div>
+                            <div style="float:left" >
+                                <div>
+                                    <input type="text" value="` + skuVolume + `" placeholder="销售数量" autocomplete="off" class="layui-input" readonly>
+                                </div>
+                            </div>
+                            <div style="float:left" >
+                                <div>
+                                    <input type="text" value="` + originalPrice + `" placeholder="原价" autocomplete="off" class="layui-input" readonly>
+                                </div>
+                            </div>
+                            <div style="float:left" >
+                                <div>
+                                    <input type="text" value="` + presentPrice + `" placeholder="现价" autocomplete="off" class="layui-input" readonly>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+            `)
+        }
+
         function initUserValue() {
+            var skuIndex = 0;
+            let skuLength = mailGoodsDetail.mailGoodsSkuDetailVo.length;
+            for(var skuIndex = 0; skuIndex < skuLength; skuIndex++){
+                appendSku(mailGoodsDetail.mailGoodsSkuDetailVo[skuIndex],skuIndex);
+            }
+
             form.val("goods-detail-form", {
                 "id": mailGoodsDetail.id,
                 "goodsNo": mailGoodsDetail.goodsNo,
                 "categoryId": mailGoodsDetail.categoryId,
+                "mailGoodsSkuDetailVo": mailGoodsDetail.mailGoodsSkuDetailVo,
                 "unit": mailGoodsDetail.unit,
                 "originalPrice": mailGoodsDetail.originalPrice,
                 "presentPrice": mailGoodsDetail.presentPrice,

--
Gitblit v1.9.1