Authored by wangshusheng

Merge branch 'test6.9.1' into gray

... ... @@ -204,8 +204,8 @@
</span>
<span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
<!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>-->
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a>
<a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
[[if state=="1"]]
... ... @@ -235,8 +235,8 @@
</span>
<span class="operate" data-id="[[a.categoryId]]" data-name="[[a.categoryName]]">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
<!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a>-->
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[a.categoryId]]">标签管理新</a>
<a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
[[if a.state=="1"]]
... ... @@ -266,8 +266,8 @@
</span>
<span class="operate" data-id="[[b.categoryId]]" data-name="[[b.categoryName]]">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
<!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a>-->
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[b.categoryId]]">标签管理新</a>
<a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
[[if b.state=="1"]]
... ... @@ -305,8 +305,8 @@
<span class="status">[[if state=="1"]]<b style="color: #449d44">开启</b>[[/if]][[if state=="0"]]<b style="color: #d9534f">关闭</b>[[/if]]</span>
<span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]" style="width: auto !important;">
<a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
<!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>-->
<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a>
<a class="btn btn-primary btn-xs add-sub-category" href="javascript:;">添加子分类</a>
<b class="openAndClose" data-id="[[categoryId]]" data-name="[[categoryName]]">
... ...