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

src/main/java/com/uas/platform/b2c/advertise/ad/api/CarouselsController.java

@@ -16,7 +16,9 @@ import java.util.List;
  *
  * @author huxz
  * @version 2017-08-02 15:52:03 创建文件
+ * @version 2018-7-27 14:46 弃用，该用cms接口
  */
+@Deprecated
 @RestController
 @RequestMapping("/api/carousel")
 public class CarouselsController {

src/main/java/com/uas/platform/b2c/advertise/ad/api/FloorsController.java

@@ -16,7 +16,9 @@ import java.util.List;
  *
  * @author suntg
  * @version 2017-08-02 15:55:44 创建文件
+ * @version 2018-07-27 弃用
  */
+@Deprecated
 @RestController
 @RequestMapping("/api/floors")
 public class FloorsController {

src/main/java/com/uas/platform/b2c/advertise/ad/service/CarouselService.java

@@ -11,6 +11,7 @@ import java.util.List;
  * @author huxz
  * @version 2017-08-02 16:07:08 创建文件
  */
+@Deprecated
 public interface CarouselService {
 
     /**

src/main/java/com/uas/platform/b2c/advertise/ad/service/FloorsService.java

@@ -10,6 +10,7 @@ import java.util.List;
  * @author suntg
  * @version 2017-03-23 16:08:02
  */
+@Deprecated
 public interface FloorsService {
 
 	/**

src/main/java/com/uas/platform/b2c/advertise/ad/service/impl/CarouselsServiceImpl.java

@@ -17,6 +17,7 @@ import java.util.*;
  * @author huxz
  * @version 2017-08-02 16:11:37 创建文件
  */
+@Deprecated
 @Service
 public class CarouselsServiceImpl implements CarouselService{
 

src/main/java/com/uas/platform/b2c/advertise/ad/service/impl/FloorsServiceImpl.java

@@ -21,6 +21,7 @@ import java.util.Map;
  * @author  suntg
  * @version 2017-08-02 16:12:15 创建文件
  */
+@Deprecated
 @Service
 public class FloorsServiceImpl implements FloorsService {
 

src/main/java/com/uas/platform/b2c/common/search/service/impl/SearcherServiceImpl.java

@@ -270,7 +270,9 @@ public class SearcherServiceImpl implements SearcherService {
         }
 
         for (Object PrId : futuresPage.getContent()) {
-            productList.add(productDao.findOne(Long.valueOf(PrId.toString())));
+            Product product = productDao.findOne(Long.valueOf(PrId.toString()));
+            product.setEnName(enterpriseDao.findByUu(product.getEnUU()).getEnName());
+            productList.add(product);
         }
 
         stockMap.put("content", goodsList);

src/main/java/com/uas/platform/b2c/prod/commodity/model/Product.java

@@ -446,6 +446,17 @@ public class Product {
 	@Transient
 	private Enterprise enterprise;
 
+	@Transient
+	private String enName;
+
+	public String getEnName() {
+		return enName;
+	}
+
+	public void setEnName(String enName) {
+		this.enName = enName;
+	}
+
 	public Enterprise getEnterprise() {
 		return enterprise;
 	}

src/main/webapp/WEB-INF/views/normal/index.html

@@ -37,7 +37,7 @@
 
 	<div ng-include src="'static/view/common/advert.html'"></div>
 
-	<div ng-include src="'static/view/common/floor.html'"></div>
+	<!--<div ng-include src="'static/view/common/floor.html'"></div>-->
 
 	<div ng-include src="'static/view/home/news.html'"></div>
 

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/js/vendor/app.js

@@ -702,6 +702,15 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 					}
 				});
 				$rootScope.userInfo = data;
+				if (!data.enterprise || !data.enterprise.uu) {
+					window.location.href = 'personalMaterial';
+				} else {
+					if (data.enterprise.isVendor === 313) {
+						window.location.href = 'vendor#/index';
+					} else {
+						window.location.href = 'register-saler';
+					}
+				}
 				if ($location.$$path === '/index') {
 					// if ($rootScope.applyStatus === 'NONE') {
 					// 	$state.go('vendor_store_apply');

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

@@ -181,6 +181,9 @@
         padding: 0 15px;
         line-height: 30px;
         text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     #mall-search .association li.active, #mall-search .association li.active:hover {
@@ -222,23 +225,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

@@ -181,6 +181,9 @@
         padding: 0 15px;
         line-height: 30px;
         text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     #mall-search .association li.active, #mall-search .association li.active:hover {
@@ -222,23 +225,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

@@ -181,6 +181,9 @@
         padding: 0 15px;
         line-height: 30px;
         text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
     #mall-search .association li.active, #mall-search .association li.active:hover {
         background: #dddddd;
@@ -219,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-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>