Merge remote-tracking branch 'origin/feature/import' into feature/import

@@ -70,6 +70,8 @@ Page({
       this._baseParams.promotion_id = options.promotionId;
       this.productList();
     }
+
+    this.setData({isSearch: this._isSaerch});
   },
   onShow: function() {
     this.getRecentKeys();

@@ -3,7 +3,7 @@
         <view class="input-bg"></view>
         <input class="search-input" value="{{query}}" confirm-type="search" placeholder="{{placeholder ? placeholder : '店内潮品搜一下'}}"
                bindconfirm="confirmQuery" bindinput="bindQueryInput"
-            placeholder-class="placeholder" auto-focus/>
+            placeholder-class="placeholder" focus="{{isSearch}}"/>
         <image class="icon" src="../../../static/images/search@2x.png"></image>
     </view>
     <view class="recent-keys" wx:if="{{recentKeys.length > 0 && !searched}}">