Merge remote-tracking branch 'origin/feature/yc-mobile_maimai-0525' into feature/yc-mobile_maimai-0525

src/main/java/com/uas/platform/b2c/prod/store/model/EnterpriseSimple.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 
+import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -93,6 +94,19 @@ public class EnterpriseSimple {
 	 */
 	private Date enDate;
 
+	/**
+	 * 企业简介
+	 */
+	private String description;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 	public EnterpriseSimple() {
 	}
 

src/main/java/com/uas/platform/b2c/prod/store/model/StoreIn.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2c.prod.store.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.core.utils.JacksonUtils;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import org.springframework.util.StringUtils;
@@ -119,6 +121,10 @@ public class StoreIn implements Serializable {
 	@Column(name = "st_enuu")
 	private Long enUU;
 
+	@OneToOne(cascade = { CascadeType.REFRESH })
+	@JoinColumn(name = "st_enuu", insertable = false, updatable = false)
+	private Enterprise enterpriseInfo;
+
 	/**
 	 * 企业信息JSON
 	 */
@@ -174,6 +180,14 @@ public class StoreIn implements Serializable {
 	@Transient
 	private List<Goods> goodses;
 
+	public Enterprise getEnterpriseInfo() {
+		return enterpriseInfo;
+	}
+
+	public void setEnterpriseInfo(Enterprise enterpriseInfo) {
+		this.enterpriseInfo = enterpriseInfo;
+	}
+
 	public StoreIn() {
 	}
 
@@ -291,7 +305,11 @@ public class StoreIn implements Serializable {
 
 	public EnterpriseSimple getEnterprise() {
 		try {
-			return StringUtils.hasText(this.enterpriseJson) ? JacksonUtils.fromJson(this.enterpriseJson, EnterpriseSimple.class) : null;
+			this.enterprise = StringUtils.hasText(this.enterpriseJson) ? JacksonUtils.fromJson(this.enterpriseJson, EnterpriseSimple.class) : null;
+			if (!StringUtils.isEmpty(this.enterpriseInfo)) {
+				this.enterprise.setDescription(this.enterpriseInfo.getDescription());
+			}
+			return this.enterprise;
 		} catch (Exception e) {
 			e.printStackTrace();
 			return new EnterpriseSimple();

src/main/java/com/uas/platform/b2c/trade/vendor/service/impl/VendorIntroductionServiceImpl.java

@@ -65,8 +65,6 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		// 拼接查询条件
 		if (!StringUtils.isEmpty(keyword)) {
             keyword = keyword.trim();
-			enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
-					+ keyword + "%')";
             if (!StringUtils.isEmpty(field)) {
             	switch (field) {
 					case KIND_EQUAL :
@@ -78,8 +76,15 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 					case PBRANDEN_EQUAL :
 						productCondition = "pr_pbranden = '" + keyword + "'";
 						break;
+                    default :
+                        enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
+                                + keyword + "%')";
+                        break;
 				}
-			}
+			} else {
+                enterpriseCondition = "(en_name like '%" + keyword + "%' or en_address like '%" + keyword + "%' or en_industry like '% "
+                        + keyword + "%')";
+            }
         }
         Long enUU = 0L;
         if (null != SystemSession.getUser() && null != SystemSession.getUser().getEnterprise()) {
@@ -161,7 +166,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 		StringBuilder vendorIntroductionUusSql = new StringBuilder();
 		// 行数 控制
 		String rownumSql = ") s order by isStore desc,prodCounts desc,enUU asc limit " + (page - 1) * size + "," + size ;
-		vendorIntroductionUusSql.append("select s.*, if( st_uuid is not null and st_status = 'OPENED', 1, 0) isStore");
+		vendorIntroductionUusSql.append("select s.*, if( st_uuid is not null and st_status = 'OPENED', 1, null) isStore");
 		vendorIntroductionUusSql.append(",(select count(1) from ( select pr_enuu from v$product$private where ").append(productCondition)
 				.append(" and ifnull(pr_b2cenabled, 1) = 1 and pr_pbranden is not null and pr_pcmpcode is not null) p1 where pr_enuu = enUU) prodCounts");
 		vendorIntroductionUusSql.append(" from (").append(enterpriseSql).append(rownumSql);
@@ -232,7 +237,7 @@ public class VendorIntroductionServiceImpl implements VendorIntroductionService
 				" en_name like '%tcl%' or en_name not regexp '[\\u4e00-\\u9fa5_a-zA-Z0-9]')) and ").append(enterpriseCondition).append(" and en_uu <> ").append(enUU)
 				.append(") e");
 		if (!StringUtils.isEmpty(productCondition)) {
-			enUUSql.append(" right join ( select pr_enuu from v$product$private where ").append(productCondition).append(") p on pr_enuu = en_uu");
+			enUUSql.append(" right join ( select pr_enuu from v$product$private where ").append(productCondition).append(") p on pr_enuu = en_uu where en_uu is not null ");
 		}
 		enUUSql.append(" group by en_uu order by count(1) desc ");
 		return enUUSql.toString();

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

@@ -688,7 +688,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 				$rootScope.applyStatus = 'NONE';
 			}
 
-			if ($rootScope.applyStatus === 'NONE' && $location.$$path === '/index') {
+			if ($location.$$path === '/index') {
                 AuthenticationService.getAuthentication().success(function (data) {
                     angular.forEach(data.enterprises, function (item) {
                         if (item.current) {
@@ -696,9 +696,11 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
                         }
                     });
                     $rootScope.userInfo = data;
-                    if (!(!data.pwdEnable || !data.haveUserQuestion||!data.emailValidCode || data.emailValidCode != 2)) {
-                        $state.go('vendor_store_apply');
-                    }
+					if ($rootScope.applyStatus === 'NONE') {
+						$state.go('vendor_store_apply');
+					} else if ($rootScope.applyStatus === 'PASS') {
+						$state.go('vendor_store_maintain');
+					}
                 }).error(function (error) {
                     toaster.pop('error', '获取登录信息失败');
                 })

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_order_ctrl.js

@@ -585,7 +585,7 @@ define(['app/app'], function (app) {
 
         // 填写物流信息
         $scope.toBeShiped = function (purchase) {
-            if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && ($scope.userInfo.userEmail==null?false:true))){
+            if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && $scope.userInfo.emailValidCode == 2)){
                 $scope.openHomeCenterModel();
             } else {
                 bankInfoService.getVenderBankDefault(null, function (data) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_maintain_ctrl.js

@@ -261,10 +261,10 @@ define(['app/app'], function (app) {
 				toaster.pop('error', '店铺信息不能为空');
 				return false;
 			}
-			if (!$scope.sampleStore.description || $scope.sampleStore.description == '') {
-				toaster.pop('error', '店铺简介信息不能为空');
-				return false;
-			}
+			// if (!$scope.sampleStore.description || $scope.sampleStore.description == '') {
+			// 	toaster.pop('error', '店铺简介信息不能为空');
+			// 	return false;
+			// }
 			if (!$scope.sampleStore.enterprise) {
 				toaster.pop('error', '企业信息不能为空');
 				return false;
@@ -274,7 +274,7 @@ define(['app/app'], function (app) {
 				return false;
 			}*/
 			if (!$scope.sampleStore.enterprise.address || $scope.sampleStore.enterprise.address == '') {
-				toaster.pop('error', '企业地址不能为空');
+				toaster.pop('error', '店铺地址不能为空');
 				return false;
 			}
 			if (!$scope.sampleStore.enterprise.enTel || $scope.sampleStore.enterprise.enTel == '') {

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

@@ -273,9 +273,9 @@ td {
 				<a name="detail" href="product/component/{{item.componentinfo.uuid}}/">
                     <img ng-src="{{item.componentinfo.img || 'static/img/user/images/default.png'}}" class="collect-img" />
                     <div class="collect-content">
-                        <p ng-bind="item.componentinfo.code"></p>
-                        <p ng-bind="item.componentinfo.brand.nameEn">
-                        <p ng-bind="item.componentinfo.kind.nameCn">           
+												<p ng-bind="item.componentinfo.brand.nameEn">
+												<p ng-bind="item.componentinfo.kind.nameCn">
+												<p ng-bind="item.componentinfo.code"></p>
                     </div> 
                 </a>
                 <span class="collect-delete" ng-click="cancleStore(item.id)" ng-show="show && !isBatch"><i class="fa fa-trash fa-2x"></i></span>      

src/main/webapp/resources/view/usercenter/forstore/bomDetail.html

@@ -631,7 +631,7 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="260">类目/品牌</th>
+                <th width="260">品牌/类目</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="120">截止时间</th>
@@ -662,21 +662,21 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目(产品名称)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}"  style="width: 100%"  class="fl item size-middle"><span>品牌：</span><div class="content" style="width:135px">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%"  class="fl bottom item size-middle"><span>类目(产品名称)：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                            <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                            <div title="{{seek.cmpCode}}" style="width: 100%"  class="fl item"><span>型号：</span><div class="content" style="width:135px">{{seek.cmpCode || '-'}}</div></div>
+                            <div title="{{seek.spec}}" style="width: 100%"  class="fl item bottom"><span>规格：</span><div class="content" style="width:135px">{{seek.spec || '-'}}</div></div>
                         </div>
                     </div>
                 </td>
                 <td>
-                    <div class="row-wrap il-content">
+                    <div class="row-wrap il-content" style="padding-top: 0px">
                         <div class="il-box-small il-box">
                             <!--<div title="{{seek.encapsulation}}" class="item"><span>封装：</span>{{seek.encapsulation || '-'}}</div>
                             <div title="{{seek.produceDate}}" class="item"><span>生产日期：</span>{{seek.produceDate || '-'}}</div>-->

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -665,12 +665,12 @@
 									<a href="store/productDetail/{{::cart.batchCode}}" target="_blank">
                                         <img ng-src="{{cart.img || 'static/img/store/common/default.png'}}" width="60" height="60"/></a>
 									<div class="car_pro_xq">
+											<i class="text-hidden" ng-if="!cart.uuid">品牌：<a ng-bind="::cart.goods.brandNameEn || '-'" title="{{::cart.goods.brandNameEn}}" class="unstand"></a></i>
+									   <i class="text-hidden" ng-if="cart.uuid">品牌：<a href="product/brand/{{::cart.goods.branduuid}}/" target="_blank" ng-bind="::cart.goods.brandNameEn" title="{{::cart.goods.brandNameEn}}"></a></i>
 									    <i class="text-hidden" ng-if="!cart.uuid">类目：<a ng-bind="::cart.kiName || '-'" title="{{::cart.kiName}}" class="unstand"></a></i>
 									    <i class="text-hidden" ng-if="cart.uuid">类目：<a href="product/kind/{{cart.goods.kindUuid}}" target="_blank" ng-bind="::cart.kiName" title="{{::cart.kiName}}"></a></i>
 									    <i class="text-hidden">型号：<a href="store/productDetail/{{::cart.batchCode}}" target="_blank" ng-bind="::cart.code || '-'" title="{{::cart.code}}"></a></i>
-									   <i class="text-hidden" ng-if="!cart.uuid">品牌：<a ng-bind="::cart.goods.brandNameEn || '-'" title="{{::cart.goods.brandNameEn}}" class="unstand"></a></i>
-									   <i class="text-hidden" ng-if="cart.uuid">品牌：<a href="product/brand/{{::cart.goods.branduuid}}/" target="_blank" ng-bind="::cart.goods.brandNameEn" title="{{::cart.goods.brandNameEn}}"></a></i>
-									</div>
+									   </div>
 								</div>
                         	</span>
 							<span class="wd02">

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -903,10 +903,10 @@
 							<div class="pro_xq">
 								<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 								<p>
+									品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a><br/>
 									类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
 									<a class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
-									型号：<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br/>
-									品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a>
+									型号：<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a>
 									<a  class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
 								</p>
 							</div>

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -428,7 +428,13 @@
                             <a href="store/productDetail/{{::detail.batchCode}}" target="_blank">
 								<img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/>
 							</a>
-                            <p class="style01" style="margin-top: 10px;" ng-if="detail.uuid">类目：
+													<p class="style01" ng-if="detail.uuid" style="margin-top: 10px;">品牌：
+								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>
+							</p>
+							<p class="style01" ng-if="!detail.uuid" style="margin-top: 10px;">品牌：
+								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
+							</p>
+                            <p class="style01" ng-if="detail.uuid">类目：
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							 <p class="style01" style="margin-top: 10px;" ng-if="!detail.uuid">类目：
@@ -437,13 +443,7 @@
 							<p class="style01">型号：
 								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
-							<p class="style01" ng-if="detail.uuid">品牌：
-								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>
-							</p>
-							<p class="style01" ng-if="!detail.uuid">品牌：
-								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
-							</p>
-                        </span>
+												</span>
 							<span class="wd01">交期：
 							<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 							<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -729,12 +729,12 @@
                         <span class="wd02">
                             <a  href="store/productDetail/{{::detail.batchCode}}" target="_blank" href="javascript:void(0)"> <img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
 							<div class="style-type">
+								<p  ng-if="detail.uuid"><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
+								<p ng-if="!detail.uuid"><a style="color: #323232" class="unstand">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
 								<p title="{{detail.kiName}}" ng-if="detail.uuid"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName || '-'"></b></a></p>
 								<p title="{{detail.kiName}}" ng-if="!detail.uuid"><a style="color: #323232" class="unstand">类目：<b ng-bind="detail.kiName || '-'"></b></a></p>
 								<p><a href="store/productDetail/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode || '-'" title="{{detail.cmpCode}}"></b></a></p>
-								<p  ng-if="detail.uuid"><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
-								<p ng-if="!detail.uuid"><a style="color: #323232" class="unstand">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
-							</div>
+								</div>
                         </span>
 						<span class="wd01" ng-if="order.status == 501">
 							交期 :

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -888,13 +888,6 @@
         <div class="publish-purchase">
             <div class="fl">
                 <p>单个发布</p>
-                <div class="form-block">
-                    <span><i>*</i>型号</span>
-                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
-                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
-                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
-                    </ul>
-                </div>
                 <div class="form-block">
                     <span><i>*</i>品牌</span>
                     <input type="text" class="form-group" ng-class="{'error': !validObj.brand}" maxlength="20" ng-model="applyObj.brand" ng-blur="checkBrand()" ng-change="onBrandChange()">
@@ -902,6 +895,13 @@
                         <li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(sBrand.nameEn)"></li>
                     </ul>
                 </div>
+                <div class="form-block">
+                    <span><i>*</i>型号</span>
+                    <input type="text" class="form-group" ng-model="applyObj.code" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" ng-change="onCodeChange()" >
+                    <ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">
+                        <li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(sCode.code)"></li>
+                    </ul>
+                </div>
                 <div class="form-block">
                     <span><i>*</i>截止日期</span>
                     <input type="text" ng-model="applyObj.deadline"
@@ -1006,7 +1006,7 @@
             <thead>
             <tr>
                 <th width="110">发布时间</th>
-                <th width="260">类目/品牌</th>
+                <th width="260">品牌/类目</th>
                 <th width="260">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="120">状态/截止时间</th>
@@ -1024,8 +1024,8 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目(产品名称)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" class="fl item size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl bottom item size-middle"><span>类目(产品名称)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -654,7 +654,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌/类目/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="品牌/类目/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>
@@ -663,7 +663,7 @@
             <thead>
             <tr>
                 <th width="180">买家/发布时间</th>
-                <th width="245">类目/品牌</th>
+                <th width="245">品牌/类目</th>
                 <th width="245">型号/规格</th>
                 <th width="110">采购数量(PCS)</th>
                 <th width="130">剩余时间</th>
@@ -684,16 +684,16 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目(产品名称)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
-                            <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌：</span><div class="content" style="width:135px">{{seek.inbrand || '-'}}</div></div>
+                            <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item bottom size-middle"><span>类目(产品名称)：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                            <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                            <div title="{{seek.cmpCode}}" style="width: 100%" class="fl item"><span>型号：</span><div class="content" style="width:135px">{{seek.cmpCode || '-'}}</div></div>
+                            <div title="{{seek.spec}}" style="width: 100%" class="fl item bottom"><span>规格：</span><div class="content" style="width:135px">{{seek.spec || '-'}}</div></div>
                         </div>
                     </div>
                 </td>

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -691,7 +691,7 @@
                     </div>
                 </div>
                 <div class="sreach-input fr">
-                    <input type="search" placeholder="型号/品牌/类目/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
+                    <input type="search" placeholder="品牌/类目/型号/规格/公司" class="form-control" ng-model="keyWord" ng-search="onSearch()"/>
                     <a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
                 </div>
             </div>
@@ -700,7 +700,7 @@
             <thead>
                 <tr>
                     <th width="180">买家/发布时间</th>
-                    <th width="245">类目/品牌</th>
+                    <th width="245">品牌/类目</th>
                     <th width="245">型号/规格</th>
                     <th width="110">采购数量(PCS)</th>
                     <th width="130">剩余时间</th>
@@ -721,16 +721,16 @@
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.prodTitle | nullStrFilter}}" class="fl item size-middle"><span>类目(产品名称)：</span><div class="content">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
-                                <div title="{{seek.inbrand}}" class="fl item bottom size-middle"><span>品牌：</span><div class="content">{{seek.inbrand || '-'}}</div></div>
+                                <div title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌：</span><div class="content" style="width:135px">{{seek.inbrand || '-'}}</div></div>
+                                <div title="{{seek.prodTitle | nullStrFilter}}" style="width: 100%" class="fl item size-middle bottom"><span>类目(产品名称)：</span><div class="content" style="width:135px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                             </div>
                         </div>
                     </td>
                     <td>
                         <div class="row-wrap il-content">
                             <div class="il-box-large il-box">
-                                <div title="{{seek.cmpCode}}" class="fl item"><span>型号：</span><div class="content">{{seek.cmpCode || '-'}}</div></div>
-                                <div title="{{seek.spec}}" class="fl item bottom"><span>规格：</span><div class="content">{{seek.spec || '-'}}</div></div>
+                                <div title="{{seek.cmpCode}}" style="width: 100%" class="fl item"><span>型号：</span><div class="content" style="width:135px">{{seek.cmpCode || '-'}}</div></div>
+                                <div title="{{seek.spec}}" style="width: 100%" class="fl item bottom"><span>规格：</span><div class="content" style="width:135px">{{seek.spec || '-'}}</div></div>
                             </div>
                         </div>
                     </td>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2011,9 +2011,10 @@
 							</label>
 						</th>
 						<th width="50">序号</th>
+						<th width="120">品牌</th>
 						<th width="140">类目(产品名称)</th>
 						<th width="170">产品型号</th>
-						<th width="120">品牌</th>
+
 						<th width="100">单位</th>
 						<!--<th width="80">封装</th>-->
 						<th width="310">操作</th>
@@ -2057,6 +2058,10 @@
 							<!--<span ng-show="isBatch"><input type="checkbox" ng-checked="material.isChoosed"  ng-click="chooseOne(material)"  id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
 							<span ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>
 						</td>
+						<td>
+							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
+							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
+						</td>
 						<td>
 							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
 							<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>
@@ -2065,10 +2070,7 @@
                             <a class="brand-type" ng-if="material.cmpUuId" ng-href="product/component/{{material.cmpUuId}}/" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}" target="_blank"></a>
                             <span class="brand-type" ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
-						<td>
-							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
-							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
-						</td>
+
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 						<!--<td>-->
 							<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
@@ -2475,7 +2477,7 @@
 						<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>-->
 						<!--如需上架可先点击 【匹配】按钮，若匹配不成功，可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>，提出申请-->
 					<!--</div>-->
-					<div class="tip">* 上架成功30分钟后，方可被客户搜索到，并在业产品库展示。</div>
+					<div class="tip">* 上架成功30分钟后，方可被客户搜索到，并在企业产品库展示。</div>
 					<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
 						<span ng-if="param.currentPage == materialAll.totalPages" ng-bind="materialAll.totalElements"></span>
 						<span ng-if="param.currentPage != materialAll.totalPages" ng-bind="param.page * param.count"></span>， 共： <span ng-bind="materialAll.totalElements" style="color: #5078cb;"></span> 个</div>

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1858,9 +1858,9 @@
 					<thead>
 					<tr>
 						<th width="80">序号</th>
+						<th width="150">品牌</th>
 						<th width="180">类目(产品名称)</th>
 						<th width="200">型号</th>
-						<th width="150">品牌</th>
 						<!--<th width="100">单位</th>-->
 						<th width="80">规格</th>
 						<th width="180">操作</th>
@@ -1893,6 +1893,10 @@
 							<img ng-if="material.standard == 0" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
 							<img ng-if="material.standard != 0" src="static/img/store/common/standard.png" alt="" class="standard"/>
 						</td>
+						<td>
+							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
+							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
+						</td>
 						<td>
 							<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
 							<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>
@@ -1903,10 +1907,7 @@
 							</span>
                             <span class="brand-type" ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
-						<td>
-							<div class="ellipsis-div" ng-if="material.pbranden" ng-bind="material.pbranden" title="{{material.pbranden}}"></div>
-							<div class="ellipsis-div" ng-if="!material.pbranden" ng-bind="material.pbrand" title="{{material.pbrand}}"></div>
-						</td>
+
 						<!--<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>-->
 						<td>
 							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
@@ -2271,8 +2272,8 @@
 								<div class="replace-list"  ng-class="{'Scrollactive': material.showMoreReplace} ">
 									<div class="replace-item" ng-repeat="replace in material.productReplaceList" ng-if="material.showMoreReplace || (!material.showMoreReplace && replace.detno < 5) ">
 										<i>{{replace.detno}}</i>
-										<span title="{{replace.ptrCmpcode}}">型号：{{replace.ptrCmpcode}}</span>
 										<span title="{{replace.ptrBranden}}">品牌：{{replace.ptrBranden}}</span>
+										<span title="{{replace.ptrCmpcode}}">型号：{{replace.ptrCmpcode}}</span>
 									</div>
 									<div ng-if="(material.productReplaceList.length < 4 && material.productReplaceList.length % 2 !== 0) || (material.productReplaceList.length > 4 && material.showMoreReplace && material.productReplaceList.length % 2 !== 0)" class="replace-item"></div>
 								</div>
@@ -2515,8 +2516,8 @@
 <div class="com-modal-wrap" ng-if="activeIndex > -1">
 	<div class="edit-replace-box">
 		<div class="title">
-			<div>型号：<span>{{editCmp}}</span></div>
 			<div>品牌：<span>{{editBrand}}</span></div>
+			<div>型号：<span>{{editCmp}}</span></div>
 			<i class="fa fa-close" ng-click="setActiveIndex(-1)"></i>
 		</div>
 		<div class="content">
@@ -2525,18 +2526,19 @@
 			</div>
 			<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
 				<div class="form-item form-left">
-					<span><i>{{key + 1}}</i><em>*</em>型号：</span>
-					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list3_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
-					<ul class="similar-list" ng-class="'similar-list3_'+ key"  ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
-							<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
+					<span><i>{{key + 1}}</i><em>*</em>品牌：</span>
+					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list4_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
+					<ul class="similar-list" ng-class="'similar-list4_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
+							<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
 					</ul>
+
 				</div>
 				<div class="form-item form-right">
-					<span><em>*</em>品牌：</span>
-					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list4_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
-                    <ul class="similar-list" ng-class="'similar-list4_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
-                        <li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
-                    </ul>
+					<span><em>*</em>型号：</span>
+					<input type="text"  ng-readonly="mate.editable == false"  class="form-control" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list3_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
+					<ul class="similar-list" ng-class="'similar-list3_'+ key"  ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
+						<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
+					</ul>
 					<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>
 					<i class="fa fa-plus-circle" ng-if="key == linearLength - 1 && mate.editable != false" ng-click="setReplies('add', key)"></i>
 				</div>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -947,6 +947,10 @@
         color: #4290f7;
         cursor: pointer;
     }
+
+    .wanted_list01 .tab table tr {
+        height: 104px;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -1094,6 +1098,11 @@
                                 <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></p>
                                 <p ng-if="!commodity.uuid">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
                                 <p ng-if="commodity.uuid" name="brand-a"><a href="product/brand/{{commodity.branduuid}}" style="margin: 0; color: #333;" target="_blank">品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></a></p>
+                                <p>规格: <em ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}">LPC1112</em></p>
+                                <!--<div class="margin0">-->
+                                    <!--<span class="marginL10">规格: </span>-->
+                                    <!--<span ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}" class="width45" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></span>-->
+                                <!--</div>-->
                             </div>
                         </td>
                         <td style="white-space: inherit;">
@@ -1120,10 +1129,6 @@
                                 <span class="marginL10">最小包装数: </span>
                                 <span ng-bind="commodity.minPackQty" title="{{commodity.minPackQty}}" class="width45" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></span>
                             </div>
-                            <div class="margin0">
-                                <span class="marginL10">规格: </span>
-                                <span ng-bind="commodity.spec  || '-'" title="{{commodity.spec}}" class="width45" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></span>
-                            </div>
                         </td>
                         <td>
                             <div ng-repeat="price in commodity.prices" >
@@ -1195,6 +1200,11 @@
                                         <p>类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
                                         <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>
                                         <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
+                                        <p>
+                                            <span style="width: 32px;">规格: </span>
+                                            <span><input style="width:90px" type="text"
+                                                         placeholder="请输入规格" maxlength="20" ng-model="commodity.spec" class="wid48 form-control"/></span>
+                                        </p>
                                     </div>
                                 </div>
                                 <div class="content-show width120">
@@ -1228,11 +1238,6 @@
                                         <span><input type="text" ng-blur="changeMinPackQty(commodity)"
                                                      ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="数量" maxlength="6" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>
                                     </div>
-                                    <div>
-                                        <span style="width: 32px;">规格: </span>
-                                        <span><input style="width:90px" type="text"
-                                                      placeholder="请输入规格" maxlength="20" ng-model="commodity.spec" class="wid48 form-control"/></span>
-                                    </div>
                                 </div>
                                 <div class="content-show width135">
                                     <div ng-repeat="price in commodity.editPrices">

src/main/webapp/resources/view/vendor/forstore/vendor_store_maintain.html

@@ -699,10 +699,10 @@
 			</div>-->
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
-					<span>主营产品<strong class="text-inverse">*</strong></span>
+					<span>主营产品</span>
 				</div>
 				<div class="col-md-10 custom_col">
-					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500" required></textarea>
+					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;" title="description" ng-model="sampleStore.description" maxlength="500"></textarea>
 				</div>
 			</div>
 			<!--<div class="row com_row" style="margin-top: 10px;">

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -694,7 +694,7 @@
                         <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'">3、如核对信息无误之后，点击确认发布</div>
                         <div>
                             <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements" ng-show="$$productOn.tab == 'bathOn'"><span>确认上架</span></span>
-                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在业产品库展示。</b>
+                            <b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在企业产品库展示。</b>
                         </div>
                     </div>
                 </div>