Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list

@@ -94,12 +94,16 @@
 
                 {{#unless hideMore}}
                     <div class="brand-opt">
-                        <span id="brand-more" class="brand-more">
-                            <em>更多</em>
-                            <i class="iconfont">&#xe600;</i>
-                        </span>
+                        {{#if showMore}}
+                            <span id="brand-more" class="brand-more">
+                                <em>更多</em>
+                                <i class="iconfont">&#xe600;</i>
+                            </span>
+                        {{/if}}
 
-                        <span id="brand-multi" class="multi-select">多选 +</span>
+                        {{#if showMulti}}
+                            <span id="brand-multi" class="multi-select">多选 +</span>
+                        {{/if}}
                     </div>
                 {{/unless}}