Merge branch 'release-201820-wangcz' into dev

# Conflicts:
#	src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -8,7 +8,12 @@ import com.uas.platform.b2c.common.account.service.RoleService;
 import com.uas.platform.b2c.common.account.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.model.Constant;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import com.uas.sso.SSOHelper;
+import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import net.sf.ehcache.CacheManager;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
@@ -18,6 +23,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.List;
@@ -29,6 +35,9 @@ import java.util.List;
 @RequestMapping("/user/authentication")
 public class AuthenticationController {
 
+
+	private static final Logger logger = Logger.getLogger(AuthenticationController.class);
+
 	@Autowired
 	private UserService userService;
 
@@ -93,10 +102,24 @@ public class AuthenticationController {
 	 */
 	@RequestMapping(value = "/{enUU}")
 	@ResponseBody
-	public void switchEnterprise(@PathVariable("enUU") long enUU, HttpServletRequest request) {
+	public void switchEnterprise(@PathVariable("enUU") long enUU, HttpServletRequest request, HttpServletResponse response) {
 		userService.saveLoginTime(enUU);
 		User user = userService.switchEnterprise(enUU);
 		request.getSession().setAttribute("user", user);
+
+		SSOToken token = (SSOToken)SSOHelper.getToken(request);
+		logger.info(String.format("切换账套,用户:%s,获取用户信息成功,手机号：%s", user.getUserName(), token.getUid()));
+		UserAccount tokenUser = FlexJsonUtils.fromJson(token.getData(), UserAccount.class);
+		if (enUU == 0L) {
+			tokenUser.setSpaceUU(null);
+			tokenUser.setBusinessCode(null);
+			tokenUser.setSpaceName(null);
+		} else {
+			tokenUser.setSpaceUU(enUU);
+		}
+		token.setData(FlexJsonUtils.toJson(tokenUser));
+		// 设置cookie
+		SSOHelper.setSSOCookie(request, response, token, true);
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -92,7 +92,7 @@ public class SecurityController {
 	 * @return
 	 * @throws IOException
 	 */
-	@RequestMapping(value = "/logout", method = RequestMethod.GET,  produces = {"application/javascript"})
+	@RequestMapping(value = "/logout", method = RequestMethod.GET, produces = {"application/javascript"})
 	@ResponseStatus(value = HttpStatus.OK)
 	@ResponseBody
 	public String logout(HttpServletRequest request, HttpServletResponse response, HttpSession session, String returnUrl)

src/main/java/com/uas/platform/b2c/common/account/dao/EnterpriseDao.java

@@ -24,6 +24,11 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>, Jpa
 	@Query(value="select e.enName from Enterprise e where e.enName like %?1%")
 	public List<String> findEnNameByName(String name);
 
+	@Query(value = "select e.*, ifnull(s.id, 0) as isStore from sec$enterprises e " +
+			" left join store$info s on e.en_uu = s.st_enuu and s.st_status = 'OPENED' where e.en_uu = :uu  "
+			, nativeQuery = true)
+	public Enterprise findEnterpriseAndIsStoreByUu(@Param("uu") Long uu);
+
 	/**
 	 * 企业资料初始化
 	 *

src/main/java/com/uas/platform/b2c/common/account/model/Enterprise.java

@@ -189,6 +189,9 @@ public class Enterprise implements Serializable {
 	@Transient
 	private Integer receiptStatus;
 
+	@Transient
+	private Integer isStore;
+
 	/**
 	 * 企业简介
 	 */
@@ -235,6 +238,14 @@ public class Enterprise implements Serializable {
 		this.uu = uu;
 	}
 
+	public Integer getIsStore() {
+		return isStore;
+	}
+
+	public void setIsStore(Integer isStore) {
+		this.isStore = isStore;
+	}
+
 	public String getEnName() {
 		return enName;
 	}

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -610,12 +610,13 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User switchEnterprise(Long enUU) {
-		User user = SystemSession.getUser();
+		User user = userDao.findUserByUserUU(SystemSession.getUser().getUserUU()).get(0);
 		if ( enUU == 0L) {
 			user.setEnterprise(null);
 		} else {
 			user.setCurrentEnterprise(enUU);
 		}
+		SystemSession.setUser(user);
 		return user;
 	}
 

src/main/java/com/uas/platform/b2c/common/search/constant/SearchUrl.java

@@ -20,7 +20,7 @@ public class SearchUrl {
     /**
      * 获取企业物料
      */
-    public static final String PRODUCT_ID_NENUU_URL = "/search/productIds?keyword={keyword}&page={page}&size={size}";
+    public static final String PRODUCT_ID_NENUU_URL = "/search/productIds?keyword={keyword}&page={page}&size={size}&duplicate=true";
 
     /**
      * 标准型号联想（物料）

src/main/java/com/uas/platform/b2c/common/search/rpc/service/Impl/SearchServiceImpl.java

@@ -190,7 +190,7 @@ public class SearchServiceImpl implements SearchService{
     }
 
     @Override
-    public Map<String, Object> getComponentIds(String keyword, PageParams var2) throws SearchException {
+    public String getComponentIds(String keyword, PageParams var2) throws SearchException {
         Map<String, Object> map = new HashedMap();
         map.put("keyword", keyword);
         map.put("params", FlexJsonUtils.toJsonDeep(var2));
@@ -198,16 +198,12 @@ public class SearchServiceImpl implements SearchService{
         if(StringUtils.isEmpty(str)) {
             return null;
         }else {
-            try {
-                Map<String, Object> reMap = FastjsonUtils.fromJson(str, Map.class);
-                return reMap;
-            }catch (Exception e) {
-                e.printStackTrace();
-                return null;
-            }
+            return str;
         }
     }
 
+
+
     @Override
     public Set<Long> getKindIdsBySearchComponent(String keyword, String brandId) throws SearchException {
         Map<String, Object> map = new HashedMap();

src/main/java/com/uas/platform/b2c/common/search/rpc/service/SearchService.java

@@ -29,7 +29,7 @@ public interface SearchService {
 
     SPage<Map<String, Object>> getbrandsAndSellers(String keyword, Integer page, Integer size) throws SearchException;
 
-    Map<String, Object> getComponentIds(String keyword, PageParams var2) throws SearchException;
+    String getComponentIds(String keyword, PageParams var2) throws SearchException;
 
     Set<Long> getKindIdsBySearchComponent(String keyword, String brandId) throws SearchException;
 

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

@@ -200,23 +200,63 @@ public class SearcherServiceImpl implements SearcherService {
 	@Override
 	public ModelMap searchComponent(String keyword, PageParams page) {
 		ModelMap map = new ModelMap();
-		Map<String, Object> results = new HashMap<>();
+		String results = "";
 		try {
 			results = searchService.getComponentIds(keyword, convertPageParams(page));
 		} catch (SearchException e) {
 			throwSystemException(e);
 		}
-		List<Long> componentIds = (List<Long>) results.get("componentIds");
-		if (!CollectionUtils.isEmpty(componentIds)) {
-			List<ComponentInfo> components = componentInfoDao
-					.findByIdsInOrder(componentIds.toArray(new Long[componentIds.size()]));
+
+		ComponentIdsResult componentIdsResult = FastjsonUtils.fromJson(results, ComponentIdsResult.class);
+		Long[] componentIds = componentIdsResult.getComponentIds();
+
+		if (componentIds.length > 0) {
+			List<ComponentInfo> components = componentInfoDao.findByIdsInOrder(componentIds);
 			map.put("components", components);// 当前页器件内容
 		}
-		map.put("total", results.get("total"));// 搜索结果总数
-		map.put("page", results.get("page"));// 当前页面
-		map.put("size", results.get("size"));// 每页个数
+		map.put("total", componentIdsResult.getTotal());// 搜索结果总数
+		map.put("page", componentIdsResult.getPage());// 当前页面
+		map.put("size", componentIdsResult.getSize());// 每页个数
 		return map;
 	}
+    public static class ComponentIdsResult{
+        private int total;
+        private int size;
+        private int page;
+        private Long[] componentIds;
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getPage() {
+            return page;
+        }
+
+        public void setPage(int page) {
+            this.page = page;
+        }
+
+        public Long[] getComponentIds() {
+            return componentIds;
+        }
+
+        public void setComponentIds(Long[] componentIds) {
+            this.componentIds = componentIds;
+        }
+    }
 	/**
 	 * 智能搜索批次
 	 *
@@ -327,7 +367,7 @@ public class SearcherServiceImpl implements SearcherService {
 
         if (!CollectionUtils.isEmpty(enUUs)) {
             for (Object enuu : enUUs) {
-                vendorIntroductionsFutures.add(VendorIntroduction.convertFromEnterprise(enterpriseDao.findByUu(Long.valueOf(enuu.toString()))));
+                vendorIntroductionsFutures.add(VendorIntroduction.convertFromEnterprise(enterpriseDao.findEnterpriseAndIsStoreByUu(Long.valueOf(enuu.toString()))));
             }
         }
 
@@ -458,7 +498,7 @@ public class SearcherServiceImpl implements SearcherService {
 
                 if (!CollectionUtils.isEmpty(enUUs)) {
                     for (Object enuu : enUUs) {
-                        vendorIntroductionsFutures.add(VendorIntroduction.convertFromEnterprise(enterpriseDao.findByUu(Long.valueOf(enuu.toString()))));
+                        vendorIntroductionsFutures.add(VendorIntroduction.convertFromEnterprise(enterpriseDao.findEnterpriseAndIsStoreByUu(Long.valueOf(enuu.toString()))));
                     }
                 }
 

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -156,12 +156,15 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
     protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
         User user = (User) request.getSession().getAttribute("user");
         SSOToken token = SSOHelper.attrToken(request);
+        logger.info(String.format("用户:%s,获取用户信息成功,手机号：%s", null == user ? "" : user.getUserName(), token.getUid()));
         // cookie变化的情况下，session可能还未变化
         if (user == null || (user.getUserTel() != null && !token.getUid().equals(user.getUserTel()))) {
             user = getUserByToken(token);
             if (user != null) {
                 user.setIp(AgentUtils.getIp(request));
                 request.getSession().setAttribute("user", user);
+            } else {
+                logger.error(String.format("用户获取用户信息失败,uid：%s", token.getUid()));
             }
         }
         setGrantedAuthorities(user);

src/main/java/com/uas/platform/b2c/prod/product/component/service/impl/ComponentGoodsServiceImpl.java

@@ -2,6 +2,8 @@ package com.uas.platform.b2c.prod.product.component.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
+import com.uas.platform.b2c.common.search.service.impl.SearcherServiceImpl;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.product.component.dao.ComponentGoodsDao;
@@ -16,7 +18,6 @@ import com.uas.platform.b2c.common.search.util.PageParams.FilterField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,7 @@ public class ComponentGoodsServiceImpl implements ComponentGoodsService {
 	@Override
 	public Page<ComponentGoods> getCompGoodsByKindid(final PageInfo info) {
 		Map<String, Object> filter = info.getFilters();
-		Map<String, Object> searchResult = null;
+		String searchResult = "";
 		//只能显示20页的数据
 		if(info.getPageNumber() > Constant.PAGEMAX) {
 			info.setPageNumber(Constant.PAGEMAX);
@@ -72,18 +73,14 @@ public class ComponentGoodsServiceImpl implements ComponentGoodsService {
 					filter.remove("code");
 				}
 				searchResult = searchService.getComponentIds(code, pageParams);
-				@SuppressWarnings("unchecked")
-				List<Integer> componentIds = (List<Integer>) searchResult.get("componentIds");
-				List<Long> componentIdsLong = new ArrayList<>();
-				for (Integer cid:componentIds) {
-					componentIdsLong.add(cid.longValue());
-				}
+				SearcherServiceImpl.ComponentIdsResult componentIdsResult = FastjsonUtils.fromJson(searchResult, SearcherServiceImpl.ComponentIdsResult.class);
+				Long[] componentIds = componentIdsResult.getComponentIds();
+
 				List<ComponentGoods> componentGoods = new ArrayList<>();
-				if (componentIds.size() > 0) {
-					Long[] idArr = new Long[componentIdsLong.size()];
-					componentGoods = componentGoodsDao.findByIdsInOrder(componentIdsLong.toArray(idArr));
+				if (componentIds.length > 0) {
+					componentGoods = componentGoodsDao.findByIdsInOrder(componentIds);
 				}
-				int length = (int)searchResult.get("total");
+				int length = componentIdsResult.getTotal();
 				if(length < componentGoods.size()) {
 					length = componentGoods.size();
 				}

src/main/java/com/uas/platform/b2c/prod/product/component/service/impl/ComponentServiceImpl.java

@@ -2,9 +2,11 @@ package com.uas.platform.b2c.prod.product.component.service.impl;
 
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
+import com.uas.platform.b2c.common.search.service.impl.SearcherServiceImpl;
 import com.uas.platform.b2c.common.search.util.PageParams;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
@@ -192,7 +194,7 @@ public class ComponentServiceImpl implements ComponentService {
 	@Override
 	public Page<ComponentInfo> findInfoPage(final PageInfo info) {
 		Map<String, Object> filter = info.getFilters();
-		Map<String, Object> searchResult = null;
+		String searchResult = "";
 		// filter: kindid 可以筛选kindID及其子类目下属的所有器件
 		//只能显示40页的数据
 		if(info.getPageNumber() > Constant.PAGEMAX) {
@@ -218,14 +220,14 @@ public class ComponentServiceImpl implements ComponentService {
 					filter.remove("code");
 				}
 				searchResult = searchService.getComponentIds(code, pageParams);
-				@SuppressWarnings("unchecked")
-				List<Long> componentIds = (List<Long>) searchResult.get("componentIds");
+				SearcherServiceImpl.ComponentIdsResult componentIdsResult = FastjsonUtils.fromJson(searchResult, SearcherServiceImpl.ComponentIdsResult.class);
+				Long[] componentIds = componentIdsResult.getComponentIds();
+
 				List<ComponentInfo> components = new ArrayList<ComponentInfo>();
-				if (componentIds.size() > 0) {
-					Long[] idArr = new Long[componentIds.size()];
-					components = componentInfoDao.findByIdsInOrder(componentIds.toArray(idArr));
+				if (componentIds.length > 0) {
+					components = componentInfoDao.findByIdsInOrder(componentIds);
 				}
-				PageImpl<ComponentInfo> pageImpl = new PageImpl<ComponentInfo>(components, info, (int) searchResult.get("total"));
+				PageImpl<ComponentInfo> pageImpl = new PageImpl<ComponentInfo>(components, info, componentIdsResult.getTotal());
 				return pageImpl;
 			}
 			if (filter.get("kindid") != null) {

src/main/java/com/uas/platform/b2c/trade/vendor/model/VendorIntroduction.java

@@ -260,10 +260,10 @@ public class VendorIntroduction {
         vendorIntroduction.setEnTel(enterprise.getEnTel());
         vendorIntroduction.setEnCorporation(enterprise.getEnCorporation());
         vendorIntroduction.setEnLogoUrl(enterprise.getEnLogoUrl());
-        if (null == enterprise.getEnMallVendorStatus()) {
+        if (null == enterprise.getIsStore()) {
             vendorIntroduction.setIsStore(new Short((short)0));
         } else {
-            vendorIntroduction.setIsStore(enterprise.getEnMallVendorStatus().intValue() ==  313 ? new Short("1") : 0);
+            vendorIntroduction.setIsStore(enterprise.getIsStore().intValue() != 0 ? new Short("1") : 0);
         }
        return vendorIntroduction;
     }

src/main/webapp/resources/css/vendor/base.css

@@ -253,7 +253,8 @@ select {
     color:#fff;
 }
 .user_center .search-right .search-list ul li.active{
-    color:#4a71c6;
+    display: inline-block !important ;
+    color: #4a71c6;
     background: #fff;
 }
 

src/main/webapp/resources/js/admin/controllers/checkMoney/SettlementCtrl.js

@@ -136,7 +136,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getAdminEnterAccount('', function(data) {
 				$scope.b2cAccountInfos = resolveData(data);
 				angular.forEach($scope.b2cAccountInfos, function(b2cAccountInfos) {
-					b2cAccountInfos.filterAccount = hideBankFilter(b2cAccountInfos.number);
+					b2cAccountInfos.filterAccount = b2cAccountInfos.number;
 				});
 				$scope.b2cAccount = getOriginalData($scope.b2cAccountInfos);
 			}, function(res) {
@@ -150,7 +150,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getVenderBank({venduu:venduu},null, function(data) {
 				$scope.venderAccountInfos = resolveData(data);
 				angular.forEach($scope.venderAccountInfos, function(venderAccountInfos) {
-					venderAccountInfos.filterAccount = hideBankFilter(venderAccountInfos.number);
+					venderAccountInfos.filterAccount = venderAccountInfos.number;
 				});
 				$scope.venderAccount = getOriginalData($scope.venderAccountInfos);
 			}, function(res) {

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

@@ -23,7 +23,8 @@ define([ 'app/app' ], function(app) {
 			'release/product/release/excel',
 			'release/product/release/excel/pcb',
 			'release/product/batchRelease/pcb',
-			'release/product/batchRelease'
+			'release/product/batchRelease',
+      'release/product/batchRelease/person'
 		]
 		return {
 			request: function(cfg){

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -103,7 +103,14 @@ define(['app/app'], function (app) {
                 $scope.totalPages = 0;
                 toaster.pop('error', '数据获取失败，请重新刷新页面！');
             });
-        }
+        };
+
+        $scope.keyUpApply = function () {
+            var keycode = window.event ? event.keyCode : event.which;
+            if (keycode == 13) {
+                $scope.searchApply();
+            }
+        };
 
         $scope.searchApply = function () {
             applyToEnterpriseTableParams();
@@ -210,7 +217,7 @@ define(['app/app'], function (app) {
             if (event && event.keyCode == 13) {
                 $scope.onSearch(keyword, filterRole);
             }
-        }
+        };
 
         $scope.newUser = {};
 

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -31,8 +31,12 @@ define(['app/app'], function(app) {
 			Bill.getListPersonal(null, function(data) {
 				$scope.bill = {};
 				$scope.bills = data;
-				$scope.bill.kind = '1207';
-				$scope.order.invoicetype = '1207';
+        $scope.bill.kind = '1207';
+        $scope.order.invoicetype = '1207';
+        // $scope.bill.kind = '1205';
+        // $scope.order.invoicetype = '1205';
+        // $scope.order.paytype = '1102'
+        // $scope.selectBill($scope.order.invoicetype)
 				// angular.forEach($scope.bills, function(item) {
 				//     if(item.kind == '1205') {
 				//         $scope.bill = item;

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

@@ -298,12 +298,12 @@ define([ 'app/app' ], function(app) {
         } else {
             toaster.pop('success', '提示', '上传完成');
         }
+        $scope.showCanvas = false
 				$scope.relTableParams.page(1);
 				$scope.relTableParams.reload();
         if ($rootScope.$$productOn.tab === 'bathOnPerson') {
             publicPersonProduct();
         }
-        $scope.showCanvas = false
         }).error(function(response) {
             $scope.result = {};
             $scope.result.total = 0;
@@ -401,8 +401,21 @@ define([ 'app/app' ], function(app) {
     };
 
     function publicPersonProduct() {
+        speed = 1
+        $scope.showCanvas = true
+        $scope.AnimationCanvas = setInterval(function () {
+          if (speed > 100) clearInterval($scope.AnimationCanvas)
+          if (speed >= 98) clearInterval($scope.AnimationCanvas)
+          else {
+            speed += RandomNumber();
+            drawFrame(speed)
+          }
+        }, 30)
         ReleaseProductByBatch.batchReleasePerson({batch : $scope.result.batch}, null, function(data) {
-            if ($scope.needShowTip) {
+          speed = 100
+          clearInterval($scope.AnimationCanvas)
+          $scope.showCanvas = false
+            if ($scope.needShowTip && $rootScope.$$productOn.tab !== 'bathOnPerson') {
                 $scope.relTableParams.page(1);
                 $scope.relTableParams.reload();
                 //$scope.result.success = 0;//设置成0，让前端用户不能点击
@@ -547,12 +560,12 @@ define([ 'app/app' ], function(app) {
       text(speed)
       blueCircle(speed)
     }
-    (function drawFrame2(){
-      window.requestAnimationFrame(drawFrame2);
-      if(speed > 100) speed = 0;
-      speed += 0.1;
-      drawFrame(speed)
-    }());
+    // (function drawFrame2(){
+    //   window.requestAnimationFrame(drawFrame2);
+    //   if(speed > 100) speed = 0;
+    //   speed += 0.1;
+    //   drawFrame(speed)
+    // }());
 	}]);
 
 	//批量上架的Ctrl

src/main/webapp/resources/view/admin/disable_component.html

@@ -12,7 +12,7 @@
 				<table ng-table="componentsTableParams" class="table table-condensed table-bordered table-striped">
 			        <tr ng-repeat="component in $data">
 			          <td data-title="'原厂型号'">{{component.code}}</td>
-			          <td data-title="'类目'">{{component.kind.nameCn}}</td>
+			          <td data-title="'物料名称'">{{component.kind.nameCn}}</td>
 			          <td data-title="'唯一标识符(UUID)'">{{component.uuid}}</td>
 			          <td data-title="'操作'"> <button ng-click="disable(component)" class="btn btn-danger btn-sm" ng-if="!isDisable"><i class="fa fa-check"></i> 禁用</button>  <button ng-click="" class="btn btn-danger btn-sm" ng-if="isDisable")><i class="fa fa-check"></i> 解除禁用</button></td>
 			        </tr>

src/main/webapp/resources/view/admin/modal/product_kindContrast_modal.html

@@ -33,7 +33,7 @@
 						<th width="30">序号</th>
 						<th width="100">来源</th>
 						<th width="100">商城品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100">商城类目</th>
 						<th width="100">创建人</th>
 						<th width="100">更新人</th>

src/main/webapp/resources/view/admin/product/crawl_task_component_list.html

@@ -30,7 +30,7 @@
 						<th width="30">序号</th>
 						<th width="100">原厂型号</th>
 						<th width="100">品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100" ng-bind="properties[0].labelCn"></th>
 						<th width="100" ng-bind="properties[1].labelCn"></th>
 						<th width="100" ng-bind="properties[2].labelCn"></th>

src/main/webapp/resources/view/admin/product/kindContrast.html

@@ -71,7 +71,7 @@
 				<div class="col-sm-3 search-input" ng-show="searchMore">
 					<div class="input-group">
 						<input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="kiName" 
-							ng-search="onSearch()" placeholder="按官网类目搜索">
+							ng-search="onSearch()" placeholder="按官网物料名称搜索">
 						<div class="input-group-btn">
 							<button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
 						</div>
@@ -80,7 +80,7 @@
 				<div class="col-sm-3 search-input" ng-show="searchMore">
 					<div class="input-group">
 						<input type="search" class="form-control ng-pristine ng-valid ng-touched" ng-model="b2cKind" 
-							ng-search="onSearch()" placeholder="按商城类目搜索">
+							ng-search="onSearch()" placeholder="按商城物料名称搜索">
 						<div class="input-group-btn">
 							<button ng-click="onSearch()" class="btn btn-primary" type="button">搜索</button>
 						</div>
@@ -107,7 +107,7 @@
 						<th width="30">序号</th>
 						<th width="100">来源</th>
 						<th width="100">商城品牌</th>
-						<th width="100">类目</th>
+						<th width="100">物料名称</th>
 						<th width="100">商城类目</th>
 						<th width="100">创建人</th>
 						<th width="100">更新人</th>

src/main/webapp/resources/view/admin/product/productManage.html

@@ -60,7 +60,7 @@
                 <div class="form-inline">
                     <div class="form-group form-group-sm">
                         <label class="control-label">
-                            类目：
+                            物料名称：
                         </label>
                         <div class="mar-rt0 row checkbox">
                             <div class="col-md-3">
@@ -208,7 +208,7 @@
                        <span ng-bind="list.storeName || '-'">商家名称</span>
                    </td>
                    <td>
-                       <p>类目：<span ng-bind="list.kindNameCn || '-'">****</span></p>
+                       <p>物料名称：<span ng-bind="list.kindNameCn || '-'">****</span></p>
                        <p>型号：<span ng-bind="list.code || '-'">****</span></p>
                        <p>品牌：<span ng-bind="list.brandNameEn || '-'">****</span></p>
                    </td>

src/main/webapp/resources/view/admin/product/productManageDetail.html

@@ -27,7 +27,7 @@
                     <div class="col-xs-4">
                         <div class="info-text">
                             <p>型号：<span ng-bind="goods.code"></span></p>
-                            <p>产品名称（类目）：<span ng-bind="goods.kindNameCn"></span></p>
+                            <p>物料名称：<span ng-bind="goods.kindNameCn"></span></p>
                             <p>品牌：<span ng-bind="goods.brandNameEn"></span></p>
                             <p>封装：<span ng-bind="goods.encapsulation || '-'"></span></p>
                         </div>
@@ -121,7 +121,7 @@
                 <table class="table">
                     <tr>
                         <th>产品编号</th>
-                        <th>产品名称（类目）</th>
+                        <th>物料名称</th>
                         <th>型号</th>
                         <th>封装</th>
                         <th>品牌</th>
@@ -145,7 +145,7 @@
                 <table class="table">
                     <tr>
                         <th>产品编号</th>
-                        <th>产品名称（类目）</th>
+                        <th>物料名称</th>
                         <th>型号</th>
                         <th>品牌</th>
                         <th>封装</th>

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

@@ -15,13 +15,13 @@
                 </p>
                 <p style="margin-top: 8px; font-weight: bold;">
                     共耗时<span class="totalNum">{{searchtime}}</span>ms  <br><br>
-                    类目统计共耗时 {{kindtime}} ms <br><br>
+                    物料名称统计共耗时 {{kindtime}} ms <br><br>
                     品牌统计共耗时 {{brandtime}} ms
                 </p>
             </div>
             <div class="col-xs-offset-4 col-xs-7">
                 <div class="input-group">
-                    <input type="search" style="width:80%;" class="form-control" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/类目/品牌">
+                    <input type="search" style="width:80%;" class="form-control" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/物料名称/品牌">
                     <span class="input-group-btn">
 					<button ng-click="search()" class="btn btn-primary" type="button">搜索</button>
 				</span>

src/main/webapp/resources/view/admin/trade/trade-afSaleApplyDetails.html

@@ -317,7 +317,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

src/main/webapp/resources/view/admin/trade/trade-supExProcessDetails.html

@@ -303,7 +303,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

src/main/webapp/resources/view/admin/trade/trade_exceptionProcessing.html

@@ -206,7 +206,7 @@ table th, table td {
 						<th>序号</th>
 						<th>产品型号</th>
 						<th>品牌</th>
-						<th>类目</th>
+						<th>物料名称</th>
 						<th>采购<br/>数量</th>
 						<th>采购<br/>金额</th>
 						<th>商城<br/>要求</th>

src/main/webapp/resources/view/common/componentsGoodsCommon.html

@@ -319,7 +319,7 @@
 	<thead>
 	<tr style="height: 40px;">
 		<th width="80"></th>
-		<th width="160">品牌/型号/类目</th>
+		<th width="160">品牌/型号/物料名称</th>
 		<th width="90">店铺名称</th>
 		<th width="100">封装/生产日期</th>
 		<th width="110">库存</th>

src/main/webapp/resources/view/common/footer.html

@@ -131,6 +131,7 @@ a:hover {
 		<a href="http://www.hiways.com" target="_blank" title="深圳市海威思科技">深圳市海威思科技</a>|
 		<a href="http://www.huashangweitai.com" target="_blank" title="深圳市华商维泰显示科技">深圳市华商维泰显示科技</a>|
 		<a href="http://www.ufct.com.cn/" target="_blank" title="联合创泰科技">联合创泰科技</a>
+		<a href="http://www.hi-mantech.com/" target="_blank" title="怡海能达">怡海能达</a>
 	</div>
 	<ul class="list-unstyled footer-bottom">
 		<li>客服电话：400-830-1818</li>

src/main/webapp/resources/view/common/store_header.html

@@ -362,7 +362,7 @@
 			<div id="search-group" style="margin-left: 450px;" ng-controller="SearchCtrl">
 				<div style="width: 100%;">
 					<div class="input-group">
-						<input id="search_input" ng-model="keyword" ng-change="onChange()" type="text" class="form-control" placeholder="型号/类目/品牌" ng-search="search()" 							ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" autocomplete="off"/>
+						<input id="search_input" ng-model="keyword" ng-change="onChange()" type="text" class="form-control" placeholder="型号/物料名称/品牌" ng-search="search()" 							ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()" autocomplete="off"/>
 						<span class="input-group-btn">
 							<button type="button" class="btn" id="search_btn" ng-click="search()">&nbsp;搜&nbsp;索&nbsp;</button>
 						</span>

src/main/webapp/resources/view/prod/compare.html

@@ -52,7 +52,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td>产品类目</td>
+				<td>物料名称</td>
 				<td width="200px" ng-repeat="i in indexes">
 					<div ng-if="components[i]">
 						<div><a href="">{{components[i].kind.nameCn}}</a></div>

src/main/webapp/resources/view/prod/my_cart.html

@@ -625,7 +625,7 @@ span.search:HOVER {
 						<th class="text-center sumMoneyWidth">产品<br/>总金额</th>
 						<th class="blank blankWidth"></th>
 						<th class="text-center cmpWidth">产品</th>
-						<th class="text-center kindWidth">类目</th>
+						<th class="text-center kindWidth">物料名称</th>
 						<th class="text-center brandWidth">品牌</th>
 						<th class="text-center reserveWidth">库存<br/>数量</th>
 						<th class="text-center unitpriceWidth color-black">

src/main/webapp/resources/view/prod/order_ensure.html

@@ -540,7 +540,7 @@ table .before-blank, .table-bordered>tbody>tr>td.before-blank, .table-bordered>t
 						<tr class="">
 					        <th>序号</th>
 					        <th>产品型号</th>
-					        <th>类目</th>
+					        <th>物料名称</th>
 					        <th>品牌</th>
 					        <th>库存数量</th>
 					        <th class="select-currency">

src/main/webapp/resources/view/prod/order_ensure_with_multi_currency.html

@@ -669,7 +669,7 @@
 						<tr class="">
 					        <th>序号</th>
 					        <th>产品型号</th>
-					        <th>类目</th>
+					        <th>物料名称</th>
 					        <th>品牌</th>
 					        <th>库存数量</th>
 					        <th class="selectCurrency">

src/main/webapp/resources/view/prod/product_brand_detail.html

@@ -677,7 +677,7 @@
 						</li>
 					</ul>
 					<div ng-if="!kinds" class="no-record">
-						暂无类目信息
+						暂无物料名称信息
 					</div>
 				</div>
 			</div>

src/main/webapp/resources/view/prod/product_component_view.html

@@ -622,7 +622,7 @@ div.zoomMask {
 				<div class="hr-grey"></div>
 				<div class="row">
 					<div class="form-group row">
-						<div class="message-item">类目</div>
+						<div class="message-item">物料名称</div>
 						<div class="colon">:</div>
 						<div><a href="product#/kinds/{{component.kind.id}}" class="message-body blue" ng-bind="component.kind.nameCn" target="_blank"></a></div>
 					</div>

src/main/webapp/resources/view/prod/product_home.html

@@ -202,7 +202,7 @@
 <div class="container" style="width:1190px;padding: 0;">
 	<div style="background: #fff; z-index:10;">
 		<div class="box-first">
-			<div class="box-item">类目：</div>
+			<div class="box-item">物料名称：</div>
 			<div class="box-kind">
 				<ul id="letter-nav">
 					<li class="text-num" ng-repeat="kind in kinds | orderBy : 'namelength'"  ng-click="scrollTo(kind.id)">

src/main/webapp/resources/view/prod/product_kind_edit.html

@@ -1,4 +1,4 @@
-<!-- 类目修改模态框，修改类目名称 -->
+<!-- 物料名称修改模态框，修改类目名称 -->
 <div class="modal-header">
 	<h3 class="modal-title">
 		<i class="fa fa-fw fa-sitemap text-default"></i>

src/main/webapp/resources/view/search/search_component.html

@@ -77,7 +77,7 @@
 	<!--<div class="no-record" ng-if="!total"><i class="fa fa-smile-o fa-lg"></i>很抱歉，我们没有找到相关的产品型号！</div>-->
 	<div class="selector" ng-if="productTableParams.total()" style="border: #e8e8e8 1px solid;border-bottom: none;">
 		<div class="sl-wrap">
-			<div class="sl-key f14">类目：</div>
+			<div class="sl-key f14">物料名称：</div>
 			<div class="sl-value">
                 <span ng-repeat="ck in componentKinds" >
                     <div  ng-if="contains(filter.kind,ck.ki_id)" class="sl-filter" ng-click="selectKind(ck,false)">

src/main/webapp/resources/view/sso/forstore/ssoCenter.html

@@ -148,7 +148,9 @@
                     <p>
                         <span>用户名：</span>
                         <span ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"></span>
-                        <span ng-bind="'|&nbsp;' + userInfo.enterprise.enName || '个人账户'" class="enName" title="{{userInfo.enterprise.enName}}"></span>
+                        <span> | </span>
+                        <span ng-if="userInfo.enterprise.enName" ng-bind="userInfo.enterprise.enName" class="enName"></span>
+                        <span ng-if="!userInfo.enterprise.enName">个人账户</span>
                     </p>
                     <p>
                         <span>邮&nbsp; &nbsp;箱：</span>

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

@@ -47,7 +47,6 @@
 		<li ng-class="{'active' : active == 'sso_security'}"><span ui-sref="ssoSecurity">安全设置</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_management'}"><span ui-sref="ssoManagement">员工管理</span></li>
 		<li ng-if="personage" ng-class="{'active' : active == 'sso_permission'}"><span ui-sref="ssoPermission">角色权限</span></li>
-		<li ng-if="isAdmin" ng-class="{'active' : active == 'sso_apply'}"><span ui-sref="ssoApplyBind">绑定审核</span></li>
 		<li ng-class="{'active' : active == 'sso_address'}"><span ui-sref="ssoAddress">收货地址</span></li>
 		<!--<li ng-class="{'active' : active == 'vendor_logistics'}">-->
 			<!--<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>-->

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

@@ -1058,7 +1058,7 @@
         <!-- 申请绑定 -->
         <div class="clearfix bind-en" ng-if="tab=='bind'">
             <div class="rt_menu">
-                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
+                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" ng-keyup="keyUpApply()" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
             </div>
             <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
                 <thead>

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

@@ -257,7 +257,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

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

@@ -306,7 +306,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

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

@@ -297,7 +297,7 @@
                             <th>序号</th>
                             <th>产品型号</th>
                             <th>品牌</th>
-                            <th>类目</th>
+                            <th>物料名称</th>
                             <th>采购数量</th>
                             <th>采购金额</th>
                             <th>单价</th>

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

@@ -380,7 +380,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

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>

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

@@ -664,8 +664,8 @@
 									<div class="car_pro_xq" style="padding-top: 10px">
 											<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" 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">规格：<a ng-bind="::cart.goods.spec || '-'" title="{{::cart.goods.spec}}" class="unstand"></a></i>
 									   </div>

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

@@ -912,7 +912,7 @@
 									品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid">
 									<em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a><br ng-if="detail.uuid"/>
 									<a class="unstand" ng-if="!detail.uuid"><em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a><br ng-if="!detail.uuid"/>
-									类目：<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 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/>

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

@@ -306,7 +306,7 @@
                     <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 
                     <div class="first-rate-item-info">
-                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">类目：<a href="product#/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
+                        <span class="first-rate-item-introduce"><span class="first-rate-item-link">物料名称：<a href="product#/kinds/{{::detail.kindUuid}}" target="_blank"><em ng-bind="::detail.kiName" title="{{::detail.kiName}}"></em></a><br/></span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode" title="{{::detail.cmpCode}}"></em></a><br/></span></span>
                         <span class="first-rate-item-introduce"><span class="first-rate-item-link">品牌：<a href="product#/brand/{{::detail.branduuid}}/" target="_blank"><em ng-bind="::detail.brName" title="{{::detail.brName}}"></em></a></span></span>
                     </div>

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

@@ -434,10 +434,10 @@
 							<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">类目：
+                            <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" ng-if="!detail.uuid">类目：
+							 <p class="style01" ng-if="!detail.uuid">物料名称：
 								<a ng-bind="detail.kiName || '-'"  title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号：

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

@@ -604,6 +604,9 @@
 	.pay_price div h6 strong {
 		font-weight: normal;
 	}
+	.oder_xq_list dl span.total-price strong {
+		width: 180px
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -675,8 +678,8 @@
 							<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 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><a style="color: #323232">规格：<b ng-bind="detail.spec || '-'" title="{{detail.spec}}"></b></a></p>
 								</div>
@@ -753,9 +756,9 @@
 							</span>
 						</dd>
 						<dd class="oder-remark">
-							<span style="width: 100%;">
+							<span style="width: 80%;">
 								<em style="margin-left: 40px;">订单备注：</em>
-								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
+								<input style="width: 500px" ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
 								<em ng-if="order.status!=501" ng-bind="remarkList[order.storeid] || '无'" style="margin-left: 0;"></em>
 							</span>
 						</dd>
@@ -782,7 +785,7 @@
 								</i>
 								<!--<button ng-click="getRule(order.storeid)">获取配送规则</button>-->
 							</span>
-							<span class="total-price" ng-controller="poundageCtrl">
+							<span class="total-price" ng-controller="poundageCtrl" style="width:400px !important;">
 								<p><strong>运费：</strong>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 4" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) " style="font-weight: bold;color:#e64040"></em>
@@ -906,14 +909,14 @@
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
 					<label></label><em>增值税专用发票</em>
 				</span>
-				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
+				<b ng-if="order.invoicetype == '1205' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
 			</p>
-			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
-			</div>
+			<!--<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">-->
+			<!--</div>-->
 			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
 				还没有对应的发票信息，请新增相应的发票信息
 			</div>
-			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
+			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&& bill.name">
 				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
 				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
@@ -925,6 +928,7 @@
 				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
 				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
 			</div>
+			<div class="pay_oder_xq_list" ng-if="order.invoicetype === 1207 && !bill.name" style="font-size: 16px;line-height: 40px;text-align: center">暂无发票信息</div>
 		</div>
 		<!-- 付款金额 -->
 		<div class="sure_oder" style="margin-top: 10px">
@@ -961,12 +965,20 @@
 							<input type="hidden" name="timestamp" value={{ysepayRequest.timestamp}}>
 							<input type="hidden" name="sign" value={{ysepayRequest.sign}}>
 						</form>
-						<p>
-									<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
-										<select class="select" ng-model="order.paytype">
-											<option value="1102">在线支付</option>
-											<option value="1103">线下支付</option>
-										</select>
+						<p class="payment">
+									<span class="style01 " style="width: 268px; margin-left: 590px;">付款方式:
+										<span  ng-click="order.paytype = 1102" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1102'"/>
+											<label></label><em>在线支付</em>
+										</span>
+										<span ng-click="order.paytype = 1103" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1103'"/>
+											<label></label><em>线下支付</em>
+										</span>
+										<!--<select class="select" ng-model="order.paytype">-->
+											<!--<option value="1102">在线支付</option>-->
+											<!--<option value="1103">线下支付</option>-->
+										<!--</select>-->
 									</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
 						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动，请在订单提交后联系卖家改价</p>

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

@@ -1062,7 +1062,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>

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

@@ -19,7 +19,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -68,7 +68,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -106,7 +106,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -155,7 +155,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>
@@ -193,7 +193,7 @@
                     <span class="wd01">序号</span>
                     <span>原厂型号</span>
                     <span>品牌</span>
-                    <span>类目</span>
+                    <span>物料名称</span>
                     <span>提交人</span>
                     <span>提交时间</span>
                     <span>审核状态</span>

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

@@ -364,7 +364,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

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

@@ -32,6 +32,7 @@
 		width : 1026px;
 		height: 230px;
 		border-bottom: 1px dashed #dadada;
+		clear: both;
 	}
 	.store-item > div{
 		float:left;
@@ -64,13 +65,14 @@
     	font-weight: 700
 	}
 	.item-mark{
+		width: 760px;
 		margin: 10px;
     	line-height: 2;
     	overflow: hidden;
 	    text-overflow: ellipsis;
 	    display: -webkit-box;
 	    -webkit-box-orient: vertical;
-	    -webkit-line-clamp: 4;
+	    -webkit-line-clamp: 3;
 	}
 	.itme-delete{
 		margin-top:20px;
@@ -327,7 +329,8 @@
 	}
 	.no-store{
 		height: 215px;
-		width:100%;
+		width: 1026px;
+		float: right;
 		display:inline-flex;
 		justify-content: center;
 		align-items: center;
@@ -374,7 +377,7 @@
 		<!-- 店铺关注具体信息 -->
 		<div class="store-container" ng-if="store.length != 0">
 			<ul>
-				<li ng-repeat="item in store" class="store-item">
+				<li ng-repeat="item in store" class="store-item clearfix">
 					<div class="img-div" ng-click="setActive(item)" ng-class="{'isSelected-background': isBatch &&item.active}">
 						<a name="imgDetail" href="store/{{item.storeInfo.uuid}}" target="_blank">
 							<img src="{{item.storeInfo.logoUrl}}" class="store-img"/>
@@ -386,11 +389,11 @@
 							<div ng-bind=item.storeName class="item-storeName"></div>
 						</a>
 						<i class="fa fa-trash fa-2x item-delete" ng-click="deleteById(item.id)" ng-hide="isBatch" title="取消关注" style="cursor: pointer"></i>
-						<div class="item-seller" style="position: relative;">
+						<div class="item-seller" style="position: relative;" ng-controller="ChatContactCtrl as chat">
 							<img src="static/img/common/songguo.png">
-							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
+							<a href="javascript:void(0)" class="item-contact" title="联系卖家" ng-click="chat.contactWithOther(item.storeInfo.enterprise.enTel, item.storeInfo.enterprise.uu, chat.UserType.STORE)">联系卖家</a>
 							<!--<a class="item-contact" ng-click="contactSeller(item)">联系卖家</a>-->
-							<div class="contact-box" ng-if="item.contactBNox">
+							<!--<div class="contact-box" ng-if="item.contactBNox">
 								<div class="title"><i class="fa fa-close fa-lg" ng-click="item.contactBNox = false"></i></div>
 								<div class="content">
 									<div class="company-title" ng-bind="item.storeInfo.enterprise.enName">深圳市优软科技</div>
@@ -406,8 +409,21 @@
 										<em ng-bind="item.storeInfo.enterprise.address || '暂无地址信息'">1212314531455</em>
 									</div>
 								</div>
+							</div>-->
+							<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
+								<div class="title">
+									<i ng-click="setShowLinkBox(false)"></i>
+								</div>
+								<div class="content">
+									<p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
+									<p>卖家联系电话：<span ng-bind="phone"></span></p>
+									<div>
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
+									</div>
+								</div>
 							</div>
 						</div>
+						</div>
 						<div class="item-mark">
 							<div>公司介绍：
 								<span ng-bind="item.storeInfo.description"></span>

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

@@ -275,7 +275,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

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

@@ -282,7 +282,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

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

@@ -232,7 +232,7 @@
                         <th>序号</th>
                         <th>产品型号</th>
                         <th>品牌</th>
-                        <th>类目</th>
+                        <th>物料名称</th>
                         <th>数量</th>
                         <th>金额</th>
                         <th>单价</th>

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

@@ -39,7 +39,7 @@
                 <th>序号</th>
                 <th>编号</th>
                 <th>品牌</th>
-                <th>类目</th>
+                <th>物料名称</th>
                 <th>采购数量</th>
                 <th>采购金额</th>
                 <th>单价</th>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html

@@ -968,8 +968,8 @@
                                 </div>
                             </div>
                             <div class="fr wid135">
-                                <p ng-if="!commodity.uuid">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
-                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="!commodity.uuid">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
+                                <p ng-if="commodity.uuid" name="kind-a"><a href="product/kind/{{commodity.kindUuid}}" style="margin: 0; color: #333;" target="_blank">物料名称: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></a></p>
                                 <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>
@@ -1067,7 +1067,7 @@
                                         </div>
                                     </div>
                                     <div class="fr wid135">
-                                        <p>类目: <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
+                                        <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>
                                     </div>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_undercarriage_erp.html

@@ -647,7 +647,7 @@
                                  </div>-->
                             </div>
                             <div class="fr wid135">
-                                <p>类目: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
+                                <p>物料名称: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
                                 <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}"></em></p>
                                 <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}"></em></p>
                             </div>

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

@@ -368,7 +368,7 @@
             <div class="no-batch" ng-if="style == 'single'">
                 <div class="row">
                     <div class="row-line">
-                        <span class="title">产品名称（类目）</span>
+                        <span class="title">物料名称</span>
                         <input type="text" class="form-control" ng-change="inputCategory()"/>
                     </div>
                     <div class="row-line">

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

@@ -686,7 +686,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>
@@ -707,8 +707,8 @@
                 <td>
                     <div class="row-wrap il-content">
                         <div class="il-box-large il-box">
-                            <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 title="{{seek.inbrand}}" style="width: 100%" class="fl item size-middle"><span>品牌：</span><div class="content" style="width:134px">{{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:134px">{{(seek.prodTitle || '-') | nullStrFilter}}</div></div>
                         </div>
                     </div>
                 </td>

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

@@ -484,16 +484,16 @@
 							<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">类目：
+							<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"  ng-if="!detail.uuid">类目：
+							<p class="style01"  ng-if="!detail.uuid">物料名称：
 								<a ng-bind="detail.kiName || '-'" title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号：
 								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
-							<p class="style01">型号：
+							<p class="style01">规格：
 								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
 							</p>
 						</span>

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

@@ -852,7 +852,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>

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

@@ -531,7 +531,7 @@
             <td>
                 <a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><img ng-src="{{detail.goodsDetail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                 <div class="add-rate-item-info">
-                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">类目：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
+                    <span class="add-rate-item-introduce"><span class="add-rate-item-link">物料名称：<a href="product#/kinds/{{::detail.goodsDetail.kindUuid}}" target="_blank"><em ng-bind="::detail.goodsDetail.kiName" title="{{::detail.goodsDetail.kiName}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">型号：<a href="store/{{::order.storeid}}#/batchInfo/{{::detail.goodsDetail.batchCode}}" target="_blank"><em ng-bind="::detail.goodsDetail.cmpCode" title="{{::detail.goodsDetail.cmpCode}}"></em></a><br/></span></span>
                     <span class="add-rate-item-introduce"><span class="add-rate-item-link">品牌：<a href="product#/brand/{{::detail.goodsDetail.branduuid}}/" target="_blank"><em ng-bind="::detail.goodsDetail.brName" title="{{::detail.goodsDetail.brName}}"></em></a></span></span>
                 </div>

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

@@ -620,7 +620,7 @@
                         <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
 						<span class="wd02">
 							<a href="store/{{detail.storeid}}/{{::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;">类目：
+							<p class="style01" style="margin-top: 10px;">物料名称：
 								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号：

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

@@ -260,10 +260,11 @@
 	[ui-tour] > li {
 		display: none;
 	}
-	.com_tab .active {
+	/*****此处的active样式不能做任何修改，否则动画会失效*****/
+	.active {
 		display: block !important;
 	}
-
+	/*****此处的active样式不能做任何修改，否则动画会失效*****/
 	.tour-overlay {
 		z-index: 10;
 		display: none;

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

@@ -589,7 +589,7 @@
 							<tr ng-repeat="batchCommodity in pageParams.content" class="batch-commodity">
 								<td style="padding-left: 10px;">
 									<div style="width: 190px;" class="text-more">品牌:&nbsp;<em title="{{batchCommodity.brandNameEn || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
-									<div style="width: 190px;" class="text-more">类目:&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
+									<div style="width: 190px;" class="text-more">物料名称:&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
 									<div style="width: 190px;" class="text-more">型号:&nbsp;<em title="{{batchCommodity.code || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
 								</td>
 								<td>

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

@@ -2609,7 +2609,7 @@
 					<div class="apply"><em>*</em> 以下部分产品商城暂未收录,可前往<a href="vendor#/brand/apply/">品牌中心/</a><a href="vendor#/component/apply"> 器件申请</a>中提出申请</div>
 				</div>
 				<div class="search fr">
-					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
 					<button ng-click="onSearch()">搜索</button>
 				</div>
 			</div>

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

@@ -2395,7 +2395,7 @@
 					<div class="apply"><em>*</em> 以下部分产品商城暂未收录,可前往<a href="vendor#/brand/apply/">品牌中心/</a><a href="vendor#/component/apply"> 器件申请</a>中提出申请</div>
 				</div>
 				<div class="search fr">
-					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+					<input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="param.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
 					<button ng-click="onSearch()">搜索</button>
 				</div>
 			</div>

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

@@ -365,7 +365,7 @@
         margin-top: 0;
     }
     .edit-form td div.margin0 .width45{
-       width: 45px;
+        width: 45px;
     }
     .edit-form td div span{
         float: left;
@@ -517,16 +517,16 @@
     .public-tab.table>tbody>tr>td div:last-child a.add[disabled], .public-tab.table>tbody>tr>td div:last-child a.reduce[disabled]{
         color: #c7c7c7 !important;
     }
-     .pro_management .table>tbody>tr>td div.img a.delete-img {
-         position: absolute;
-         top: 2px;
-         right: 0;
-         z-index: 20;
-         width: 20px;
-         height: 20px;
-         line-height: 16px;
-         border: none;
-     }
+    .pro_management .table>tbody>tr>td div.img a.delete-img {
+        position: absolute;
+        top: 2px;
+        right: 0;
+        z-index: 20;
+        width: 20px;
+        height: 20px;
+        line-height: 16px;
+        border: none;
+    }
     .pro_management .table>tbody>tr>td div.img a.delete-img i {
         color: #fff;
         font-size: 12px;
@@ -566,7 +566,7 @@
 
     /*非编辑状态自定义标签*/
     /*.wanted_list01 .tab table tr.define:hover{*/
-        /*background: none;*/
+    /*background: none;*/
     /*}*/
     .wanted_list01 .tab table tr.define{
         width: 100%;
@@ -723,7 +723,7 @@
         width: 60px;
     }
     /*.wanted_list01 .tab table tbody.edit-border{*/
-        /*border: 1px solid #84c5fb;*/
+    /*border: 1px solid #84c5fb;*/
     /*}*/
     .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{
         padding: 0 0 9px;
@@ -1121,7 +1121,7 @@
                         <td colspan="10">
                             <div class="code">SKU编码 : <span ng-bind="commodity.batchCode">247823589235</span></div>
                             <div class="labelling" ng-if="commodity.tag">
-                            <!--<em>*</em>-->
+                                <!--<em>*</em>-->
                                 自定义标签 : <span ng-bind="commodity.tag">散装出售散装出售</span>
                             </div>
                             <!--非标产品标志-->
@@ -1154,8 +1154,8 @@
                                 <p>型号: <em class="href" ng-bind="commodity.code" title="{{commodity.code}}"  ng-click="goToBatchDetail($event, commodity)">LPC1112</em></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>-->
+                                <!--<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>
@@ -1243,8 +1243,8 @@
                             <div class="labelling">
                                 <!--<em>*</em>-->
                                 自定义标签 : <input type="text" ng-blur="editTag(commodity)" ng-model="commodity.editTag" ng-change="changeTag(commodity)"
-                                                                            ng-class="{'error' : commodity.editTagInvalid}" maxlength="20"
-                                                                            placeholder="请设置产品标签"></div>
+                                               ng-class="{'error' : commodity.editTagInvalid}" maxlength="20"
+                                               placeholder="请设置产品标签"></div>
                             <!--非标产品标志-->
                             <img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>
                             <!--标准产品标志-->
@@ -1255,7 +1255,7 @@
                         <td colspan="9">
                             <div class="bg-show">
                                 <div class="content-show width20">
-                                   <!--<div> {{$index + 1}}</div>-->
+                                    <!--<div> {{$index + 1}}</div>-->
                                 </div>
                                 <div class="content-show width200">
                                     <div class="fl img">
@@ -1287,9 +1287,9 @@
                                         <!--<p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>-->
                                         <!--<p>规格: <em ng-bind="commodity.spec || '-'" title="{{commodity.spec}}">LPC1112</em></p>-->
                                         <!--<p>-->
-                                            <!--<span style="width: 32px;">规格: </span>-->
-                                            <!--<span><input style="width:90px" type="text"-->
-                                                         <!--placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>-->
+                                        <!--<span style="width: 32px;">规格: </span>-->
+                                        <!--<span><input style="width:90px" type="text"-->
+                                        <!--placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>-->
                                         <!--</p>-->
                                     </div>
                                 </div>
@@ -1379,15 +1379,15 @@
                                                     <div class="zhezhaodang"></div>
                                                 </div>
                                             </a>
-                                                <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
+                                            <img ng-if="commodity.productAttachSubmit.uploadAttach" src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;" class="nopass"/>
                                             <div class="forAdminLook">待审核</div>
                                         </div>
                                     </div>
                                     <!--<div class="Regulpic">-->
-                                        <!--<span>规格书:</span>-->
-                                        <!--<img style="width:24px;height:26px;cursor: pointer" src="static/img/vendor/images/pdf.png" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)"/>-->
-                                        <!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
-                                        <!--<div class="forAdminLook">待审核</div>-->
+                                    <!--<span>规格书:</span>-->
+                                    <!--<img style="width:24px;height:26px;cursor: pointer" src="static/img/vendor/images/pdf.png" ng-click="editRegulPicture(commodity.Regulpic || 'static/img/store/common/default.png', commodity)"/>-->
+                                    <!--<img src="static/img/vendor/images/fireinfo_icon.png" width="18" height="18" style="width:18px;height:18px;border: 0px;margin-left:5px;"/>-->
+                                    <!--<div class="forAdminLook">待审核</div>-->
                                     <!--</div>-->
                                 </div>
                                 <div class="content-show width70">
@@ -1402,128 +1402,128 @@
                                 </div>
                                 <div class="content-show width60">
                                     <div>
-                                    <span name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
+                                        <span name="save-a"><button class="ok" ng-mouseleave="recoveryBlur()" ng-mouseenter="impedeBlur()" ng-click="updateGoods(commodity, $index)">保存</button></span>
                                     </div>
                                     <div>
-                                    <span name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
+                                        <span name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>
                                     </div>
                                 </div>
                             </div>
                         </td>
                         <!--<td class="middle padding0 check-input">-->
-                            <!--<div>{{$index + 1}}</div>-->
+                        <!--<div>{{$index + 1}}</div>-->
                         <!--</td>-->
                         <!--<td class="middle"  style="vertical-align: top !important;">-->
-                            <!--<div class="fl img">-->
-                                <!--<a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>-->
-                                <!--<div class="edit-img">-->
-                                    <!--<a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>-->
-                                    <!--<a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <!--<div class="fr wid135">-->
-                                <!--<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>-->
-                            <!--</div>-->
+                        <!--<div class="fl img">-->
+                        <!--<a><img ng-src="{{commodity.editPic ? commodity.editPic : 'static/img/store/common/default.png'}}"/></a>-->
+                        <!--<div class="edit-img">-->
+                        <!--<a ng-click="commodity.editPic = null" class="delete-img" title="删除" ng-if="commodity.editPic"><i class="fa fa-trash"></i></a>-->
+                        <!--<a ng-click="editGoodsPicture(commodity.editPic || 'static/img/store/common/default.png', commodity)" title="修改图片"><img src="static/img/icon/update-img.png" /></a>-->
+                        <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="fr wid135">-->
+                        <!--<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>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td>-->
-                            <!--<div>-->
-                                <!--<span><input type="text" ng-blur="editPackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span><input type="text" ng-blur="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="11" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>可拆卖:</span>-->
-                                <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
-                            <!--</div>-->
+                        <!--<div>-->
+                        <!--<span><input type="text" ng-blur="editPackaging(commodity)" placeholder="包装方式" maxlength="10" ng-model="commodity.editPackaging" ng-class="{'error' : commodity.editPackagingInvalid}" class="wid88 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--<div>-->
+                        <!--<span><input type="text" ng-blur="editProduceDateFa(commodity)" placeholder="生产日期" maxlength="11" ng-model="commodity.editProduceDate" ng-class="{'error' : commodity.editProduceDateInvalid}" class="wid88 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--<div>-->
+                        <!--<span>可拆卖:</span>-->
+                        <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td>-->
-                            <!--<div>-->
-                                <!--<span>库存: </span>-->
-                                <!--<span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}" placeholder="库存" ng-model="commodity.editReserve" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>起订量: </span>-->
-                                <!--<span><input type="text" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="起拍" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span>包装数量: </span>-->
-                                <!--<span><input type="text" ng-blur="changeMinPackQty(commodity)" ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="倍数" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--&lt;!&ndash;<div>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<span>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<select class="wid85 select-adder form-control" style="width: 81px;">&ndash;&gt;-->
-                            <!--&lt;!&ndash;<option value="1">可拆卖</option>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<option value="2">不可拆卖</option>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</select>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                            <!--&lt;!&ndash;</div>&ndash;&gt;-->
+                        <!--<div>-->
+                        <!--<span>库存: </span>-->
+                        <!--<span><input type="text" ng-blur="changeReserve(commodity)" ng-class="{'error' : commodity.editReserveInvalid}" placeholder="库存" ng-model="commodity.editReserve" class="wid48 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--<div>-->
+                        <!--<span>起订量: </span>-->
+                        <!--<span><input type="text" ng-blur="changeMinBuyQty(commodity)" ng-class="{'error' : commodity.editMinBuyQtyInValid}" placeholder="起拍" ng-model="commodity.editMinBuyQty" class="wid48 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--<div>-->
+                        <!--<span>包装数量: </span>-->
+                        <!--<span><input type="text" ng-blur="changeMinPackQty(commodity)" ng-class="{'error' : commodity.editMinPackQtyInValid}" placeholder="倍数" ng-model="commodity.editMinPackQty" class="wid48 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--&lt;!&ndash;<div>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<span>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<select class="wid85 select-adder form-control" style="width: 81px;">&ndash;&gt;-->
+                        <!--&lt;!&ndash;<option value="1">可拆卖</option>&ndash;&gt;-->
+                        <!--&lt;!&ndash;<option value="2">不可拆卖</option>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</select>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
+                        <!--&lt;!&ndash;</div>&ndash;&gt;-->
                         <!--</td>-->
                         <!--<td>-->
-                            <!--<div ng-repeat="price in commodity.editPrices">-->
-                                <!--<span style="margin-right: 0;overflow: hidden;"><input type="text" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$index == (commodity.editPrices.length-1)">以上</em></span>-->
-                                <!--<span ng-if="$index != (commodity.editPrices.length-1)">-</span>-->
-                                <!--<span ng-if="$index != (commodity.editPrices.length-1)"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>-->
-                            <!--</div>-->
+                        <!--<div ng-repeat="price in commodity.editPrices">-->
+                        <!--<span style="margin-right: 0;overflow: hidden;"><input type="text" ng-blur="editQty(commodity, $index, false, price.start)" ng-class="{'error' : price.startInValid}" placeholder="数量"  ng-model="price.start" class="wid40 form-control fl"/><em class="fl margin5" ng-if="$index == (commodity.editPrices.length-1)">以上</em></span>-->
+                        <!--<span ng-if="$index != (commodity.editPrices.length-1)">-</span>-->
+                        <!--<span ng-if="$index != (commodity.editPrices.length-1)"><input type="text" ng-blur="editQty(commodity, $index, true, price.end)" ng-class="{'error' : price.endInValid}" placeholder="数量" ng-model="price.end" class="wid40 form-control"/></span>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td ng-if="onsale.currency == 'USD'">-->
-                            <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                                <!--<span ng-if="commodity.currencyName.indexOf('USD') > -1">-->
-                                    <!--<form name="usdForm">-->
-                                        <!--<input type="text" name="usd" ng-blur="priceBlur(price, true)" ng-keyup="priceValid(price, true)" ng-class="{'error' : price.usdPriceInvalid}" placeholder="香港交货($)" autocomplete="off" ng-model="price.uSDPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                                    <!--</form>-->
-                                <!--</span>-->
-                                <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                                <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                            <!--</div>-->
+                        <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
+                        <!--<span ng-if="commodity.currencyName.indexOf('USD') > -1">-->
+                        <!--<form name="usdForm">-->
+                        <!--<input type="text" name="usd" ng-blur="priceBlur(price, true)" ng-keyup="priceValid(price, true)" ng-class="{'error' : price.usdPriceInvalid}" placeholder="香港交货($)" autocomplete="off" ng-model="price.uSDPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
+                        <!--</form>-->
+                        <!--</span>-->
+                        <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
+                        <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td ng-if="onsale.currency == 'RMB'">-->
-                            <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
-                                <!--<span ng-if="commodity.currencyName.indexOf('RMB') > -1">-->
-                                    <!--<form name="rmbForm">-->
-                                        <!--<input type="text" name="rmb" ng-blur="priceBlur(price, false)" ng-keyup="priceValid(price, false)" ng-class="{'error' : price.rmbPriceInvalid}" placeholder="大陆交货(￥)" autocomplete="off" ng-model="price.rMBPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
-                                    <!--</form>-->
-                                <!--</span>-->
-                                <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
-                                <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
-                            <!--</div>-->
+                        <!--<div style="width: 99px;" ng-repeat="price in commodity.editPrices">-->
+                        <!--<span ng-if="commodity.currencyName.indexOf('RMB') > -1">-->
+                        <!--<form name="rmbForm">-->
+                        <!--<input type="text" name="rmb" ng-blur="priceBlur(price, false)" ng-keyup="priceValid(price, false)" ng-class="{'error' : price.rmbPriceInvalid}" placeholder="大陆交货(￥)" autocomplete="off" ng-model="price.rMBPrice" ng-model-options="{debounce : 100}" class="wid85 form-control"/>-->
+                        <!--</form>-->
+                        <!--</span>-->
+                        <!--<a name="reduce-a" class="reduce" ng-disabled="commodity.editPrices.length < 2" ng-click="deleteFragment(commodity, $index)"><i class="fa fa-minus-circle"></i></a>-->
+                        <!--<a name="add-a" class="add" ng-disabled="commodity.editPrices.length >= 3" ng-click="addFragment(commodity)"><i class="fa fa-plus-circle"></i></a>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td>-->
-                            <!--<div ng-if="onsale.currency == 'RMB'">-->
-                                <!--&lt;!&ndash;<span>大陆：</span>&ndash;&gt;-->
-                                <!--<span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                                <!--<span>-</span>-->
-                                <!--<span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                            <!--</div>-->
-                            <!--<div ng-if="onsale.currency == 'USD'">-->
-                                <!--&lt;!&ndash;<span>香港：</span>&ndash;&gt;-->
-                                <!--<span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
-                                <!--<span>-</span>-->
-                                <!--<span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
-                            <!--</div>-->
+                        <!--<div ng-if="onsale.currency == 'RMB'">-->
+                        <!--&lt;!&ndash;<span>大陆：</span>&ndash;&gt;-->
+                        <!--<span><input type="text" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
+                        <!--<span>-</span>-->
+                        <!--<span><input type="text" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
+                        <!--</div>-->
+                        <!--<div ng-if="onsale.currency == 'USD'">-->
+                        <!--&lt;!&ndash;<span>香港：</span>&ndash;&gt;-->
+                        <!--<span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.editMinDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, true, true, commodity)" ng-model="commodity.editMinDelivery" class="wid25 form-control"/></span>-->
+                        <!--<span>-</span>-->
+                        <!--<span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.editMaxDeliveryinValid}" ng-blur="changeDelivery(commodity.editMinDelivery, commodity.editMaxDelivery, false, true, commodity)" ng-model="commodity.editMaxDelivery" class="wid25 form-control"/></span>-->
+                        <!--</div>-->
 
                         <!--</td>-->
                         <!--<td>-->
-                            <!--<div>-->
-                                    <!--<span>-->
-                                        <!--<select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">-->
-                                            <!--<option value="1">自营</option>-->
-                                            <!--<option value="2">寄售</option>-->
-                                        <!--</select>-->
-                                    <!--</span>-->
-                            <!--</div>-->
+                        <!--<div>-->
+                        <!--<span>-->
+                        <!--<select ng-change="changeSaleMode(commodity)" class="wid68 select-adder form-control" ng-model="commodity.editSelfSale">-->
+                        <!--<option value="1">自营</option>-->
+                        <!--<option value="2">寄售</option>-->
+                        <!--</select>-->
+                        <!--</span>-->
+                        <!--</div>-->
                         <!--</td>-->
                         <!--<td class="padding0">-->
-                            <!--<div>-->
-                                <!--<span-->
-                                        <!--name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>-->
-                            <!--</div>-->
-                            <!--<div>-->
-                                <!--<span-->
-                                        <!--name="save-a"><button class="ok" ng-click="updateGoods(commodity, $index)">保存</button></span>-->
-                            <!--</div>-->
+                        <!--<div>-->
+                        <!--<span-->
+                        <!--name="cancle-a"><button class="off" ng-click="cancleEdit(commodity)">取消</button></span>-->
+                        <!--</div>-->
+                        <!--<div>-->
+                        <!--<span-->
+                        <!--name="save-a"><button class="ok" ng-click="updateGoods(commodity, $index)">保存</button></span>-->
+                        <!--</div>-->
                         <!--</td>-->
                     </tr>
                     </tbody>
@@ -1541,17 +1541,17 @@
                             </div>
                         </td>
                         <!--<td colspan="10" style="padding: 74px 0;">-->
-                            <!--<div style="line-height: 106px;">-->
-                                <!--<div class="col-xs-2" style="margin-left: 35%;">-->
-                                    <!--<img src="static/img/all/empty-cart.png">-->
-                                <!--</div>-->
-                                <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
-                                    <!--<p class="grey f14">-->
-                                        <!--暂无产品信息，赶快上传让更多人看到你的产品吧！-->
-                                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
-                                    <!--</p>-->
-                                <!--</div>-->
-                            <!--</div>-->
+                        <!--<div style="line-height: 106px;">-->
+                        <!--<div class="col-xs-2" style="margin-left: 35%;">-->
+                        <!--<img src="static/img/all/empty-cart.png">-->
+                        <!--</div>-->
+                        <!--<div class="col-xs-4 text-right" style="line-height: 124px;">-->
+                        <!--<p class="grey f14">-->
+                        <!--暂无产品信息，赶快上传让更多人看到你的产品吧！-->
+                        <!--<a href="vendor#/vendor_upload" style="margin-left:20px;font-size: 14px;color:#5078cb"><i class="fa fa-mail-reply"></i>&nbsp;马上去上传</a>-->
+                        <!--</p>-->
+                        <!--</div>-->
+                        <!--</div>-->
                         <!--</td>-->
                     </tr>
                     </tbody>

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

@@ -1393,7 +1393,7 @@
                                 <p class="componet-info">
 																		品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
                                     <a ng-if="!detail.uuid" class="unstand"><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 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 ng-if="!detail.uuid" class="unstand"><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><em ng-bind="detail.spec || '-'" title="{{::detail.spec}}"></em></a>

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

@@ -264,7 +264,7 @@
         </div>
         <div class="search-check" ng-if="$$productRepository.status == 'all' || $$productRepository.status == 'standard' || $$productRepository.status == 'nStandard'">
             <div class="search fl">
-                <input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="$$productRepository.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号">
+                <input type="text" class="form-control ng-pristine ng-valid ng-touched" ng-model="$$productRepository.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号">
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="download()" class="down-goods-btn">批量导出</a>
             </div>
@@ -278,7 +278,7 @@
                         <thead>
                             <tr>
                                 <th width="40">序号</th>
-                                <th width="200">产品名称（类目）</th>
+                                <th width="200">物料名称</th>
                                 <th width="180">品牌</th>
                                 <th width="100">型号</th>
                                 <th width="100">封装</th>
@@ -343,7 +343,7 @@
                                 <td ng-bind="nProduct.encapsulation || '-'" title="{{nProduct.encapsulation}}">BGA</td>
                                 <td class="more-list" colspan="2">
                                     <div class="type-brand" ng-repeat="item in nProduct.matchresults">
-                                        <p>类目：<span ng-bind="item.kindcn" title="{{item.kindcn}}">LPC1112</span></p>
+                                        <p>物料名称：<span ng-bind="item.kindcn" title="{{item.kindcn}}">LPC1112</span></p>
                                         <p> 品牌：<span ng-bind="item.branden" title="{{item.branden}}">LPC1112</span></p>
                                         <div class="check">
                                             <input type="checkbox" id="{{item.id}}" ng-model="item.checked" name="item.id" ng-click="chooseThisComponet(item, nProduct)"><label for="{{item.id}}"></label>

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

@@ -655,7 +655,7 @@
         <!--搜索-->
         <div class="search-check">
             <div class="search fl">
-                <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyword" ng-search="onSearch()" placeholder="类目/品牌/型号" style="text-align: left;
+                <input type="text" class="form-control ng-pristine ng-untouched ng-valid" ng-model="keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号" style="text-align: left;
     padding-left: 15px;">
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="download()">批量导出</a>
@@ -681,7 +681,7 @@
                     <thead>
                     <tr>
                         <th width="60">序号</th>
-                        <th width="140">产品名称（类目）</th>
+                        <th width="140">物料名称</th>
                         <th width="100">品牌</th>
                         <th width="100">型号</th>
                         <th width="100">封装</th>
@@ -840,7 +840,7 @@
                     <thead>
                     <tr>
                         <th width="60">序号</th>
-                        <th width="140">产品名称（类目）</th>
+                        <th width="140">物料名称</th>
                         <th width="100">品牌</th>
                         <th width="100">型号</th>
                         <th width="100">封装</th>

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

@@ -408,7 +408,7 @@
         </div>
         <div class="search-check">
             <div class="search fl">
-                <input type="text" class="form-control" ng-model="$$putOn.keyword" ng-search="onSearch()" placeholder="类目/品牌/型号"/>
+                <input type="text" class="form-control" ng-model="$$putOn.keyword" ng-search="onSearch()" placeholder="物料名称/品牌/型号"/>
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="downGoods()" class="down-goods-btn">批量导出</a>
                 <form style="display: none;" id="down-load-goods" method="get">
@@ -448,7 +448,7 @@
                                 <a href="#"><img ng-src="{{standard.img || 'static/img/store/common/default.png'}}"/></a>
                             </div>
                             <div class="content">
-                                <p>类目:<span ng-bind="standard.kindCn" title="{{standard.kindCn || ''}}">Panasonic</span></p>
+                                <p>物料名称:<span ng-bind="standard.kindCn" title="{{standard.kindCn || ''}}">Panasonic</span></p>
                                 <p>型号:<span ng-bind="standard.cmpCode" title="{{standard.cmpCode || ''}}">LPC1112</span></p>
                                 <p>品牌:<span ng-bind="standard.brandEn" title="{{standard.brandEn || ''}}">CPU</span></p>
                                 <p>封装:<span ng-bind="standard.encapsulation || '-'" title="{{standard.encapsulation || ''}}">BGA</span></p>
@@ -541,7 +541,7 @@
                                 </div>
                             </div>
                             <div class="content">
-                                <p>类目:<span ng-bind="standard.kindCn" title="{{standard.kindCn}}">Panasonic</span></p>
+                                <p>物料名称:<span ng-bind="standard.kindCn" title="{{standard.kindCn}}">Panasonic</span></p>
                                 <p>型号:<span ng-bind="standard.cmpCode" title="{{standard.cmpCode}}">LPC1112</span></p>
                                 <p>品牌:<span ng-bind="standard.brandEn" title="{{standard.brandEn}}">CPU</span></p>
                                 <p>封装:<span ng-bind="standard.encapsulation || '-'" title="{{standard.encapsulation || ''}}">BGA</span></p>

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

@@ -697,7 +697,7 @@
                             </div>
                             <div class="fr wid135">
                                 <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}"></em></p>
-                                <p>类目: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
+                                <p>物料名称: <em ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}"></em></p>
                                 <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}"></em></p>
                             </div>
                         </td>

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

@@ -596,11 +596,11 @@
                                 <label for="forIgnore"></label>
                                 <span>忽略不导入</span>
                             </label>
-                            <label class="sellType">
-                                <input type="radio" name="import" id="forImport" ng-model="repeatImport" value="1" ng-click="switchImport(1)">
-                                <label for="forImport"></label>
-                                <span>作为新产品继续导入</span>
-                            </label>
+                            <!--<label class="sellType">-->
+                                <!--<input type="radio" name="import" id="forImport" ng-model="repeatImport" value="1" ng-click="switchImport(1)">-->
+                                <!--<label for="forImport"></label>-->
+                                <!--<span>作为新产品继续导入</span>-->
+                            <!--</label>-->
                         </div>
                         <div><span ng-if="$$productOn.tab == 'bathOn'">3、</span>请上传已经编辑好的库存表格，选择好上传的文件之后，点击确认上传</div>
                         <div class="upload">
@@ -626,8 +626,9 @@
                             </div>-->
                         </div>
                         <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品（其中标准产品 <span ng-bind="result.success">200</span> 个，非标产品 <span ng-bind="result.failure">400</span> 个）<b class="success-hidden" ng-if="result.filter != 0">，下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
-                        <table ng-table="relTableParams" class="public-tab table" ng-show="$$productOn.tab == 'bathOn'">
-                            <thead>
+                        <div ng-show="$$productOn.tab == 'bathOn'">
+                            <table ng-table="relTableParams" class="public-tab table">
+                                <thead>
                                 <tr>
                                     <th width="60">序号</th>
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
@@ -637,8 +638,8 @@
                                     <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
                                     <th width="70">操作</th>
                                 </tr>
-                            </thead>
-                            <tbody>
+                                </thead>
+                                <tbody>
                                 <tr ng-repeat="batchCommodity in pageParams.content">
                                     <td class="check-input">
                                         <!--<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
@@ -668,13 +669,13 @@
                                         <div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>
                                         <div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>
                                         <!--<div>倍数/价格：&nbsp;-->
-                                            <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
-                                            <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
-                                                    <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
-                                                <!--</span>-->
-                                            <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
-                                                    <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
-                                                <!--</span>-->
+                                        <!--<span ng-bind="batchCommodity.minBuyQty | number"></span>-->
+                                        <!--<span ng-if="batchCommodity.usdMinPackPrice">-->
+                                        <!--/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>-->
+                                        <!--</span>-->
+                                        <!--<span ng-if="batchCommodity.rmbMinPackPrice">-->
+                                        <!--/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>-->
+                                        <!--</span>-->
                                         <!--</div>-->
                                         <!--<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>-->
                                         <div>
@@ -699,13 +700,14 @@
                                         <div>显示 <i ng-bind="pageParams.start"></i>- <i ng-bind="pageParams.end">10</i> 个，共：<i style="color: #5078cb;" ng-bind="pageParams.totalElements"></i> 个</div>
                                     </td>
                                 </tr>
-                            </tbody>
-                            <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
+                                </tbody>
+                                <tbody class="no-record-list" ng-if="!pageParams || !pageParams.content || pageParams.content.length == 0">
                                 <tr class="height200">
                                     <td colspan="7" style="background: #fff;"><img src="static/img/all/empty-cart.png"><span class="f14">暂无产品信息，赶快上传让更多人看到你的产品吧</span></td>
                                 </tr>
-                            </tbody>
-                        </table>
+                                </tbody>
+                            </table>
+                        </div>
                         <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>
@@ -806,8 +808,7 @@
         margin-top: -60px;
     }
     #canvas {
-        margin: 0 auto;
-        margin-top: 5%;
+        margin: 5% auto 0;
     }
     .infoTEXT {
         font-size: 18px;

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

@@ -60,7 +60,7 @@ h4 {
 				<span ng-bind="comp.code"></span>
 			</div>
 			<div class="col-xs-4">
-				<span>类目名称：</span>
+				<span>物料名称：</span>
 				<span ng-bind="comp.kind.nameCn"></span>
 			</div>
 			<div class="col-xs-4">

src/main/webapp/resources/view/vendor/modal/discharge_commodity_modal.html

@@ -89,7 +89,7 @@
 <div class="modal-body" style="padding-top: 0px;">
 	<form name="myForm">
 		<div class="row line-height-30">
-				<label class="col-xs-2">产品类目：</label>
+				<label class="col-xs-2">物料名称：</label>
 				<span  class="col-xs-3" ng-bind="goods.kindNameCn"></span>
 				<label class="col-xs-2">产品品牌：</label>
 				<span class="col-xs-3" ng-bind="goods.brandNameCn"></span>

src/main/webapp/resources/view/vendor/modal/discharge_goods_modal.html

@@ -43,7 +43,7 @@ label {
 <div class="modal-body">
 	<form name="myForm">
 		<div class="row">
-				<label class="col-xs-2">类目：</label>
+				<label class="col-xs-2">物料名称：</label>
 				<span  class="col-xs-4" ng-bind="goods.kindNameCn"></span>
 				<label class="col-xs-2">品牌：</label>
 				<span class="col-xs-4" ng-bind="goods.brandNameCn"></span>

src/main/webapp/resources/view/vendor/modal/recommend_product_modal.html

@@ -335,7 +335,7 @@ input[type="number"] {
                     <td style="padding-right: 0;"><div class="img"><img ng-src="{{ commodity.img || 'static/img/store/common/default.png'}}"  alt="器件图片"/></div></td>
                     <td>
                         <div>
-                            <span>类目：</span>
+                            <span>物料名称：</span>
                             <span class="more-text-span" ng-bind="commodity.kindNameCn" title="{{commodity.kindNameCn}}">LPC1112</span>
                         </div>
                         <div>
@@ -406,7 +406,7 @@ input[type="number"] {
                     <td style="padding-right: 0;"><div class="img"><img ng-src="{{ goods.img || 'static/img/store/common/default.png'}}"  alt="器件图片"/></div></td>
                     <td>
                         <div>
-                            <span>类目：</span>
+                            <span>物料名称：</span>
                             <span class="more-text-span" ng-bind="goods.kindNameCn" title="{{goods.kindNameCn}}" >LPC1112</span>
                         </div>
                         <div>

src/main/webapp/resources/view/vendor/modal/uploadProduct.html

@@ -294,7 +294,7 @@
                         <span>LPC1112</span>
                     </div>
                     <div>
-                        <span>类目：</span>
+                        <span>物料名称：</span>
                         <span>LPC1112</span>
                     </div>
                 </td>
@@ -357,7 +357,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目：</span>
+                            <span>物料名称：</span>
                             <span>LPC1112</span>
                         </div>
                     </td>
@@ -420,7 +420,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目：</span>
+                            <span>物料名称：</span>
                             <span>LPC1112</span>
                         </div>
                     </td>
@@ -483,7 +483,7 @@
                             <span>LPC1112</span>
                         </div>
                         <div>
-                            <span>类目：</span>
+                            <span>物料名称：</span>
                             <span>LPC1112</span>
                         </div>
                     </td>