Merge remote-tracking branch 'origin/release-201819-wangcz' into release-201819-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2120,6 +2120,7 @@ public class ProductServiceImpl implements ProductService {
         product.setPbrandid(component.getBrandid());
         product.setPbranduuid(component.getBrand().getUuid());
         product.setCmpCode(component.getCode());
+        product.setPcmpcode(component.getCode());
         product.setCmpImg(component.getImg());
         product.setCmpUuId(component.getUuid());
         product.setStandard(IntegerConstant.YES_SHORT);

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -257,7 +257,7 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 搜索框Ctrl
-	app.controller('SearchCtrl', ['$scope', '$http', '$rootScope', 'SessionService', function($scope, $http, $rootScope, SessionService) {
+	app.controller('SearchCtrl', ['$scope', '$http', '$rootScope', 'SessionService', 'toaster', function($scope, $http, $rootScope, SessionService, toaster) {
         // 默认搜索类型
         $scope.searchType = 'component';
         $scope.placeholderSearch = '请输入型号';
@@ -283,6 +283,8 @@ define([ 'app/app' ], function(app) {
                 SessionService.set('brand', true);
                 SessionService.unset('component');
                 window.location.href = 'search?w=' + encodeURI($scope.keyword) + '&type=' + $scope.searchType;
+            } else {
+              toaster.pop("info", "请输入关键字");
             }
         };