Merge remote-tracking branch 'origin/develop'

@@ -46,6 +46,11 @@ cHammer.on('tap', function() {
     $input.val('').trigger('input');
     $input.val('').trigger('input');
 });
 });
 
 
+$('#search').on('touchend', function() {
+    $(this).closest('form').submit();
+    return false;
+});
+
 //初始化历史搜索的内容
 //初始化历史搜索的内容
 (function() {
 (function() {
     var html = '',
     var html = '',

@@ -69,6 +69,13 @@ var $listNav = $('#list-nav'),
     btnIntroHammer,
     btnIntroHammer,
     introHammer,
     introHammer,
     brandColHammer;
     brandColHammer;
+/**
+ * 手动触发搜索
+ */
+$('#search').on('touchend', function() {
+    $(this).closest('form').submit();
+    return false;
+});
 
 
 /**
 /**
  * 筛选注册的回调，筛选子项点击后逻辑
  * 筛选注册的回调，筛选子项点击后逻辑

@@ -35,10 +35,10 @@
         .search {
         .search {
             position: absolute;
             position: absolute;
             top: 18rem / $pxConvertRem;
             top: 18rem / $pxConvertRem;
-            left: 515rem / $pxConvertRem;
+            right: 40rem / $pxConvertRem;
             border: none;
             border: none;
             background: transparent;
             background: transparent;
-            color: #000;
+            color: #666;
             font-size: 30rem / $pxConvertRem;
             font-size: 30rem / $pxConvertRem;
             line-height: 56rem / $pxConvertRem;
             line-height: 56rem / $pxConvertRem;
         }
         }

@@ -32,8 +32,8 @@
 
 
         .search {
         .search {
             position: absolute;
             position: absolute;
-            top: 7px;
-            right:0;
+            top: 2px;
+            right: -30px;
             border: none;
             border: none;
             background: transparent;
             background: transparent;
             font-size: 16px;
             font-size: 16px;
@@ -41,6 +41,7 @@
             height: 30px;
             height: 30px;
             overflow: hidden;
             overflow: hidden;
             line-height: 30px;
             line-height: 30px;
+            color: #666;
         }
         }
     }
     }
 
 

@@ -7,7 +7,7 @@
                 <input type="text" placeholder="搜索商品" name="query">
                 <input type="text" placeholder="搜索商品" name="query">
                 <input type="hidden" name="from" value="search">
                 <input type="hidden" name="from" value="search">
                 <i class="clear-input iconfont hide">&#xe626;</i>
                 <i class="clear-input iconfont hide">&#xe626;</i>
-                <button id="search" class="search" type="submit">搜索</button>
+                <span id="search" class="search" type="submit">搜索</span>
             </form>
             </form>
         </div>
         </div>
         <div class="search-items">
         <div class="search-items">

@@ -6,7 +6,7 @@
                 <input type="text" value="{{default}}" name="query">
                 <input type="text" value="{{default}}" name="query">
                 <input type="hidden" value="search" name="from">
                 <input type="hidden" value="search" name="from">
                 <i class="clear-input iconfont hide">&#xe61a;</i>
                 <i class="clear-input iconfont hide">&#xe61a;</i>
-                <button id="search" class="search" type="submit">搜索</button>
+                <span id="search" class="search" type="submit">搜索</span>
             </form>
             </form>
         </div>
         </div>
     {{/ search}}
     {{/ search}}