Commit f2a2ba61e1242909ed430f6b4f47ede8428b8a4c
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
2 changed files
with
2 additions
and
1 deletions
pages/goods/search/search.wxml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <form bindsubmit="submitSearch"> | 6 | <form bindsubmit="submitSearch"> |
| 7 | <view class="pdh20 pdv10 flex ai_c jc_sb"> | 7 | <view class="pdh20 pdv10 flex ai_c jc_sb"> |
| 8 | <view class="input-box"> | 8 | <view class="input-box"> |
| 9 | - <input class="input-search" name="word" placeholder="搜索商品" bindconfirm="submitSearch" bindinput="getInput" bindfocus="inputFocus" value="{{keyword}}"/> | 9 | + <input class="input-search" name="word" placeholder="请输入商品关键字" bindconfirm="submitSearch" bindinput="getInput" bindfocus="inputFocus" value="{{keyword}}"/> |
| 10 | <text class="iconfont icon-guan" hidden="{{hiddenClear}}" catchtap="clearInput"></text> | 10 | <text class="iconfont icon-guan" hidden="{{hiddenClear}}" catchtap="clearInput"></text> |
| 11 | </view> | 11 | </view> |
| 12 | <button class="btn" formType="submit" hover-class="none">搜索</button> | 12 | <button class="btn" formType="submit" hover-class="none">搜索</button> |
pages/index/index/index.wxml
| @@ -417,6 +417,7 @@ | @@ -417,6 +417,7 @@ | ||
| 417 | <view id="off_top" wx:if="{{is_gz_h5}}"> | 417 | <view id="off_top" wx:if="{{is_gz_h5}}"> |
| 418 | <official-account></official-account> | 418 | <official-account></official-account> |
| 419 | </view> | 419 | </view> |
| 420 | + <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;flex-shrink:0"></view> | ||
| 420 | 421 | ||
| 421 | <block wx:for="{{template_arr}}"> | 422 | <block wx:for="{{template_arr}}"> |
| 422 | <block wx:if="{{item.content.is_top==1}}"> | 423 | <block wx:if="{{item.content.is_top==1}}"> |