From ada6e79d014bd415eaea2cf5a0ba731740b7effc Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 25 Dec 2018 13:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E5=8A=A0=E5=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/default/goods/save_info.html   | 26 ++++++++++---------
 .../index/view/default/public/nav_search.html |  4 +--
 public/static/admin/default/js/goods.js       |  1 -
 public/static/index/default/js/goods.js       | 19 +++-----------
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/application/admin/view/default/goods/save_info.html b/application/admin/view/default/goods/save_info.html
index dc462d6fa..d72d1ab0c 100755
--- a/application/admin/view/default/goods/save_info.html
+++ b/application/admin/view/default/goods/save_info.html
@@ -158,7 +158,7 @@
 				<div class="goods-specifications">
 					<div class="spec-images-tips">
 						<label class="am-checkbox c-p">
-							<input type="checkbox" value="1" data-am-ucheck />
+							<input type="checkbox" value="1" data-am-ucheck {{if !empty($specifications['images'])}}checked{{/if}} />
 							<span class="fs-12 msg-tips">首个规格选择添加图片</span>
 						</label>
 					</div>
@@ -260,17 +260,19 @@
 					<span class="business-operations-submit specifications-nav-title-add">+添加规格</span>
 					<span class="business-operations-submit specifications-line-add">+添加一行</span>
 					<ul class="spec-images-list" {{if empty($specifications['images'])}} style="display: none"{{/if}}>
-						{{foreach $specifications.images as $spec_images}}
-							<li>
-								<ul class="plug-file-upload-view spec-images-view-{{$spec_images.name}}" data-form-name="spec_images[{{$spec_images.name}}]" data-max-number="1" data-delete='0' data-dialog-type="images">
-									<li>
-										<input type="hidden" name="spec_images[{{$spec_images.name}}]" value="{{$spec_images.images_old}}" data-validation-message="请上传规格图片" required />
-										<img src="{{$spec_images.images}}" />
-									</li>
-								</ul>
-								<div class="plug-file-upload-submit" data-view-tag="ul.spec-images-view-{{$spec_images.name}}">+上传图片</div>
-							</li>
-						{{/foreach}}
+						{{if !empty($specifications['images'])}}
+							{{foreach $specifications.images as $spec_images}}
+								<li>
+									<ul class="plug-file-upload-view spec-images-view-{{$spec_images.name}}" data-form-name="spec_images[{{$spec_images.name}}]" data-max-number="1" data-delete='0' data-dialog-type="images">
+										<li>
+											<input type="hidden" name="spec_images[{{$spec_images.name}}]" value="{{$spec_images.images_old}}" data-validation-message="请上传规格图片" required />
+											<img src="{{$spec_images.images}}" />
+										</li>
+									</ul>
+									<div class="plug-file-upload-submit" data-view-tag="ul.spec-images-view-{{$spec_images.name}}">+上传图片</div>
+								</li>
+							{{/foreach}}
+						{{/if}}
 					</ul>
 				</div>
 			</div>
diff --git a/application/index/view/default/public/nav_search.html b/application/index/view/default/public/nav_search.html
index f316bc534..3bbf7cf49 100755
--- a/application/index/view/default/public/nav_search.html
+++ b/application/index/view/default/public/nav_search.html
@@ -13,8 +13,8 @@
 
     <div class="search-bar">
         <form action="{{:url('index/search/index')}}" method="POST">
-            <input id="search-input" name="keywords" type="text" placeholder="{{:lang('common_so_tips')}}" value="{{if !empty($params['keywords'])}}{{$params.keywords}}{{/if}}" autocomplete="off" />
-            <input id="ai-topsearch" class="submit am-btn" placeholder="{{:lang('common_so_tips')}}" index="1" type="submit" value="搜索" />
+            <input id="search-input" name="keywords" type="text" placeholder="其实搜索很简单^_^ !" value="{{if !empty($params['keywords'])}}{{$params.keywords}}{{/if}}" autocomplete="off" />
+            <input id="ai-topsearch" class="submit am-btn" placeholder="其实搜索很简单^_^ !" index="1" type="submit" value="搜索" />
             <notempty name="home_search_keywords">
                 <ul class="search-hot-keywords">
                     {{foreach $home_search_keywords as $v}}
diff --git a/public/static/admin/default/js/goods.js b/public/static/admin/default/js/goods.js
index f79dfba12..f18192e4a 100755
--- a/public/static/admin/default/js/goods.js
+++ b/public/static/admin/default/js/goods.js
@@ -139,7 +139,6 @@ $(function()
                 }
             });
             spec_all = Object.keys(temp_spec_all);
-            console.log(spec_all)
 
             // 添加规格图片
             if(spec_all.length > 0)
diff --git a/public/static/index/default/js/goods.js b/public/static/index/default/js/goods.js
index 22190cb9e..f3f7f4cf8 100755
--- a/public/static/index/default/js/goods.js
+++ b/public/static/index/default/js/goods.js
@@ -504,8 +504,7 @@ $(window).resize(function()
 $(document).ready(function() {
     //获得文本框对象
     var t = $('#text_box');
-    //初始化数量为1,并失效减
-    $('#min').attr('disabled', true);
+
     //数量增加操作
     $('#add').on('click', function() {
         var stock = parseInt($('.stock-tips .stock').text());
@@ -513,22 +512,12 @@ $(document).ready(function() {
         if(number < stock)
         {
             t.val(number + 1)
-            if (parseInt(t.val()) > 1) {
-                $('#min').attr('disabled', false);
-            }
-        } else {
-            $('#add').attr('disabled', true);
         }
-            
-
-        });
+    });
     //数量减少操作
     $('#min').on('click', function() {
-        t.val(parseInt(t.val()) - 1);
-        if (parseInt(t.val()) == 1) {
-            $('#min').attr('disabled', true);
-        }
-        $('#add').attr('disabled', false);
+        var value = parseInt(t.val())-1 || 1;
+        t.val(value);
     })
 
 });
\ No newline at end of file
-- 
GitLab