From 3aa7d6702ce557d76fcfd4537f21ce3b32d36299 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 17 Jul 2023 15:43:35 +0800
Subject: [PATCH] 扫码和关注的事件

---
 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html |  116 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 78 insertions(+), 38 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 393bbf6..4fac478 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>
@@ -97,30 +106,31 @@
                                             <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="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">
@@ -189,8 +199,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>
@@ -205,22 +215,45 @@
                                                            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="presentPrice" 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>
+                                                <label class="layui-form-label febs-form-item-require">一级价格:</label>
                                                 <div class="layui-input-block">
-                                                    <input type="text" name="presentPrice" lay-verify="required"
-                                                           placeholder="" autoComplete="off" class="layui-input">
+                                                    <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>
 
-                                        <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>
-                                        </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>-->
+<!--                                        </div>-->
 
                                         <blockquote class="layui-elem-quote blue-border">运费设置</blockquote>
                                         <div class="layui-form-item">
@@ -450,9 +483,12 @@
                 ,{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: 'presentPrice', title: '折扣价', edit:'text', width:100}
                 ,{field: 'originalPrice', title: '原价', edit:'text', width:100}
-                ,{field: 'costPrice', 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}
                 ,{field: 'skuVolume', title: '销量', edit:'text', width:100}
@@ -714,12 +750,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
             });
 
@@ -765,14 +805,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'
             });
 

--
Gitblit v1.9.1