Merge remote-tracking branch 'origin/release-20170915' into release-20170915

components/supplier/merchant.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="search">
         <div class="input-group">
-          <input type="search" class="form-control" title="code" placeholder="名称/地址/行业/型号/品牌"
+          <input type="search" class="form-control" title="code" placeholder="名称/地址/行业"
                  v-model="searchCode" @keyup.13="goodsSearch(searchCode)" @search="goodsSearch(searchCode)"/>
           <span class="input-group-btn">
             <button type="button" class="btn" @click="goodsSearch(searchCode)">&nbsp;查 询</button>