fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangshusheng
Commit 4bc38bd60d0be21a512027a822bb5d901d60cebe 2 parents 6ffc563b 969db000

Merge branch 'test6.9.1' into gray

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
@@ -204,8 +204,8 @@ @@ -204,8 +204,8 @@
204 </span> 204 </span>
205 <span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]"> 205 <span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]">
206 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a> 206 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
207 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>  
208 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a> 207 + <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
  208 + <!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>-->
209 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a> 209 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a>
210 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a> 210 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
211 [[if state=="1"]] 211 [[if state=="1"]]
@@ -235,8 +235,8 @@ @@ -235,8 +235,8 @@
235 </span> 235 </span>
236 <span class="operate" data-id="[[a.categoryId]]" data-name="[[a.categoryName]]"> 236 <span class="operate" data-id="[[a.categoryId]]" data-name="[[a.categoryName]]">
237 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a> 237 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
238 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>  
239 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a> 238 + <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
  239 + <!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[a.categoryId]]">标签管理</a>-->
240 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[a.categoryId]]">标签管理新</a> 240 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[a.categoryId]]">标签管理新</a>
241 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a> 241 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
242 [[if a.state=="1"]] 242 [[if a.state=="1"]]
@@ -266,8 +266,8 @@ @@ -266,8 +266,8 @@
266 </span> 266 </span>
267 <span class="operate" data-id="[[b.categoryId]]" data-name="[[b.categoryName]]"> 267 <span class="operate" data-id="[[b.categoryId]]" data-name="[[b.categoryName]]">
268 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a> 268 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
269 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>  
270 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a> 269 + <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
  270 + <!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[b.categoryId]]">标签管理</a>-->
271 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[b.categoryId]]">标签管理新</a> 271 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[b.categoryId]]">标签管理新</a>
272 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a> 272 <a class="btn btn-info btn-xs add-sub-category" href="javascript:;">添加子分类</a>
273 [[if b.state=="1"]] 273 [[if b.state=="1"]]
@@ -305,8 +305,8 @@ @@ -305,8 +305,8 @@
305 <span class="status">[[if state=="1"]]<b style="color: #449d44">开启</b>[[/if]][[if state=="0"]]<b style="color: #d9534f">关闭</b>[[/if]]</span> 305 <span class="status">[[if state=="1"]]<b style="color: #449d44">开启</b>[[/if]][[if state=="0"]]<b style="color: #d9534f">关闭</b>[[/if]]</span>
306 <span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]" style="width: auto !important;"> 306 <span class="operate" data-id="[[categoryId]]" data-name="[[categoryName]]" style="width: auto !important;">
307 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a> 307 <a class="btn btn-info btn-xs edit-btn" href="javascript:;">编辑</a>
308 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">搜索资源位直通车管理</a>  
309 - <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a> 308 + <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/resource/[[categoryId]]">直通车管理</a>
  309 + <!--<a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/tag/[[categoryId]]">标签管理</a>-->
310 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a> 310 <a class="btn btn-success btn-xs tagmgmt-btn" href="/sale/category/searchLabel/[[categoryId]]">标签管理新</a>
311 <a class="btn btn-primary btn-xs add-sub-category" href="javascript:;">添加子分类</a> 311 <a class="btn btn-primary btn-xs add-sub-category" href="javascript:;">添加子分类</a>
312 <b class="openAndClose" data-id="[[categoryId]]" data-name="[[categoryName]]"> 312 <b class="openAndClose" data-id="[[categoryId]]" data-name="[[categoryName]]">