From 7012f4098bf45226f3d27a1e770a4f4ef5632f01 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Mon, 23 Sep 2019 22:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/goods/save_info.html   | 37 ++++++++++++++++++-
 public/static/admin/default/js/goods.js       |  5 ++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index fadb8aab7..bc5643cc0 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -213,8 +213,41 @@
 
 				<!-- 规格常规操作 -->
 				<span class="business-operations-submit specifications-nav-title-add">+添加规格</span>
-				<div class="goods-specifications">
-					<!-- 规格批量操作弹层 -->
+				<span class="business-operations-submit am-margin-left-sm specifications-nav-set-all" data-am-modal="{target: '#spec-popup-all-operation'}">+批量设置</span>
+				<div class="goods-specifications am-padding-top-sm">
+					<!-- 所有规格批量操作弹层 -->
+					<div class="am-popup" id="spec-popup-all-operation">
+						<div class="am-popup-inner">
+							<div class="am-popup-hd">
+								<h4 class="am-popup-title">批量设置</h4>
+								<span data-am-modal-close class="am-close">&times;</span>
+							</div>
+							<div class="am-popup-bd">
+								<div class="am-form-group">
+									<label class="block">颜色</label>
+									<select class="chosen-select am-radius" data-placeholder="全部">
+										<option value="0">全部</option>
+										<option value="1">hello</option>
+										<option value="2">world</option>
+									</select>
+								</div>
+								<div class="am-form-group">
+									<label class="block">尺码</label>
+									<select class="chosen-select am-radius" data-placeholder="全部">
+										<option value="0">全部</option>
+										<option value="1">hello</option>
+										<option value="2">world</option>
+									</select>
+								</div>
+								<div class="am-form-group">
+									<label class="block">销售价格</label>
+									<input type="text" name="specifications_price[]" placeholder="价格" class="am-radius" pattern="^([0-9]{1}\d{0,6})(\.\d{1,2})?$" required />
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<!-- 单个规格批量操作弹层 -->
 					<div class="am-modal am-modal-no-btn" tabindex="-1" id="spec-modal-all-operation">
 						<div class="am-modal-dialog">
 							<div class="am-modal-hd">批量操作
diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js
index 997da3d6d..b8329dcb0 100755
--- a/public/static/admin/default/js/goods.js
+++ b/public/static/admin/default/js/goods.js
@@ -319,11 +319,12 @@ $(function()
 
     // 规格批量操作-开启
     var $spec_modal = $('#spec-modal-all-operation');
-    $('.specifications-table thead th i').on('click', function()
+    $('.specifications-table thead th i.am-icon-edit').on('click', function()
     {
         $spec_modal.modal({
             width: 200,
-            height: 100
+            height: 100,
+            closeViaDimmer: false
         });
         $spec_modal.attr('data-index', $(this).parent().index());
         $spec_modal.find('.am-input-group input').val('');
-- 
GitLab