From bbe56bf9f6e66b3c1d0085838a6c16b76b0924f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 01 Oct 2021 20:36:58 +0800
Subject: [PATCH] add reset pwd

---
 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html |   76 ++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 35 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 8435667..7dc5a75 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -23,7 +23,7 @@
                                 <div class="layui-col-lg6">
                                     <label class="layui-form-label febs-form-item-require">所属分类:</label>
                                     <div class="layui-input-block">
-                                        <select name="parentId" class="categary-update-category" >
+                                        <select name="categoryId" class="categary-addPeoduct" >
                                             <option value="">请选择</option>
                                         </select>
                                     </div>
@@ -31,7 +31,7 @@
                                 <div class="layui-col-lg6">
                                     <label class="layui-form-label febs-form-item-require">单位:</label>
                                     <div class="layui-input-block">
-                                        <input type="text" name="unit" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+                                        <input type="text" name="unit"  lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
                                     </div>
                                 </div>
                             </div>
@@ -57,7 +57,7 @@
                             </div>
                             <div class="layui-row layui-col-space10 layui-form-item">
                                 <div class="layui-col-lg6">
-                                    <label class="layui-form-label">规格:</label>
+                                    <label class="layui-form-label febs-form-item-require">样式:</label>
                                     <div class="layui-input-block">
                                         <input type="text" name="addMallGoodsSkuDtos" autocomplete="off" class="layui-input" id="attrName">
                                     </div>
@@ -106,7 +106,7 @@
                             <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="required" name = "goodsDetails" class="layui-textarea"></textarea>
+                                    <textarea id="lay_edit" lay-verify="goodsDetails" name = "goodsDetails" class="layui-textarea"></textarea>
                                 </div>
                             </div>
                             <div class="layui-row layui-col-space10 layui-form-item">
@@ -156,10 +156,10 @@
 
 
         //(下拉框)
-        $.get(ctx + 'admin/goodsCategory/categorys/tree', function (data) {
+        $.get(ctx + 'admin/goodsCategory/categorys/allTree', function (data) {
             for (var k in data)
             {
-                $(".categary-update-category").append("<option value='" + data[k].parentId + "'>" + data[k].name + "</option>");
+                $(".categary-addPeoduct").append("<option value='" + data[k].parentId + "'>" + data[k].name + "</option>");
             }
             layui.use('form', function () {
                 var form = layui.form;
@@ -190,7 +190,7 @@
             }
         });
 
-        //多图片上传
+        //图片上传
         upload.render({
             elem: '#test2'
             ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
@@ -232,43 +232,53 @@
 
         $('#test3').on('click', function (){
             var index = $("#attrWrap").children().length;
+            let attrNameVal = $('#attrName').val();
+            if(attrNameVal==null || attrNameVal==""){
+                febs.alert.warn('样式名称不能为空');
+                return false;
+            }
             $('#attrWrap').append(`
                     <div class="layui-form-item item">
                     <div style="float:left" >
-                            <input type="text" name="skuName` + index + `" autocomplete="off" class="layui-input" value="` + $('#attrName').val() + `" readonly >
+                            <input type="text" name="styleName` + index + `" value="` + $('#attrName').val() + `" autocomplete="off" class="layui-input"  readonly >
+                    </div>
+                    <div style="float:left" >
+                        <div>
+                            <input type="text" name="skuName` + index +`" placeholder="规格名称" autocomplete="off" class="layui-input" >
+                        </div>
                     </div>
                     <div  style="float:left" >
                         <label class="layui-form-label">图片:</label>
                         <div class="layui-input-block">
                             <div class="layui-upload">
-                                    <button type="button" class="layui-btn layui-btn-normal layui-btn-xs sku-img" id="` + index + `">上传</button>
-                                    <input type="text" id="skuImage` + index +`" name="skuImage` + index + `" autocomplete="off"
-                                        class="layui-input">
+                                    <button type="button" class="layui-btn layui-btn-normal layui-btn-xs sku-img" id="skuImg` + index + `">上传</button>
+                                    <img class="layui-upload-img" id="imageUrls` + index + `" style="width: 100px" >
                             </div>
                         </div>
                     </div>
-                    <div style="float:left" >
-                        <label class="layui-form-label">库存:</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="stock` + index +`" autocomplete="off" class="layui-input" >
+                    <div style="float:left" class="febs-hide">
+                        <div>
+                            <input type="text" id="skuImage` + index +`" name="skuImage` + index + `" autocomplete="off" class="layui-input">
                         </div>
                     </div>
                     <div style="float:left" >
-                        <label class="layui-form-label">销售数量:</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="skuVolume` + index +`" autocomplete="off" class="layui-input" >
+                        <div>
+                            <input type="number" name="stock` + index +`" placeholder="库存" autocomplete="off" class="layui-input" >
                         </div>
                     </div>
                     <div style="float:left" >
-                        <label class="layui-form-label">原价:</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="originalPrice` + index +`" autocomplete="off" class="layui-input" >
+                        <div>
+                            <input type="number" name="skuVolume` + index +`" placeholder="销售数量" autocomplete="off" class="layui-input" >
                         </div>
                     </div>
                     <div style="float:left" >
-                        <label class="layui-form-label">现价:</label>
-                        <div class="layui-input-block">
-                            <input type="text" name="presentPrice` + index + `" autocomplete="off" class="layui-input" >
+                        <div>
+                            <input type="number" name="originalPrice` + index +`" placeholder="原价" autocomplete="off" class="layui-input" >
+                        </div>
+                    </div>
+                    <div style="float:left" >
+                        <div>
+                            <input type="number" name="presentPrice` + index + `" placeholder="现价" autocomplete="off" class="layui-input" >
                         </div>
                     </div>
                     <div style="float:left" >
@@ -278,30 +288,25 @@
             `)
             //普通图片上传
             upload.render({
-                elem: '.sku-img'
+                elem: '#skuImg' + index
                 ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
                 ,done: function(res){
                     febs.alert.success(res.data.src);
-                    var cid = this.item.attr('id');
-                    $('#skuImgPreview' + cid).attr('src', res.data.src);
-                    $('#skuImage'+cid).val(res.data.src);
+                    $('#imageUrls' + index).attr('src', res.data.src);
+                    $('#skuImage'+ index).val(res.data.src);
                 }
             });
         });
         upload.render({
-            elem: '.sku-img'
+            elem: '#skuImg'+index
             ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
             ,done: function(res){
                 febs.alert.success(res.data.src);
-                var cid = this.item.attr('id');
-                $('#skuImgPreview' + cid).attr('src', res.data.src);
-                $('#skuImage'+cid).val(res.data.src);
+                $('#imageUrls' + index).attr('src', res.data.src);
+                $('#skuImage'+ index).val(res.data.src);
             }
         });
         $("#attrWrap").on("click",".del-attr-btn",function(){
-            // console.log(this)
-            // console.log($(this).index())
-            // console.log($(this).attr('data-index'))
             var index = $(this).attr('data-index')
             $($("#attrWrap").find(".item")[index].remove());
         });
@@ -310,6 +315,7 @@
             var skuArr = $("#attrWrap").find(".item");
             for(var i = 0;i < skuArr.length;i++){
                 skuArrs.push({
+                    styleName: $("input[name='styleName" + i + "']").val(),
                     skuName: $("input[name='skuName" + i + "']").val(),
                     skuImage: $("input[name='skuImage" + i + "']").val(),
                     stock: $("input[name='stock" + i + "']").val(),

--
Gitblit v1.9.1