Просмотр исходного кода

Merge remote-tracking branch 'origin/dev4.5.2' into dev4.5.2

wangkaiyue 4 лет назад
Родитель
Сommit
3b36f3c1cb
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      src/web/templates/weixin/search/tabSearch.html

+ 7 - 3
src/web/templates/weixin/search/tabSearch.html

@@ -618,9 +618,13 @@
                                         <p>开通超级订阅,全国企业随手查,<br>搜索信息更高效!</p>
                                     </div>
                                     <div class="condition-select-group" :class="{more: isMoreSelect}" v-show="!isWaitBuy && conditionMap[activeTabIndex]">
-                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked}">
-                                            <div>@@item.title@@</div>
-                                            <i v-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
+                                        <div class="condition-select-item" @click="onSelectItem(item, activeTabIndex)" v-for="(item,i) in conditionMap[activeTabIndex]" :class="{checked: item.checked, 'disabled': item.disabled}">
+                                            <div class="row-item-group">
+                                                <span>@@item.title@@</span>
+                                                <div v-if="item.tag" class="tip-tag">@@item.tag@@</div>
+                                            </div>
+                                            <div class="disabled-tag" v-if="item.disabled === true">开通</div>
+                                            <i v-else-if="!isMoreSelect" class="j-icon base-icon icon-tick"></i>
                                             <div class="more-icon-box" v-else>
                                                 <i  class="j-icon base-icon icon-tick-circle"></i>
                                                 <i  class="j-icon base-icon icon-tick-circle-fill"></i>