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/goodsAddNew.html |  165 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 118 insertions(+), 47 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index ff0bfa9..d9d36f6 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -14,6 +14,8 @@
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <blockquote class="layui-elem-quote blue-border">基本信息设置</blockquote>
+                                        <div class="layui-form-mid layui-word-aux">商品新增后,会自动计算补贴金额,按商品现价计算</div>
+                                        <div class="layui-form-mid layui-word-aux">商品新增后,会自动计算星级等级,按商品现价设置</div>
                                         <div class="layui-row layui-col-space10 layui-form-item">
                                             <div class="layui-col-lg6">
                                                 <label class="layui-form-label febs-form-item-require">商品名称:</label>
@@ -28,14 +30,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>
@@ -78,26 +85,26 @@
                                             <div class="layui-input-block">
                                                 <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">
@@ -109,6 +116,7 @@
                                                     <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="demo2"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -128,6 +136,7 @@
                                                     <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                                                         <div class="layui-upload-list" id="thumbsBanners"></div>
                                                     </blockquote>
+                                                    <div class="layui-word-aux">双击图片删除</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -136,6 +145,15 @@
                                             <label class="layui-form-label">缩略图链接:</label>
                                             <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>
 
@@ -174,11 +192,26 @@
                                             </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>
                                         </div>
@@ -225,6 +258,12 @@
     }
     .layui-table-cell {
         height:auto;
+    }
+    .layui-upload-list {
+        margin: 0 !important;
+    }
+    .multi-images {
+        margin: 0 5px !important;
     }
 </style>
 <script type="text/html" id="toolbar">
@@ -375,6 +414,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'];
 
@@ -467,7 +514,7 @@
             ,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">')
+                    $('#thumbsBanners').append('<img src="'+ result +'" alt="'+ file.name +'" class="layui-upload-img multi-images" style="width: 130px">')
                 });
             }
             ,done: function(res){
@@ -477,8 +524,38 @@
                 }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({
@@ -488,40 +565,34 @@
             ,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">')
+                    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){
                 $("#thumb").val(res.data.src);
+
+                imgUnBind(".single-image");
+                imgSingleBind();
             }
         });
 
-        // layedit.set({	//设置图片接口
-        //     uploadImage: {
-        //         url: 'admin/goods/uploadFileBase64', //接口url
-        //         type: 'post',
-        //     }
-        // });
-        // //创建一个编辑器
-        // var index = layedit.build('goodsDetailEdit', { height: '300px', });
-        // //提交时把值同步到文本域中
-        // form.verify({
-        //     //content富文本域中的lay-verify值
-        //     goodsDetails: function(value) {
-        //         return layedit.sync(index);
-        //     }
-        // });
+        function imgSingleBind() {
+            $(".single-image").each(function(index, element) {
+                $(this).on("dblclick", function() {
+                    var imgThumb = $(".single-image")[index];
+                    $(imgThumb).remove();
+                    $("#thumb").val("");
 
-
-        // upload.render({
-        //     elem: '#skuImg'+index
-        //     ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
-        //     ,done: function(res){
-        //         febs.alert.success(res.data.src);
-        //         $('#imageUrls' + index).attr('src', res.data.src);
-        //         $('#skuImage'+ index).val(res.data.src);
-        //     }
-        // });
+                    imgUnBind(".single-image");
+                    imgSingleBind();
+                });
+            })
+        }
 
         form.on('submit(goods-add-form-submit)', function (data) {
             data.field.goodsType = 1;

--
Gitblit v1.9.1