Authored by xuhongyun

Merge branch 'dev_2.2' into test

@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 <input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')"> 9 <input id="skn" class="form-control panel-input height40" type="text" placeholder="请输入SKN" onkeyup="this.value=this.value.replace(/\D/gi,'')">
10 </div> 10 </div>
11 11
12 - <div class="panel-col"> 12 + <!-- <div class="panel-col">
13 <select name="shop" id="shop" tabindex="-1" title="" class="form-control"> 13 <select name="shop" id="shop" tabindex="-1" title="" class="form-control">
14 <option value="-1">请选择店铺</option> 14 <option value="-1">请选择店铺</option>
15 </select> 15 </select>
16 - </div> 16 + </div> -->
17 17
18 <div class="panel-col"> 18 <div class="panel-col">
19 <select name="brand" id="brand" tabindex="-1" title="" class="form-control"> 19 <select name="brand" id="brand" tabindex="-1" title="" class="form-control">