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

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

@@ -258,23 +258,23 @@ define([ 'app/app' ], function(app) {
 
 	// 搜索框Ctrl
 	app.controller('SearchCtrl', ['$scope', '$http', '$rootScope', 'SessionService', function($scope, $http, $rootScope, SessionService) {
-		// $scope.searchType = {
-		// 	original: false,
-		// 	inaction: false,
-		// 	proffing: false,
-		// 	brand: false,
-		// 	isCmp: function() {
-		// 		var me = this;
-		// 		return me.original || me.inaction || me.proffing;
-		// 	}
-		// };
         // 默认搜索类型
         $scope.searchType = 'component';
+        $scope.placeholderSearch = '请输入型号';
 
 		// 选搜索类型
         $scope.setTypeClick = function (type) {
-        	$scope.searchType = type
-            $scope.search()
+            $scope.keyword = '';
+        	$scope.searchType = type;
+			if (type === 'kind') {
+                $scope.placeholderSearch = '请输入物料名称';
+			} else if (type === 'store') {
+                $scope.placeholderSearch = '请输入卖家名称';
+            } else if (type === 'brand') {
+                $scope.placeholderSearch = '请输入品牌';
+            } else {
+                $scope.placeholderSearch = '请输入型号';
+            }
 		};
 
         // 搜索
@@ -382,8 +382,7 @@ define([ 'app/app' ], function(app) {
 				$http.get('search/similarKeywords', {
 					params : params
 				}).success(function(data){
-					$scope.associates = data;// 联想词数组
-					console.log('1', data)
+					$scope.associates = data.result;// 联想词数组
 				}).error(function(response) {
 					console.log(response)
 				});

src/main/webapp/resources/view/sso/header.html

@@ -222,23 +222,20 @@
             <div class="search-list">
                 <ul class="list-inline">
                     <li ng-class="{'active': searchType === 'component'}" ng-click="setTypeClick('component')">型号</li>
-                    <li ng-class="{'active': searchType === 'product'}" ng-click="setTypeClick('product')">物料名称</li>
+                    <li ng-class="{'active': searchType === 'kind'}" ng-click="setTypeClick('kind')">物料名称</li>
                     <li ng-class="{'active': searchType === 'store'}" ng-click="setTypeClick('store')">卖家</li>
                     <li ng-class="{'active': searchType === 'brand'}" ng-click="setTypeClick('brand')">品牌</li>
                 </ul>
             </div>
-            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="品牌/物料名称/型号" />
+            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" placeholder="{{placeholderSearch}}" />
             <a class="seek" ng-click="search()">搜索</a>
-            <ul class="association" ng-show="associate || associateEnter"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
-                <li class="similar-title" ng-if="associates.component && associates.brand.length > 0">品牌：</li>
-                <li ng-repeat="as in associates.brand" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.kind.length > 0">物料名称(类目)：</li>
-                <li ng-repeat="as in associates.kind" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
-                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
+            <ul class="association" ng-show="keyword && (associate || associateEnter)"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
+                <li ng-repeat="as in associates" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.code)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.nameCn)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.name" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.name)"></li>
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/usercenter/header.html

@@ -222,23 +222,20 @@
             <div class="search-list">
                 <ul class="list-inline">
                     <li ng-class="{'active': searchType === 'component'}" ng-click="setTypeClick('component')">型号</li>
-                    <li ng-class="{'active': searchType === 'product'}" ng-click="setTypeClick('product')">物料名称</li>
+                    <li ng-class="{'active': searchType === 'kind'}" ng-click="setTypeClick('kind')">物料名称</li>
                     <li ng-class="{'active': searchType === 'store'}" ng-click="setTypeClick('store')">卖家</li>
                     <li ng-class="{'active': searchType === 'brand'}" ng-click="setTypeClick('brand')">品牌</li>
                 </ul>
             </div>
-            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="品牌/物料名称/型号" />
+            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" placeholder="{{placeholderSearch}}" />
             <a class="seek" ng-click="search()">搜索</a>
-            <ul class="association" ng-show="associate || associateEnter"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
-                <li class="similar-title" ng-if="associates.component && associates.brand.length > 0">品牌：</li>
-                <li ng-repeat="as in associates.brand" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.kind.length > 0">类目：</li>
-                <li ng-repeat="as in associates.kind" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
-                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
+            <ul class="association" ng-show="keyword && (associate || associateEnter)"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
+                <li ng-repeat="as in associates" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.code)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.nameCn)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.name" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.name)"></li>
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/vendor/header.html

@@ -219,23 +219,20 @@
             <div class="search-list">
                 <ul class="list-inline">
                     <li ng-class="{'active': searchType === 'component'}" ng-click="setTypeClick('component')">型号</li>
-                    <li ng-class="{'active': searchType === 'product'}" ng-click="setTypeClick('product')">物料名称</li>
+                    <li ng-class="{'active': searchType === 'kind'}" ng-click="setTypeClick('kind')">物料名称</li>
                     <li ng-class="{'active': searchType === 'store'}" ng-click="setTypeClick('store')">卖家</li>
                     <li ng-class="{'active': searchType === 'brand'}" ng-click="setTypeClick('brand')">品牌</li>
                 </ul>
             </div>
-            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="品牌/物料名称/型号" />
+            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" placeholder="{{placeholderSearch}}" />
             <a class="seek" ng-click="search()">搜索</a>
-            <ul class="association" ng-show="associate || associateEnter" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()" ng-class="{'none': !associate || !associateEnter}">
-                <li class="similar-title" ng-if="associates.component && associates.brand.length > 0">品牌：</li>
-                <li ng-repeat="as in associates.brand" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.kind.length > 0">类目：</li>
-                <li ng-repeat="as in associates.kind" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.nameCn)"></li>
-                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
-                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
+            <ul class="association" ng-show="keyword && (associate || associateEnter)"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
+                <li ng-repeat="as in associates" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.code)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.nameCn)"></li>
+                <li ng-repeat="as in associates" ng-bind="as.name" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.name)"></li>
             </ul>
         </div>
     </div>