#3 隐藏后台店铺管理寄售店铺的违规处置标签

src/main/java/com/uas/platform/b2c/prod/store/api/StoreInController.java

@@ -93,6 +93,7 @@ public class StoreInController {
 	 * @param keyword	查询关键字
 	 * @return
 	 */
+	@Deprecated
 	@RequestMapping(value = "/stores", method = RequestMethod.GET, params = "op=page")
 	public Page<StoreIn> findStoresByPage(PageParams params, String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
@@ -125,7 +126,7 @@ public class StoreInController {
 	 * @param keyword		查询关键字
 	 */
 	@RequestMapping(value = "/stores", method = RequestMethod.GET, params = "op=pageByType")
-	public Page<StoreIn> pageStoresByTypesAndKeyword(PageParams params, String types, @RequestParam(required = false) String keyword) {
+	public Page<StoreIn> pageStoresByTypesAndKeywordWhenUserVisitList(PageParams params, String types, @RequestParam(required = false) String keyword) {
 		PageInfo pageInfo = new PageInfo(params);
 		return storeService.pageStoresByTypesAndKeyword(pageInfo, types, keyword);
 	}

src/main/webapp/resources/js/admin/app.js

@@ -282,7 +282,7 @@
 			controllerUrl : 'app/controllers/StoreInfoListCtrl'
 		})).state('store_info_detail', angularAMD.route({
 			// 店铺详情，违规处理页面
-			url: '/store/:uuid/detail',
+			url: '/store/:uuid/detail/:type',
 			templateUrl : 'static/view/admin/store/store_info_detail.html',
 			controller : 'StoreInfoDetailCtrl',
 			controllerUrl : 'app/controllers/store/StoreInfoDetailCtrl'
@@ -749,6 +749,7 @@
 			if (data == 'AGENCY') return '代理商';
 			if (data == 'DISTRIBUTION') return '经销商';
 			if (data == 'ORIGINAL_FACTORY') return '原厂';
+			if (data == 'CONSIGNMENT') return '寄售';
 			return '暂无类型信息'
 		};
 	});

src/main/webapp/resources/js/admin/controllers/StoreInfoListCtrl.js

@@ -149,7 +149,7 @@ define([ 'app/app' ], function(app) {
 		 */
 		$scope.goStoreDetail = function (store) {
 			if (store && store.uuid) {
-				$state.go('store_info_detail', { uuid : store.uuid });
+				$state.go('store_info_detail', { uuid : store.uuid, type: store.type });
 			} else {
 				toaster.pop('error', '店铺信息不能为空');
 			}

src/main/webapp/resources/js/admin/controllers/store/StoreInfoDetailCtrl.js

@@ -5,6 +5,7 @@ define([ 'app/app' ], function(app) {
 
 		// 店铺UUID
 		$scope.storeUuid = $stateParams.uuid;
+		$scope.storeType = $stateParams.type;
 
 		// Tab 选项，ENTERPRISE，VIOLATIONS
 		$scope.tabSelected = 'ENTERPRISE';

src/main/webapp/resources/view/admin/store/store_info_detail.html

@@ -104,7 +104,7 @@
 		<div class="col-sm-8">
 			<div class="btn-group" role="group">
 				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'ENTERPRISE' }" ng-click="switchTab('ENTERPRISE')">企业信息</a>
-				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')">违规</a>
+				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')" ng-if="storeType !== 'CONSIGNMENT'">违规</a>
 			</div>
 		</div>
 	</div>