From 790ed3c2799b395cc2b51c7c070c8a73cd9203a1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 11 Sep 2023 17:43:47 +0800
Subject: [PATCH] 优惠卷

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 102 insertions(+), 15 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 eec8ee8..8f253a2 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -40,11 +40,18 @@
                                                 </div>
                                             </div>
 
-                                            <div class="layui-col-lg6">
+                                            <div class="layui-col-lg3">
                                                 <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 />
+                                                    <input type="radio" name="isHot" value="1" title="是" />
+                                                    <input type="radio" name="isHot" value="2" title="否" checked />
+                                                </div>
+                                            </div>
+
+                                            <div class="layui-col-lg3">
+                                                <label class="layui-form-label febs-form-item-require">序号:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="number" name="orderNumber" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
@@ -61,6 +68,8 @@
                                                 <label class="layui-form-label febs-form-item-require">重量:</label>
                                                 <div class="layui-input-block">
                                                     <input type="text" name="goodsWeight"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+
+                                                    <div class="layui-form-mid layui-word-aux">默认单位:克。请填写数字。如:1千克,则填入1000。</div>
                                                 </div>
                                             </div>
                                         </div>
@@ -189,8 +198,8 @@
                                             <div class="layui-input-block">
 <!--                                                <textarea id="lay_edit" lay-verify="goodsDetails" name="goodsDetails" class="layui-textarea"></textarea>-->
                                                 <div style="border: 1px solid #ccc;">
-                                                    <div id="toolbar-container" style="border-bottom: 1px solid #ccc;"></div>
-                                                    <div id="editor-container" style="height: 300px;"></div>
+                                                    <div id="toolbar-container-good-update" style="border-bottom: 1px solid #ccc;"></div>
+                                                    <div id="editor-container-good-update" style="height: 300px;"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -215,12 +224,36 @@
                                         </div>
 
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label febs-form-item-require">成本价:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="costPrice" lay-verify="required" placeholder=""
-                                                       autoComplete="off" class="layui-input">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">成本价:</label>
+                                                <div class="layui-input-block">
+                                                    <input type="text" name="costPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                                </div>
                                             </div>
                                         </div>
+<!--                                        <blockquote class="layui-elem-quote blue-border">代理价格</blockquote>-->
+<!--                                        <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>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelOnePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                            <div class="layui-col-lg6">-->
+<!--                                                <label class="layui-form-label febs-form-item-require">二级价格:</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelTwoPrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </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>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="text" name="levelThreePrice" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
 
                                         <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
                                         <div class="layui-form-item">
@@ -246,6 +279,16 @@
                                                 <label class="layui-form-label febs-form-item-require">邮费模板:</label>
                                                 <div class="layui-input-block">
                                                     <div id="carriage-rule"></div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <blockquote class="layui-elem-quote blue-border">优惠卷设置</blockquote>
+                                        <div class="layui-form-item coupon-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">优惠卷:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="coupon-rule"></div>
                                                 </div>
                                             </div>
                                         </div>
@@ -408,6 +451,35 @@
             // initValue();
         })
 
+        var couponRule = xmSelect.render({
+            el: '#coupon-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            // radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/couponTreeSet', null, function(res) {
+            couponRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+
+            initValue();
+        })
+
         var carriageRule = xmSelect.render({
             el: '#carriage-rule',
             language: 'zn',
@@ -433,9 +505,8 @@
                 data : res.data,
                 autoRow: true,
             });
-
-            initValue();
         })
+
 
         var tableSkuData = [];
         var tableIns = table.render({
@@ -448,10 +519,12 @@
                 ,{field: 'index', title: '序号', width: 70}
                 ,{field: 'styleName', title: '样式', edit:'text', width:200}
                 ,{field: 'skuName', title: '规格', edit:'text', width:200}
-                ,{field: 'sample', title:'样品', width:100}
                 ,{field: 'goodsWeight', title: '重量', edit:'text', width:100}
-                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
                 ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
+                ,{field: 'presentPrice', title: '现价', edit:'text', width:100}
+                // ,{field: 'levelOnePrice', title: '一级价格', edit:'text', width:100}
+                // ,{field: 'levelTwoPrice', title: '二级价格', edit:'text', width:100}
+                // ,{field: 'levelThreePrice', title: '三级价格', edit:'text', width:100}
                 ,{field: 'costPrice', title: '成本价', edit:'text', width:100}
                 ,{templet: '#tableImgUpload', title: '缩略图', width:150}
                 ,{field: 'stock', title: '库存', edit:'text', width:100}
@@ -714,12 +787,16 @@
                 "staticProp": goodsInfo.staticProp,
                 "originalPrice": goodsInfo.originalPrice,
                 "presentPrice": goodsInfo.presentPrice,
+                "levelOnePrice": goodsInfo.levelOnePrice,
+                "levelTwoPrice": goodsInfo.levelTwoPrice,
+                "levelThreePrice": goodsInfo.levelThreePrice,
                 "costPrice": goodsInfo.costPrice,
                 "isSku": goodsInfo.isSku,
                 "thumb": goodsInfo.thumb,
                 "carriageType": goodsInfo.carriageType,
                 "carriageAmount": goodsInfo.carriageAmount,
                 "goodsWeight": goodsInfo.goodsWeight,
+                "orderNumber": goodsInfo.orderNumber,
                 "thumbs": thumbs
             });
 
@@ -730,6 +807,8 @@
             var arrCarriageRule = [];
             arrCarriageRule.push(goodsInfo.carriageRuleId)
             carriageRule.setValue(arrCarriageRule);
+
+            couponRule.setValue(goodsInfo.couponIds);
 
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
@@ -765,14 +844,14 @@
 
             window.editor = E.createEditor({
                 html: goodsInfo.goodsDetails,
-                selector: '#editor-container',
+                selector: '#editor-container-good-update',
                 config : editorConfig,
                 mode: 'default'
             });
 
             window.toolbar = E.createToolbar({
                 editor,
-                selector: '#toolbar-container',
+                selector: '#toolbar-container-good-update',
                 mode: 'default'
             });
 
@@ -783,6 +862,14 @@
         }
 
         form.on('submit(goods-update-form-submit)', function (data) {
+            let couponRuleList = couponRule.getValue();
+            if (couponRuleList.length > 0) {
+                var couponIds = [];
+                layui.each(couponRuleList, function (key, item) {
+                    couponIds.push(item.id)
+                });
+                data.field.couponIds=couponIds;
+            }
             data.field.goodsType=1;
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;

--
Gitblit v1.9.1