From 368b6c211c035900825bb9cc426ddb0f532461d4 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 25 Dec 2018 17:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/default/config/index.html    | 4 ++++
 application/admin/view/default/goods/save_info.html | 2 +-
 public/static/admin/default/js/goods.js             | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/application/admin/view/default/config/index.html b/application/admin/view/default/config/index.html
index acd3150a9..b96ea2b81 100755
--- a/application/admin/view/default/config/index.html
+++ b/application/admin/view/default/config/index.html
@@ -41,6 +41,10 @@
 					{{/foreach}}
 				</select>
 			</div>
+			<div class="am-form-group">
+				<label>{{$data.common_spec_add_max_number.name}}<span class="fs-12 fw-100 cr-999">（{{$data.common_spec_add_max_number.describe}}）</span></label>
+				<input type="number" name="{{$data.common_spec_add_max_number.only_tag}}" placeholder="{{$data.common_spec_add_max_number.describe}}" data-validation-message="{{$data.common_spec_add_max_number.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_spec_add_max_number.value}}"{{/if}} />
+			</div>
 			<!-- <div class="am-form-group">
 				<label>{{$data.common_share_giving_integral_frequency.name}}<span class="fs-12 fw-100 cr-999">（{{$data.common_share_giving_integral_frequency.describe}}）</span></label>
 				<input type="number" name="{{$data.common_share_giving_integral_frequency.only_tag}}" placeholder="{{$data.common_share_giving_integral_frequency.name}}" data-validation-message="{{$data.common_share_giving_integral_frequency.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.common_share_giving_integral_frequency.value}}"{{/if}} />
diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index 70a477568..bc4db77ea 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -153,7 +153,7 @@
 			</div>
 
 			<!-- 规格 -->
-			<div id="goods-nav-operations" class="division-block">
+			<div id="goods-nav-operations" class="division-block" data-spec-add-max-number="{{:MyC('common_spec_add_max_number', 3, true)}}">
 				<label class="block nav-detail-title">商品规格</label>
 				<span class="business-operations-submit specifications-nav-title-add">+添加规格</span>
 				<div class="goods-specifications">
diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js
index bf3aca6d2..40d3d28cc 100755
--- a/public/static/admin/default/js/goods.js
+++ b/public/static/admin/default/js/goods.js
@@ -10,9 +10,10 @@ $(function()
     // 规格列添加
     $('.specifications-nav-title-add').on('click', function()
     {
-        if($('.specifications-table th.table-title').length >= 5)
+        var spec_max = $('#goods-nav-operations').data('spec-add-max-number') || 3;
+        if($('.specifications-table th.table-title').length >= spec_max)
         {
-            Prompt('最多添加5列规格');
+            Prompt('最多添加'+spec_max+'列规格');
             return false;
         }