Authored by 李奇

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

@@ -70,6 +70,8 @@ Page({ @@ -70,6 +70,8 @@ Page({
70 this._baseParams.promotion_id = options.promotionId; 70 this._baseParams.promotion_id = options.promotionId;
71 this.productList(); 71 this.productList();
72 } 72 }
  73 +
  74 + this.setData({isSearch: this._isSaerch});
73 }, 75 },
74 onShow: function() { 76 onShow: function() {
75 this.getRecentKeys(); 77 this.getRecentKeys();
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <view class="input-bg"></view> 3 <view class="input-bg"></view>
4 <input class="search-input" value="{{query}}" confirm-type="search" placeholder="{{placeholder ? placeholder : '店内潮品搜一下'}}" 4 <input class="search-input" value="{{query}}" confirm-type="search" placeholder="{{placeholder ? placeholder : '店内潮品搜一下'}}"
5 bindconfirm="confirmQuery" bindinput="bindQueryInput" 5 bindconfirm="confirmQuery" bindinput="bindQueryInput"
6 - placeholder-class="placeholder" auto-focus/> 6 + placeholder-class="placeholder" focus="{{isSearch}}"/>
7 <image class="icon" src="../../../static/images/search@2x.png"></image> 7 <image class="icon" src="../../../static/images/search@2x.png"></image>
8 </view> 8 </view>
9 <view class="recent-keys" wx:if="{{recentKeys.length > 0 && !searched}}"> 9 <view class="recent-keys" wx:if="{{recentKeys.length > 0 && !searched}}">