From 37789cb261c049585ac19ab9831cdfd24dcd0c8f Mon Sep 17 00:00:00 2001
From: JianWeie <jianweie@163.com>
Date: Wed, 21 Jul 2021 22:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82#I3X8PP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/good/goods/batchModifyPrice.html    | 55 +++++++++----------
 .../views/good/goods/batchModifyStock.html    |  5 +-
 .../wwwroot/views/good/goods/delLabel.html    |  2 +-
 .../wwwroot/views/good/goods/getLabel.html    | 12 +++-
 .../wwwroot/views/good/goods/index.html       | 50 +++++++++++++----
 5 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html
index 694ba7f..0e6f0f9 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyPrice.html
@@ -16,38 +16,37 @@
             </div>
             <div id="layui-card">
                 <div class="layui-form" lay-filter="LAY-app-CoreCmsGoods-batchModifyPrice" id="LAY-app-CoreCmsGoods-batchModifyPrice">
-                    <div class="layui-form">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">价格类型：</label>
-                            <div class="layui-input-inline">
-                                <select name="priceType">
-                                    {{# layui.each(d.params.data.priceType, function(index, item){ }}
-                                    <option value="{{ item.title }}">{{ item.description }}</option>
-                                    {{# }); }}
-                                </select>
-                            </div>
+                    <input type="hidden" name="ids" value="{{d.params.data.entity.id}}">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">价格类型：</label>
+                        <div class="layui-input-inline">
+                            <select name="priceType">
+                                {{# layui.each(d.params.data.priceType, function(index, item){ }}
+                                <option value="{{ item.title }}">{{ item.description }}</option>
+                                {{# }); }}
+                            </select>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">调整类型：</label>
-                            <div class="layui-input-inline">
-                                <select name="modifyType">
-                                    <option value="=">=</option>
-                                    <option value="-">-</option>
-                                    <option value="+">+</option>
-                                    <option value="*">x</option>
-                                </select>
-                            </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">调整类型：</label>
+                        <div class="layui-input-inline">
+                            <select name="modifyType">
+                                <option value="+">+</option>
+                                <option value="-">-</option>
+                                <option value="=">=</option>
+                                <option value="*">x</option>
+                            </select>
                         </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">调整值：</label>
-                            <div class="layui-input-inline">
-                                <input type="text" value="" name="priceValue" lay-verType="tips" lay-verify="required|money" placeholder="请输入金额调整值" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsGoods-batchModifyPrice-submit" id="LAY-app-CoreCmsGoods-batchModifyPrice-submit" value="确认提交">
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">调整值：</label>
+                        <div class="layui-input-inline">
+                            <input type="text" value="" name="priceValue" lay-verType="tips" lay-verify="required|money" placeholder="请输入金额调整值" autocomplete="off" class="layui-input">
                         </div>
                     </div>
+                    <div class="layui-form-item core-hidden">
+                        <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsGoods-batchModifyPrice-submit" id="LAY-app-CoreCmsGoods-batchModifyPrice-submit" value="确认提交">
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html
index b3ca0a8..4c11a6c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/batchModifyStock.html
@@ -1,5 +1,6 @@
 <script type="text/html" template lay-done="layui.data.sendParams(d);">
     <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsGoods-batchModifyStock" id="LAY-app-CoreCmsGoods-batchModifyStock">
+        <input type="hidden" name="ids" value="{{d.params.data.entity.id}}">
         <div class="warning-msg">
             <div class="warning-msg-content">
                 <p>当前选中{{ d.params.data.entity.id.length }}条数据</p>
@@ -9,9 +10,9 @@
             <label class="layui-form-label">调整类型：</label>
             <div class="layui-input-inline">
                 <select name="modifyType">
-                    <option value="=">=</option>
                     <option value="+">+</option>
                     <option value="-">-</option>
+                    <option value="=">=</option>
                     <option value="*">x</option>
                 </select>
             </div>
@@ -23,7 +24,7 @@
             </div>
         </div>
 
-        <div class="layui-form-item">
+        <div class="layui-form-item core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsGoods-batchModifyStock-submit" id="LAY-app-CoreCmsGoods-batchModifyStock-submit" value="确认编辑">
         </div>
     </div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/delLabel.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/delLabel.html
index 62ec7a9..afa8ba2 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/delLabel.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/delLabel.html
@@ -10,7 +10,7 @@
             {{#  }  }}
         </div>
 
-        <div class="layui-form-item">
+        <div class="layui-form-item core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsLabel-editForm-submit" id="LAY-app-CoreCmsLabel-editForm-submit" value="确认编辑">
         </div>
     </div>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/getLabel.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/getLabel.html
index ed45817..a9a9c7e 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/getLabel.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/getLabel.html
@@ -45,7 +45,7 @@
             </div>
         </div>
 
-        <div class="layui-form-item">
+        <div class="layui-form-item core-hidden">
             <input type="button" class="layui-btn" lay-submit lay-filter="LAY-app-CoreCmsLabel-createForm-submit" id="LAY-app-CoreCmsLabel-createForm-submit" value="确认设置">
         </div>
     </div>
@@ -77,8 +77,14 @@
                 });
                 $("#add_label").click(function () {
                     var label_text = $("#label_name").val();
-                    var label_style = $("#style").val();
-                    appendLabel(label_text, label_style);
+                    if (label_text) {
+                        var label_style = $("#style").val();
+                        appendLabel(label_text, label_style);
+                    } else {
+                        layer.msg('标签名称不能为空');
+                        return false;
+                    }
+
                 });
                 //删除标签
                 $(".layui-layer-content").on('click', '.layui-unselect', function () {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html
index c6cd6f4..8f82680 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html
@@ -31,10 +31,10 @@
                             <option value="del">删除</option>
                         </select>
                     </div>
-                </div>     
+                </div>
             </div>
             <div class="layui-inline" style="float: right;">
-                <div class="layui-inline">  
+                <div class="layui-inline">
                     <div class="layui-input-inline">
                         <input type="text" name="name" id="name" placeholder="请输入商品名称" class="layui-input">
                     </div>
@@ -217,7 +217,7 @@
                             },
                             { field: 'name', title: '商品名称', sort: false },
                             //{ field: 'stock', title: '库存', sort: false, width: 60 },
-                            { field: 'sort', title: '排序', sort: false, width: 40},
+                            { field: 'sort', title: '排序', sort: false, width: 40 },
                             {
                                 field: 'productsDistributionType', title: '佣金方式', sort: false, width: 80, templet: function (data) {
                                     if (data.productsDistributionType === 1) {
@@ -351,9 +351,10 @@
                 function setLabel(data) {
                     coreHelper.Post("Api/CoreCmsGoods/GetLabel", { id: data }, function (e) {
                         if (e.code === 0) {
-                            admin.popup({ shadeClose: false,
+                            admin.popup({
+                                shadeClose: false,
                                 title: '设置标签',
-                                area: ['600px', '600px'],
+                                area: ['600px', '500px'],
                                 id: 'LAY-popup-CoreCmsLabel-create',
                                 success: function (layero, index) {
                                     view(this.id).render('good/goods/getLabel', { data: e.data }).done(function () {
@@ -380,6 +381,11 @@
                                                 });
                                             });
                                     });
+                                    // 禁止弹窗出现滚动条
+                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                }, btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsLabel-createForm-submit").click();
                                 }
                             });
                         } else {
@@ -391,9 +397,10 @@
                 function dellabel(data) {
                     coreHelper.Post("Api/CoreCmsGoods/GetDeleteLabel", { id: data }, function (e) {
                         if (e.code === 0) {
-                            admin.popup({ shadeClose: false,
+                            admin.popup({
+                                shadeClose: false,
                                 title: '取消标签',
-                                area: ['600px', '600px'],
+                                area: ['600px', '300px'],
                                 id: 'LAY-popup-CoreCmsLabel-edit',
                                 success: function (layero, index) {
                                     view(this.id).render('good/goods/delLabel', { data: e.data }).done(function () {
@@ -420,6 +427,11 @@
                                                 });
                                             });
                                     });
+                                    // 禁止弹窗出现滚动条
+                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                }, btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsLabel-editForm-submit").click();
                                 }
                             });
                         } else {
@@ -442,9 +454,11 @@
                 function modifyPrice(data) {
                     coreHelper.Post("Api/CoreCmsGoods/GetBatchModifyPrice", { id: data }, function (e) {
                         if (e.code === 0) {
-                            admin.popup({ shadeClose: false,
+                            console.log(e.data);
+                            admin.popup({
+                                shadeClose: false,
                                 title: '批量修改价格',
-                                area: ['600px', '600px'],
+                                area: ['600px', '500px'],
                                 id: 'LAY-popup-CoreCmsGoods-batchModifyPrice',
                                 success: function (layero, index) {
                                     view(this.id).render('good/goods/batchModifyPrice', { data: e.data }).done(function () {
@@ -453,6 +467,8 @@
                                             function (data) {
                                                 var field = data.field; //获取提交的字段
                                                 if (debug) { console.log(field); } //开启调试返回数据
+                                                field.ids = field.ids.split(',');
+
                                                 //return false;
                                                 //提交 Ajax 成功后，关闭当前弹层并重载表格
                                                 coreHelper.Post("Api/CoreCmsGoods/DoBatchModifyPrice", field, function (e) {
@@ -467,6 +483,11 @@
                                                 });
                                             });
                                     })
+                                    // 禁止弹窗出现滚动条
+                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                }, btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoods-batchModifyPrice-submit").click();
                                 }
                             });
                         } else {
@@ -478,9 +499,10 @@
                 function modifyStock(data) {
                     coreHelper.Post("Api/CoreCmsGoods/GetBatchModifyStock", { id: data }, function (e) {
                         if (e.code === 0) {
-                            admin.popup({ shadeClose: false,
+                            admin.popup({
+                                shadeClose: false,
                                 title: '批量修改库存',
-                                area: ['600px', '400px'],
+                                area: ['400px', '300px'],
                                 id: 'LAY-popup-CoreCmsGoods-batchModifyStock',
                                 success: function (layero, index) {
                                     view(this.id).render('good/goods/batchModifyStock', { data: e.data }).done(function () {
@@ -504,6 +526,12 @@
                                                 });
                                             });
                                     })
+                                    // 禁止弹窗出现滚动条
+                                    $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                                }
+                                , btn: ['确定', '取消']
+                                , yes: function (index, layero) {
+                                    layero.contents().find("#LAY-app-CoreCmsGoods-batchModifyStock-submit").click();
                                 }
                             });
                         } else {