Merge remote-tracking branch 'origin/master'

doum

15 小时以前 b902b40fda2f1dccca0825277d07908119deecfd

 mini-program/pages/search/search.vue

@@ -2,7 +2,7 @@
   <view class="box">
      <view class="search">
         <u-search placeholder="请输入商品名称搜索" height="36" searchIconColor="#999999" borderColor="#EEEEEE"
            bgColor="#F9F9FB" :showAction="false" v-model="goodsName" @search="search" />
            bgColor="#F9F9FB" :showAction="false" v-model="goodsName" @search="search" @clear="goodsList = []" />
      </view>
      <view class="history" v-if="historyList && historyList.length > 0">
         <view class="history-title">历史搜索</view>
@@ -228,6 +228,7 @@
            .commodity-item-image {
               width: 100%;
               height: 336rpx;
               overflow: hidden;
               display: flex;
               align-items: center;
               justify-content: center;