From c014190d15b41704085d2e96b3fb51d39d8c2016 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 13:39:07 +0800
Subject: [PATCH] refactor(mall): 优化订单商品名称的显示格式

---
 src/main/resources/templates/febs/views/modules/activity/add.html |  149 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 128 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/activity/add.html b/src/main/resources/templates/febs/views/modules/activity/add.html
index 99ecea9..ec4ce82 100644
--- a/src/main/resources/templates/febs/views/modules/activity/add.html
+++ b/src/main/resources/templates/febs/views/modules/activity/add.html
@@ -10,25 +10,43 @@
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
 
-                                <div class="layui-row layui-col-space10 layui-form-item">
-                                    <div class="layui-col-lg6">
+                                <div class="layui-row layui-col-lg6 layui-form-item">
                                         <label class="layui-form-label febs-form-item-require">名称:</label>
                                         <div class="layui-input-block">
-                                            <input type="text" name="actName" lay-verify="required"
+                                            <input type="text" name="name" 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">
+                                <div class="layui-row layui-col-lg6 layui-form-item discount-rule">
+                                        <label class="layui-form-label febs-form-item-require">关联商品</label>
+                                        <div class="layui-input-block">
+                                            <div id="discount-rule"></div>
+                                        </div>
+                                </div>
+
+                                <div class="layui-row layui-col-lg6 layui-form-item">
                                         <label class="layui-form-label febs-form-item-require">类型</label>
                                         <div class="layui-input-block">
-                                            <select name="type" class="award-type" lay-filter="award-type-select">
+                                            <select name="type" class="activity-type" lay-filter="activity-type-select">
                                                 <option value="1">折扣</option>
                                                 <option value="2">优惠卷</option>
                                             </select>
                                         </div>
+                                </div>
+
+                                <div class="layui-row layui-col-lg6 discount-size layui-form-item">
+                                    <label class="layui-form-label">折扣力度</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="discountSize" placeholder="折扣力度" autocomplete="off" class="layui-input">
+                                        <div class="layui-form-mid layui-word-aux">0.98:就是98折</div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-row layui-col-lg6 febs-hide layui-form-item coupon-size">
+                                    <label class="layui-form-label">优惠卷:</label>
+                                    <div class="layui-input-block">
+                                        <div id="coupon-rule"></div>
                                     </div>
                                 </div>
 
@@ -36,15 +54,18 @@
                                     <div class="layui-col-lg6">
                                         <label class="layui-form-label febs-form-item-require">开始时间:</label>
                                         <div class="layui-input-block">
-                                            <input type="text" name="actStartTime" id="febs-form-group-date-start" lay-verify="date"
-                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                                            <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="datetime"
+                                                   placeholder="yyyy-MM-dd hh:mm:ss" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+                                </div>
+
+                                <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">
-                                            <input type="text" name="actEndTime" id="febs-form-group-date-end" lay-verify="date"
-                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                                            <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="datetime"
+                                                   placeholder="yyyy-MM-dd hh:mm:ss" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -91,14 +112,14 @@
                                     </div>
                                 </div>
 
-                                <div class="layui-form-item">
-                                    <label class="layui-form-label">活动说明:</label>
-                                    <div class="layui-input-block">
-                                        <label>
-                                            <textarea name="actRemark" rows="5" autocomplete="off" class="layui-textarea" ></textarea>
-                                        </label>
-                                    </div>
-                                </div>
+<!--                                <div class="layui-form-item">-->
+<!--                                    <label class="layui-form-label">活动说明:</label>-->
+<!--                                    <div class="layui-input-block">-->
+<!--                                        <label>-->
+<!--                                            <textarea name="actRemark" rows="5" autocomplete="off" class="layui-textarea" ></textarea>-->
+<!--                                        </label>-->
+<!--                                    </div>-->
+<!--                                </div>-->
 
                             </div>
                         </div>
@@ -152,13 +173,73 @@
             element = layui.element;
 
         form.render();
+        var activityGoodsIds = xmSelect.render({
+            el: '#discount-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            toolbar: {
+                show: true,
+            },
+            // radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/goodsTreeSet', null, function(res) {
+            activityGoodsIds.update({
+                data : res.data,
+                autoRow: true,
+            });
+        })
+
+        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,
+            });
+        })
 
         laydate.render({
-            elem: '#febs-form-group-date-start'
+            elem: '#febs-form-group-date-start',
+            type: 'datetime',   // 选择器类型为日期时间
+            format: 'yyyy-MM-dd HH:mm:ss' // 自定义格式
         });
 
         laydate.render({
-            elem: '#febs-form-group-date-end'
+            elem: '#febs-form-group-date-end',
+            type: 'datetime',   // 选择器类型为日期时间
+            format: 'yyyy-MM-dd HH:mm:ss' // 自定义格式
         });
 
         formSelects.render();
@@ -184,6 +265,15 @@
         });
 
         form.on('submit(activity-add-form-submit)', function (data) {
+            data.field.couponId = couponRule.getValue('valueStr');
+            let couponRuleList = activityGoodsIds.getValue();
+            if (couponRuleList.length > 0) {
+                var couponIds = [];
+                layui.each(couponRuleList, function (key, item) {
+                    couponIds.push(item.id)
+                });
+                data.field.activityGoodsIds=couponIds;
+            }
             $.ajax({
                 'url':ctx + 'admin/activity/add',
                 'type':'post',
@@ -206,5 +296,22 @@
             })
             return false;
         });
+
+        form.on('select(activity-type-select)', function(data){
+            $('.discount-size').each(function() {
+                if (data.value == 1) {
+                    $(this).show();
+                } else {
+                    $(this).hide();
+                }
+            })
+            $('.coupon-size').each(function() {
+                if (data.value == 2) {
+                    $(this).show();
+                } else {
+                    $(this).hide();
+                }
+            })
+        });
     });
 </script>
\ No newline at end of file

--
Gitblit v1.9.1