Merge branch 'dev-mysql' into dev-mysql-1227

src/main/webapp/resources/js/admin/controllers/search/search_See.js

@@ -68,7 +68,7 @@ define(['app/app'], function (app) {
                             'keyword' : $scope.keyword
                      }}).then(function (data) {
                         $scope.result = data.data;
-                        $scope.result.time = (new Date()).valueOf() - timestart;
+                        $scope.searchtime = (new Date()).valueOf() - timestart;
                         console.log(data);
                     },function (error) {
                     });
@@ -81,7 +81,6 @@ define(['app/app'], function (app) {
                             'collectList' : 'goods_kind',
                             'paramJSON':{}
                         }}).then(function (data) {
-                        $scope.result = data.data;
                         $scope.kindtime = (new Date()).valueOf() - timestart;
                         console.log(data);
                     },function (error) {
@@ -95,7 +94,6 @@ define(['app/app'], function (app) {
                             'collectList' : 'goods_brand',
                             'paramJSON':{}
                         }}).then(function (data) {
-                        $scope.result = data.data;
                         $scope.brandtime = (new Date()).valueOf() - timestart;
                         console.log(data);
                     },function (error) {
@@ -182,13 +180,13 @@ define(['app/app'], function (app) {
                 if($rootScope.userInfo) {
                     params.userUU = $rootScope.userInfo.userUU;
                 }
-                $http.get('search/similarKeywords', {
+                /*$http.get('search/similarKeywords', {
                     params : params
                 }).success(function(data){
                     $scope.associates = data;// 联想词数组
                 }).error(function(response) {
 
-                });
+                });*/
             } else {
                 $scope.associates = [];// 联想词数组
             }

src/main/webapp/resources/view/admin/search/search_See.html

@@ -14,7 +14,7 @@
                     共<span class="totalNum">{{result.total}}</span>条
                 </p>
                 <p style="margin-top: 8px; font-weight: bold;">
-                    共耗时<span class="totalNum">{{result.time}}</span>ms  <br><br>
+                    共耗时<span class="totalNum">{{searchtime}}</span>ms  <br><br>
                     类目统计共耗时 {{kindtime}} ms <br><br>
                     品牌统计共耗时 {{brandtime}} ms
                 </p>