From 31831b6b79c8f9f0d97ec622143da6e50a6f8fb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Feb 2023 10:27:49 +0800
Subject: [PATCH] prod参数修改

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 113 insertions(+), 4 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 4743ccc..70576a0 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>
@@ -50,6 +55,12 @@
                                                 <div class="layui-input-block">
                                                     <input type="text" name="unit" 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="goodsWeight"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
@@ -164,6 +175,16 @@
                                         </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>
+
+                                        <div class="layui-form-item">
                                             <label class="layui-form-label febs-form-item-require">商品详情:</label>
                                             <div class="layui-input-block">
 <!--                                                <textarea id="lay_edit" lay-verify="goodsDetails" name="goodsDetails" class="layui-textarea"></textarea>-->
@@ -198,6 +219,34 @@
                                             <div class="layui-input-block">
                                                 <input type="text" name="costPrice" lay-verify="required" placeholder=""
                                                        autoComplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+
+                                        <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">运费:</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="carriageType" value="1" title="固定运费" lay-filter="hasCarriage" />
+                                                <input type="radio" name="carriageType" value="2" title="使用邮费模板" lay-filter="hasCarriage" checked/>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-input  febs-hide">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label">固定运费:</label>
+                                                <div class="layui-input-block">
+                                                    <input id="carriageAmountDefault" type="text" name="carriageAmount" placeholder="" autocomplete="off" class="layui-input">
+                                                    <div class="layui-form-mid layui-word-aux">远费设置为0元,商品将显示为免运费。</div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item carriage-rule">
+                                            <div class="layui-col-lg6">
+                                                <label class="layui-form-label febs-form-item-require">邮费模板:</label>
+                                                <div class="layui-input-block">
+                                                    <div id="carriage-rule"></div>
+                                                </div>
                                             </div>
                                         </div>
 
@@ -350,6 +399,35 @@
                 autoRow: true,
             });
 
+            // initValue();
+        })
+
+        var carriageRule = xmSelect.render({
+            el: '#carriage-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/carriageRuleTree', null, function(res) {
+            carriageRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+
             initValue();
         })
 
@@ -364,6 +442,7 @@
                 , {field: 'index', title: '序号', width: 70}
                 , {field: 'styleName', title: '样式', edit: 'text'}
                 , {field: 'skuName', title: '规格', edit: 'text'}
+                , {field: 'goodsWeight', title: '重量', edit:'text'}
                 , {field: 'presentPrice', title: '现价', edit: 'text'}
                 , {field: 'originalPrice', title: '原价', edit: 'text'}
                 , {field: 'costPrice', title: '成本价', edit: 'text'}
@@ -419,6 +498,17 @@
                 $('.multi-sku-table').hide();
             } else {
                 $('.multi-sku-table').show();
+            }
+        });
+
+        form.on('radio(hasCarriage)', function(data){
+            if (data.value == 2) {
+                $('.carriage-input').hide();
+                $('.carriage-rule').show();
+            } else {
+                $('.carriage-input').show();
+                $('.carriage-rule').hide();
+                document.getElementById('carriageAmountDefault').value = 0;
             }
         });
 
@@ -603,6 +693,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,
@@ -612,6 +704,9 @@
                 "costPrice": goodsInfo.costPrice,
                 "isSku": goodsInfo.isSku,
                 "thumb": goodsInfo.thumb,
+                "carriageType": goodsInfo.carriageType,
+                "carriageAmount": goodsInfo.carriageAmount,
+                "goodsWeight": goodsInfo.goodsWeight,
                 "thumbs": thumbs
             });
 
@@ -619,8 +714,21 @@
             arr.push(goodsInfo.categoryId)
             category.setValue(arr);
 
+            var arrCarriageRule = [];
+            arrCarriageRule.push(goodsInfo.carriageRuleId)
+            carriageRule.setValue(arrCarriageRule);
+
             if (goodsInfo.isNormal == 2) {
                 $(".tc-set").show();
+            }
+
+            if (goodsInfo.carriageType == 2) {
+                $('.carriage-input').hide();
+                $('.carriage-rule').show();
+            } else {
+                $('.carriage-input').show();
+                $('.carriage-rule').hide();
+                document.getElementById('carriageAmountDefault').value = goodsInfo.carriageAmount;
             }
 
             if (goodsInfo.isSku == 1) {
@@ -666,6 +774,7 @@
             data.field.mailGoodsSkuDto = tableSkuData;
             data.field.delSkuId=delSku;
             data.field.categoryId = category.getValue('valueStr');
+            data.field.carriageRuleId = carriageRule.getValue('valueStr');
             data.field.goodsDetails = editor.getHtml();
             $.ajax({
                 'url': ctx + 'admin/goods/updateMallGoods',

--
Gitblit v1.9.1