From 73b3813c2d110bf446f251350f120bb1e2b51d0c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 10:45:14 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  203 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 155 insertions(+), 48 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 200bb4a..72a594c 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -32,14 +32,19 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row layui-col-space10 layui-form-item">
+                                        <div class="layui-form-item">
                                             <div class="layui-col-lg6">
                                                 <label class="layui-form-label febs-form-item-require">商品分类:</label>
                                                 <div class="layui-input-block">
-<!--                                                    <select name="categoryId" class="categary-addPeoduct">-->
-<!--                                                        <option value="">请选择</option>-->
-<!--                                                    </select>-->
                                                     <div id="goods-category"></div>
+                                                </div>
+                                            </div>
+
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label">是否主推:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="radio" name="isHot" value="1" title="是"  />
+                                                    <input type="radio" name="isHot" value="2" title="否"  checked />
                                                 </div>
                                             </div>
                                         </div>
@@ -87,29 +92,29 @@
                                                 <select name="isNormal" class="goods-type"
                                                         lay-filter="goods-type-select">
                                                     <option value="1">普通商品区</option>
-                                                    <option value="2">套餐区</option>
+<!--                                                    <option value="2">套餐区</option>-->
                                                 </select>
                                             </div>
                                         </div>
 
-                                        <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">静态倍数</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="staticMulti" placeholder="请输入静态倍数"
-                                                       autoComplete="off" class="layui-input">
-                                                <div class="layui-form-mid layui-word-aux">支付后,赠送(购买金额*静态倍数)的赠送积分
-                                                </div>
-                                            </div>
-                                        </div>
+<!--                                        <div class="layui-form-item febs-hide tc-set">-->
+<!--                                            <label class="layui-form-label">静态倍数</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="text" name="staticMulti" placeholder="请输入静态倍数"-->
+<!--                                                       autoComplete="off" class="layui-input">-->
+<!--                                                <div class="layui-form-mid layui-word-aux">支付后,赠送(购买金额*静态倍数)的赠送积分-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
 
-                                        <div class="layui-form-item febs-hide tc-set">
-                                            <label class="layui-form-label">静态占比(%)</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="staticProp" placeholder="请输入静态占比"
-                                                       autoComplete="off" class="layui-input">
-                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>
-                                            </div>
-                                        </div>
+<!--                                        <div class="layui-form-item febs-hide tc-set">-->
+<!--                                            <label class="layui-form-label">静态占比(%)</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="text" name="staticProp" placeholder="请输入静态占比"-->
+<!--                                                       autoComplete="off" class="layui-input">-->
+<!--                                                <div class="layui-form-mid layui-word-aux">所有套餐静态占比相加应等于100%</div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
                                     </div>
 
                                     <div class="layui-tab-item">
@@ -125,6 +130,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="demo2"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -149,6 +155,7 @@
                                                                 style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="thumbsBanners"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -158,6 +165,16 @@
                                             <div class="layui-input-block">
                                                 <input type="text" id="thumbs" lay-verify="required" name="thumbs"
                                                        autoComplete="off" class="layui-input" readOnly>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">商品参数:</label>
+                                            <div class="layui-input-block">
+                                                <label>
+                                                    <textarea name="goodsParameter" rows="5" autoComplete="off"
+                                                              class="layui-textarea"></textarea>
+                                                </label>
                                             </div>
                                         </div>
 
@@ -199,12 +216,27 @@
                                             </div>
                                         </div>
 
+<!--                                        <div class="layui-form-item">-->
+<!--                                            <label class="layui-form-label">设置运费:</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="radio" name="hasCarriage" value="1" title="开启" lay-filter="hasCarriage" />-->
+<!--                                                <input type="radio" name="hasCarriage" value="2" title="关闭" lay-filter="hasCarriage" checked />-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+
+<!--                                        <div class="layui-form-item carriage-input febs-hide">-->
+<!--                                            <label class="layui-form-label">运费:</label>-->
+<!--                                            <div class="layui-input-block">-->
+<!--                                                <input type="text" name="carriage" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+
                                         <blockquote class="layui-elem-quote blue-border">多规格设置</blockquote>
                                         <div class="layui-col-lg6">
                                             <label class="layui-form-label">开启多规格:</label>
                                             <div class="layui-input-block">
-                                                <input type="radio" name="isSku" value="1" title="是"
-                                                       lay-filter="isSku"/>
+<!--                                                <input type="radio" name="isSku" value="1" title="是"-->
+<!--                                                       lay-filter="isSku"/>-->
                                                 <input type="radio" name="isSku" value="2" title="否" lay-filter="isSku"
                                                        checked/>
                                             </div>
@@ -261,6 +293,13 @@
 
     .layui-table-cell {
         height: auto;
+    }
+
+    .layui-upload-list {
+        margin: 0 !important;
+    }
+    .multi-images {
+        margin: 0 5px !important;
     }
 </style>
 <script type="text/html" id="toolbar">
@@ -321,6 +360,9 @@
             prop : {
                 value : 'id',
                 children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
             },
             radio: true,
             clickClose: true,
@@ -410,6 +452,14 @@
             }
         });
 
+        form.on('radio(hasCarriage)', function(data){
+            if (data.value == 2) {
+                $('.carriage-input').hide();
+            } else {
+                $('.carriage-input').show();
+            }
+        });
+
         function addTableDate(data) {
             var hasData = table.cache['multiSku'];
 
@@ -496,39 +546,90 @@
         //多图片上传
         upload.render({
             elem: '#thumbsBanner'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,before: function(obj){
                 //预读本地文件示例,不支持ie8
-                obj.preview(function (index, file, result) {
-                    $('#thumbsBanners').append('<img src="' + result + '" alt="' + file.name + '" class="layui-upload-img" style="width: 100px">')
+                obj.preview(function(index, file, result){
+                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
                 });
             }
-            , done: function (res) {
+            ,done: function(res){
                 var thumbs = $("#thumbs").val();
-                if (thumbs == '') {
+                if(thumbs == ''){
                     $("#thumbs").val(res.data.src);
-                } else {
+                }else{
                     $("#thumbs").val(thumbs + ',' + res.data.src);
                 }
+
+                imgUnBind(".multi-images");
+                imgMultiBind();
             }
         });
+
+        function imgUnBind(className) {
+            $(className).each(function() {
+                $(this).unbind('dblclick');
+            })
+        }
+
+        function imgMultiBind() {
+            $(".multi-images").each(function(index, element) {
+                $(this).on("dblclick", function() {
+                    var imgThumb = $(".multi-images")[index];
+                    $(imgThumb).remove();
+
+                    var images = $("#thumbs").val();
+                    var imagesArr;
+                    if (images) {
+                        imagesArr = images.split(",");
+                        imagesArr.splice(index, 1);
+                        images = imagesArr.join(",");
+                    }
+                    $("#thumbs").val(images);
+
+                    imgUnBind(".multi-images");
+                    imgMultiBind();
+                });
+            })
+        }
 
         //图片上传
         upload.render({
             elem: '#test2'
-            , url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-            , multiple: true
-            , before: function (obj) {
+            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
+            ,multiple: true
+            ,before: function(obj){
                 //预读本地文件示例,不支持ie8
-                obj.preview(function (index, file, result) {
-                    $('#demo2').append('<img src="' + result + '" alt="' + file.name + '" class="layui-upload-img" style="width: 100px">')
+                obj.preview(function(index, file, result){
+                    if ($("#thumb").val()) {
+                        $('#demo2').html('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+                    } else {
+                        $('#demo2').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img single-image" style="width: 130px">')
+                    }
+
                 });
             }
-            , done: function (res) {
+            ,done: function(res){
                 $("#thumb").val(res.data.src);
+
+                imgUnBind(".single-image");
+                imgSingleBind();
             }
         });
+
+        function imgSingleBind() {
+            $(".single-image").each(function(index, element) {
+                $(this).on("dblclick", function() {
+                    var imgThumb = $(".single-image")[index];
+                    $(imgThumb).remove();
+                    $("#thumb").val("");
+
+                    imgUnBind(".single-image");
+                    imgSingleBind();
+                });
+            })
+        }
 
         function initValue() {
             var images = goodsInfo.images;
@@ -540,6 +641,8 @@
                 "unit": goodsInfo.unit,
                 "stock": goodsInfo.stock,
                 "volume": goodsInfo.volume,
+                "isHot": goodsInfo.isHot,
+                "goodsParameter": goodsInfo.goodsParameter,
                 "goodsIntrodution": goodsInfo.goodsIntrodution,
                 "isNormal": goodsInfo.isNormal,
                 "staticMulti": goodsInfo.staticMulti,
@@ -552,7 +655,6 @@
                 "thumbs": thumbs
             });
 
-            console.log(goodsInfo.categoryId);
             var arr = [];
             arr.push(goodsInfo.categoryId)
             category.setValue(arr);
@@ -563,20 +665,22 @@
 
             if (goodsInfo.isSku == 1) {
                 $(".multi-sku-table").show();
-            }
 
-            var skus = goodsInfo.skus;
-            for (let i = 0; i < skus.length; i++) {
-                skus[i].index = i+1;
+                var skus = goodsInfo.skus;
+                for (let i = 0; i < skus.length; i++) {
+                    skus[i].index = i+1;
+                }
             }
 
             for (let i = 0; i < images.length; i++) {
-                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img" style="width: 100px">')
+                $('#thumbsBanners').append('<img src="' + images[i] + '" alt="" class="layui-upload-img multi-images" style="width: 130px">')
             }
 
-            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img" style="width: 100px">')
+            $('#demo2').append('<img src="' + goodsInfo.thumb + '" alt="" class="layui-upload-img single-image" style="width: 130px">')
 
-            console.log(goodsInfo.goodsDetails);
+
+            imgSingleBind();
+            imgMultiBind();
 
             window.editor = E.createEditor({
                 html: goodsInfo.goodsDetails,
@@ -590,8 +694,11 @@
                 selector: '#toolbar-container',
                 mode: 'default'
             });
-            tableSkuData = skus;
-            reloadTable(skus);
+
+            if (skus) {
+                tableSkuData = skus;
+                reloadTable(skus);
+            }
         }
 
         form.on('submit(goods-update-form-submit)', function (data) {

--
Gitblit v1.9.1