Merge branch 'dev' into feature-material-wangcz

src/main/java/com/uas/platform/b2c/advertise/ad/model/RecommendProduct.java

@@ -148,6 +148,12 @@ public class RecommendProduct implements Serializable {
 	@Column(name = "status")
 	private Integer status = 601;
 
+	/**
+	 *物料id
+	 */
+	@Column(name = "store_productid")
+	private Long productid;
+
 	public RecommendProduct() {
 	}
 
@@ -310,4 +316,13 @@ public class RecommendProduct implements Serializable {
 	public void setStoreUuid(String storeUuid) {
 		this.storeUuid = storeUuid;
 	}
+
+	public Long getProductid() {
+		return productid;
+	}
+
+	public RecommendProduct setProductid(Long productid) {
+		this.productid = productid;
+		return this;
+	}
 }

src/main/java/com/uas/platform/b2c/advertise/ad/utils/RecommendProductsUtils.java

@@ -36,6 +36,7 @@ public class RecommendProductsUtils {
 		recommendProduct.setReserve(goods.getReserve());
 		recommendProduct.setCurrency(goods.getCurrencyName());
 		recommendProduct.setStoreId(goods.getStoreid());
+		recommendProduct.setProductid(goods.getProductid());
 
 		return recommendProduct;
 	}

src/main/java/com/uas/platform/b2c/fa/payment/controller/BankInfoController.java

@@ -155,7 +155,7 @@ public class BankInfoController {
 	@RequestMapping(value="/save/enterprise", method=RequestMethod.POST, params = "type=sup")
 	@ResponseBody
 	@ApiOperation(value = "保存新增卖家企业银行账户", httpMethod = "POST")
-	public BankInfo saveSupEnterpriseBank(@ApiParam(required = true, value = "银行账户json字符串") String bankInfo, @ApiParam(required = true, value = "上传附件") FileUpload uploadItem) {
+	public BankInfo saveSupEnterpriseBank(@ApiParam(required = true, value = "银行账户json字符串") String bankInfo, @ApiParam(required = false, value = "上传附件") FileUpload uploadItem) {
 		logger.log("银行账户信息", "保存卖家企业银行账户信息 " + bankInfo);
 		BankInfo bank = FastjsonUtils.fromJson(bankInfo, BankInfo.class);
 		return bankInfoService.save(bank, Type.SUP.value(), uploadItem);

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -75,7 +75,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.uas.platform.b2c.core.utils.NumberUtil.fractionNumCeil;
-import static com.uas.platform.b2c.external.erp.commodity.util.ModelConverter.dateFormat;
 
 @Service
 public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchService {
@@ -338,11 +337,8 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
             }
 		}
 		if (!isAPerson && !isPcb) {
-			logger.info(String.format("%s 批次上架测试代码", dateFormat.format(new Date())));
-            System.err.println("批次上架测试代码");
 			String publish = publishByBatch(batch, isPcb);
 			modelMap.put("publish", publish);
-			System.err.println("批次上架测试代码");
 		}
 		modelMap.put("total", total);
 		modelMap.put("success", success);
@@ -1728,7 +1724,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	@Transactional
 	@Override
 	public String publishByBatch(String batch, boolean isPcb) {
-        System.err.println("测试信息的0" + "---------------------");
         if (StringUtils.isEmpty(batch)) {
             return "0";
         }
@@ -1737,7 +1732,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		if (CollectionUtils.isEmpty(releaseProductByBatchList)) {
 			return String.valueOf(IntegerConstant.NO_SHORT);
 		}
-		System.err.println("测试信息的1-1" + "---------------------");
 		Map<String, Object> map = convertProduct(releaseProductByBatchList, false, isPcb);
 		if (map == null || map.size() == 0) {
 			return "0";
@@ -1747,15 +1741,12 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			savePcbInfo(idSet, map);
 		}
 		Integer num = releaseToGoods(releaseProductByBatchList);
-		System.err.println("测试信息的1" + "---------------------");
 		String updateReleaseSql = "/*#mycat:db_type=master*/ update trade$releasebybatch set rel_releasecode = 101,rel_releasestatus = '已发布' where (rel_releasecode = 112 OR rel_releasecode = 113) and rel_batchid = '%s';";
 		final String updateRelease = String.format(updateReleaseSql, new Object[]{batch});
 		jdbcTemplate.execute(updateRelease);
-		System.err.println("测试信息的2" + "---------------------");
 		ArrayList<Long> list = new ArrayList<>();
 		list.addAll((Set<Long>)map.get("prIds"));
 		afterPublishToGoodsDo(list, (Set<Long>)map.get("reIds"), batch);
-		System.err.println("测试信息的3" + "---------------------");
 		return StringUtilB2C.getStr(num);
 	}
 
@@ -1854,7 +1845,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	}
 
 	private  Map<String, Object> convertProduct (List<ReleaseProductByBatch> releaseProductByBatchList, boolean isAPerson , boolean isPcb) {
-		System.err.println("测试信息的convertProduct1" + "---------------------");
 		if (CollectionUtils.isEmpty(releaseProductByBatchList)) {
 			return null;
 		}
@@ -1924,13 +1914,10 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 				}
             }
 		}
-		System.err.println("测试信息的convertProduct 2" + "---------------------");
 		List<ReleaseProductByBatch> reList = new ArrayList<>();
 		if (productsfromRelease.size() != 0) {
-			System.err.println("需要插入的新的物料的信息" + productsfromRelease.size());
             productService.saveByJdbcTemplate(productsfromRelease);
 			List<Product> productes = productService.findProductIdAndProdnumsByProdNums(proNums);
-			System.err.println("获取到的新插入的信息" + productes.size());
 			for (Product producte : productes) {
 				ProductPrivate productPrivate = new ProductPrivate();
 				productPrivate.setB2cEnabled(IntegerConstant.YES_SHORT);
@@ -1948,15 +1935,12 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 				}
 			}
 		}
-		System.err.println("测试信息的convertProduct 3" + "---------------------");
 		if (CollectionUtils.isNotEmpty(reList)) {
             udpatePridAndRrodnum(reList);
 		}
-		System.err.println("测试信息的convertProduct 4" + "---------------------");
 		if (CollectionUtils.isNotEmpty(productPrivates)) {
             commonDao.save(productPrivates, ProductPrivate.class);
 		}
-		System.err.println("测试信息的convertProduct 5" + "---------------------");
 		if (reIds.size() > 0) {
 			map.put("reIds", reIds);
 		}

src/main/webapp/resources/js/common/directives/onFinishRender.js

@@ -0,0 +1,13 @@
+var app = angular.module('on.finish.render',[])
+app.directive('onFinishRender', function ($timeout) {
+  return {
+    restrict: 'A',
+    link: function (scope) {
+      if (scope.$last === true) {
+        $timeout(function () {
+          scope.$emit('ngRepeatFinished');
+        });
+      }
+    }
+  }
+})

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

@@ -13,7 +13,18 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 	// 		$templateCache.removeAll();
 	// 	});
 	// });
-
+    app.directive('onFinishRenderFilters', function ($timeout) {
+        return {
+            restrict: 'A',
+            link: function(scope, element, attr) {
+                if (scope.$last === true) {
+                    $timeout(function() {
+                        scope.$emit('ngRepeatFinished');
+                    });
+                }
+            }
+        };
+    });
 
 	if (!Array.prototype.last){
 		Array.prototype.last = function(){

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

@@ -371,7 +371,10 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 // }
                 $scope.setSeekStatus = function (seek, status, isDisabled) {
                   if (isDisabled) {
-                    seek.$status = status;
+                    // seek.$status = status;
+                    if (status === 0) {
+                      seek.$status = status;
+                    }
                     return;
                   }
                   if (seek.id != $scope.currentSeek.id) {

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

@@ -61,6 +61,7 @@ define([ 'app/app' ], function(app) {
                     param.keyword = $scope.keyword;
                     Order.getOrderOnBillByPersonal(param, function (page) {
                         $scope.isAllCheck = false;
+                        $scope.orderData = []
                         $scope.$$kdnData.totalElements = page.totalElements;
                         if(Number(page.totalElements) > 0) {
                             $scope.$$kdnData.start = Number(page.size) * (Number(page.number) - 1) + 1;
@@ -129,9 +130,9 @@ define([ 'app/app' ], function(app) {
       // 内层DIV的滚动加载
       var window = angular.element($window);
       var docu = angular.element($document);
-      if (docu.scrollTop() + window.height() > docu.height() - 330) {
-        angular.element('#applyBtn').slideUp(0)
-      }
+      // if (docu.scrollTop() + window.height() > docu.height() - 330) {
+      //   angular.element('#applyBtn').slideUp(0)
+      // }
       window.on('scroll', function () {
         var scrollTop = docu.scrollTop();
         if (scrollTop + window.height() > docu.height() - 330) {
@@ -140,7 +141,12 @@ define([ 'app/app' ], function(app) {
           angular.element('#applyBtn').slideDown(300)
         }
       });
-
+    $scope.$on('ngRepeatFinished', function (ngRepeatFinishedEvent) {
+        // console.log(1)
+        if (docu.scrollTop() + window.height() > docu.height() - 330) {
+          angular.element('#applyBtn').slideUp(0)
+        }
+    });
 
     }]);
     app.register.controller('NoInvoiceSubmitCtrl', ['$scope','$rootScope','$modal', 'Order', 'toaster', 'submitInvoice', '$modalInstance','invoiceData','BillSubmit','$state', function ($scope, $rootScope, $modal, Order, toaster, submitInvoice, $modalInstance, invoiceData, BillSubmit, $state) {
@@ -231,4 +237,5 @@ define([ 'app/app' ], function(app) {
         }
 
     }]);
+
 });

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

@@ -58,7 +58,7 @@ define(['app/app'], function(app) {
 		 */
 		$scope.tradeRecordTableParams = new ngTableParams({
 			page : 1,
-			count : 30,
+			count : 10,
 			sorting : {
 				paytime : 'DESC'
 			}
@@ -166,51 +166,21 @@ define(['app/app'], function(app) {
 		};
 
 		$scope.onDateCondition = function (bool) {
-			// var text = '';
-			// var datePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
-			if (bool == 1){
-				// text = document.getElementById("start").value;
-				// if (text != '' && !datePattern.test(text)){
-				// 	toaster.pop("info", "请输入正确开始时间格式");
-				// 	return;
-				// }
-				// if (text != '' && !validateDate(text)){
-				// 	toaster.pop("info", "请输入正确开始时间格式");
-				// 	return;
-				// }
-				// if (!$scope.startDate && text != ''){
-				// 	$scope.startDate = convertTextToDate(text);
-				// }
-				if ($scope.startDate && !$scope.endDate){
-					var nowTime = new Date();
-					$scope.endDate = new Date(nowTime.getFullYear(), nowTime.getMonth(), nowTime.getDate());
-				}
-				if ($scope.startDate && $scope.endDate){
-					if ($scope.startDate.getTime() > $scope.endDate.getTime()){
-						$scope.endDate = new Date($scope.startDate.getTime() + 86400000);
-					}
-				}
-			}else {
-				// text = document.getElementById("end").value;
-				// if (text != '' && !datePattern.test(text)){
-				// 	// $scope.endDate = text;
-				// 	toaster.pop("info", "请输入正确结束时间格式");
-				// 	return;
-				// }
-				// if (text != '' && !validateDate(text)){
-				// 	// $scope.endDate = text;
-				// 	toaster.pop("info", "请输入正确结束时间格式");
-				// 	return;
-				// }
-				// if (!$scope.endDate && text != ''){
-				// 	$scope.endDate = convertTextToDate(text);
-				// }
-				if ($scope.startDate && $scope.endDate){
-					if ($scope.startDate.getTime() > $scope.endDate.getTime()){
-						$scope.startDate = new Date($scope.endDate.getTime() - 86400000);
-					}
+			var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+			var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+			if (startTime && endTime && startTime > endTime) {
+				if (bool == 1) {
+					toaster.pop('info', '起始时间不能大于结束时间');
+					$scope.startDate = null;
+				} else {
+					toaster.pop('info', '结束时间不能小于起始时间');
+					$scope.endDate = null;
 				}
 			}
+			if ($scope.endDate && bool == 2) {
+				$scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+				$scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+			}
 			loadPayHistory();
 		};
 

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

@@ -1,4 +1,4 @@
-define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'common/query/brand', 'common/query/kind', 'common/query/component', 'common/query/goods', 'common/query/rate','common/query/cart', 'common/query/order', 'common/query/address', 'common/query/invoice', 'common/query/property', 'common/query/kindAdvice', 'common/query/propertyAdvice', 'common/query/return' , 'common/query/change', 'common/query/logistics', 'ui.router', 'ui-bootstrap', 'ui-form', 'ui-jquery','angular-toaster', 'ngDraggable', 'angular-sanitize', 'ngTable', 'dynamicInput', 'jquery-imagezoom', 'file-upload', 'file-upload-shim', 'common/query/urlencryption' , 'common/query/purchase', 'common/query/vendor', 'common/query/goods', 'common/query/bankTransfer', 'common/query/enterprise', 'common/query/bill', 'common/query/receipt', 'common/query/collection', 'common/query/express', 'common/query/bankInfo','common/query/charge', 'common/query/statistics', 'common/query/currency', 'jquery-chart', 'common/query/responseLogistics', 'common/query/goodsPrice', 'common/query/address' , 'common/query/search', 'common/query/urlencryption', 'common/query/releaseProInfo', 'common/query/makerDemand', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/logistics', 'common/query/storeInfo', 'common/query/recommendation', 'common/query/user', 'common/query/logisticsPort', 'common/query/cms', 'common/query/material', 'common/query/storeCms', 'common/query/productImport', 'common/query/stockInOut', 'common/module/store_recommend_product', 'common/module/chat_web_module', 'common/query/standardPutOnAdmin', 'common/query/storeViolations', 'common/query/internalMessage', 'common/query/installments','common/query/product','common/query/seekPurchase','common/query/UASBatchPutOnProperty', 'common/query/authority', 'common/query/attendtion'], function(angularAMD) {
+define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'common/query/brand', 'common/query/kind', 'common/query/component', 'common/query/goods', 'common/query/rate','common/query/cart', 'common/query/order', 'common/query/address', 'common/query/invoice', 'common/query/property', 'common/query/kindAdvice', 'common/query/propertyAdvice', 'common/query/return' , 'common/query/change', 'common/query/logistics', 'ui.router', 'ui-bootstrap', 'ui-form', 'ui-jquery','angular-toaster', 'ngDraggable', 'angular-sanitize', 'ngTable', 'dynamicInput', 'jquery-imagezoom', 'file-upload', 'file-upload-shim', 'common/query/urlencryption' , 'common/query/purchase', 'common/query/vendor', 'common/query/goods', 'common/query/bankTransfer', 'common/query/enterprise', 'common/query/bill', 'common/query/receipt', 'common/query/collection', 'common/query/express', 'common/query/bankInfo','common/query/charge', 'common/query/statistics', 'common/query/currency', 'jquery-chart', 'common/query/responseLogistics', 'common/query/goodsPrice', 'common/query/address' , 'common/query/search', 'common/query/urlencryption', 'common/query/releaseProInfo', 'common/query/makerDemand', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/logistics', 'common/query/storeInfo', 'common/query/recommendation', 'common/query/user', 'common/query/logisticsPort', 'common/query/cms', 'common/query/material', 'common/query/storeCms', 'common/query/productImport', 'common/query/stockInOut', 'common/module/store_recommend_product', 'common/module/chat_web_module', 'common/query/standardPutOnAdmin', 'common/query/storeViolations', 'common/query/internalMessage', 'common/query/installments','common/query/product','common/query/seekPurchase','common/query/UASBatchPutOnProperty', 'common/query/authority', 'common/query/attendtion', 'onFinishRender'], function(angularAMD) {
 	'use strict';
 	/**
 	 * 自定义Array对象的属性last 方法
@@ -9,18 +9,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	};
 
 	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ui.form', 'ui.jquery', 'toaster', 'ngDraggable', 'tool.directives', 'ngSanitize', 'common.query.kind', 'common.services', 'brandServices', 'componentServices', 'goodsServices',  'rateServices','cartServices', 'orderServices', 'addressServices', 'invoiceServices', 'common.query.propertyAdvice', 'propertyServices', 'returnServices' , 'changeServices',  'logisticsServices', 'common.query.kindAdvice', 'ngTable', 'ngDynamicInput', 'common.directives', 'angularFileUpload', 'urlencryptionServices', 'purchaseServices', 'vendorServices', 'goodsServices', 'bankTransfer', 'common.query.enterprise', 'billServices', 'receiptServices', 'collection', 'expressServices', 'bankInfo','Charge', 'statisticsServices', 'currencyService', 'responseLogisticsService', 'PriceServices', 'addressServices', 'searchService', 'urlencryptionServices', 'ReleaseProductByBatchService', 'makerDemand', 'afterSaleService', 'messageBoardServices', 'logisticsServices', 'table.directives', 'storeInfoServices', 'recommendation', 'common.query.user', 'logisticsPortService', 'cmsService', 'materialServices', 'StoreCmsServices', 'productImportModule', 'stockInOutModule', 'StoreCmsModule', 'WebChatModule', 'StandardPutOnAdminModule', 'StoreViolationsServices', 'internalMessageServices', 'installmentServices','common.query.product', 'ui.tour', 'seekPurchaseServices', 'UASBatchPutOnPropertyModule', 'authorityServices', 'AttendtionServices'])
-  app.directive('onFinishRender', function ($timeout) {
-    return {
-      restrict: 'A',
-      link: function (scope) {
-        if (scope.$last === true) {
-          $timeout(function () {
-            scope.$emit('ngRepeatFinished');
-          });
-        }
-      }
-    }
-  })
+
 	//初始化，启动时载入app
 	app.init = function() {
 		angularAMD.bootstrap(app);

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

@@ -44,7 +44,7 @@ define(['app/app'], function(app) {
         var getTradeRecordInfo = function () {
             $scope.tradeRecordTableParams = new ngTableParams({
                 page : 1,
-                count : 30,
+                count : 10,
                 sorting : {
                     transferTime : 'DESC'
                 }
@@ -277,53 +277,21 @@ define(['app/app'], function(app) {
         };
 
         $scope.onDateCondition = function (bool) {
-            // var text = '';
-            // var datePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
-            if (bool == 1){
-                // text = document.getElementById("start").value;
-                // if (text != '' && !datePattern.test(text)){
-                //     // $scope.startDate = text;
-                //     toaster.pop("info", "请输入正确开始时间格式");
-                //     return;
-                // }
-                // if (text != '' && !validateDate(text)){
-                //     // $scope.startDate = text;
-                //     toaster.pop("info", "请输入正确开始时间格式");
-                //     return;
-                // }
-                // if (!$scope.startDate && text != ''){
-                //     $scope.startDate = convertTextToDate(text);
-                // }
-                if ($scope.startDate && !$scope.endDate){
-                    var nowTime = new Date();
-                    $scope.endDate = new Date(nowTime.getFullYear(), nowTime.getMonth(), nowTime.getDate());
-                }
-                if ($scope.startDate && $scope.endDate){
-                    if ($scope.startDate.getTime() > $scope.endDate.getTime()){
-                        $scope.endDate = new Date($scope.startDate.getTime() + 86400000);
-                    }
-                }
-            }else {
-                // text = document.getElementById("end").value;
-                // if (text != '' && !datePattern.test(text)){
-                //     // $scope.endDate = text;
-                //     toaster.pop("info", "请输入正确结束时间格式");
-                //     return;
-                // }
-                // if (text != '' && !validateDate(text)){
-                //     // $scope.endDate = text;
-                //     toaster.pop("info", "请输入正确结束时间格式");
-                //     return;
-                // }
-                // if (!$scope.endDate && text != ''){
-                //     $scope.endDate = convertTextToDate(text);
-                // }
-                if ($scope.startDate && $scope.endDate){
-                    if ($scope.startDate.getTime() > $scope.endDate.getTime()){
-                        $scope.startDate = new Date($scope.endDate.getTime() - 86400000);
-                    }
+            var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+            var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+            if (startTime && endTime && startTime > endTime) {
+                if (bool == 1) {
+                    toaster.pop('info', '起始时间不能大于结束时间');
+                    $scope.startDate = null;
+                } else {
+                    toaster.pop('info', '结束时间不能小于起始时间');
+                    $scope.endDate = null;
                 }
             }
+            if ($scope.endDate && bool == 2) {
+                $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+                $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+            }
             loadHistory();
         };
 
@@ -499,23 +467,23 @@ define(['app/app'], function(app) {
                 return ;
             }
             if (!account.bankname || !account.branchname || !account.number ||
-                !account.accountname || !account.attachUrl){
+                !account.accountname){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
             if (!$scope.matchData || $scope.branchError || $scope.branchPattError || $scope.numberError || $scope.numberPattError ||
-                $scope.nameError || $scope.repeatError || $scope.fileError || $scope.fileLegError){
+                $scope.nameError || $scope.repeatError){
                 toaster.pop('error', '请按要求填写正确的信息');
                 return ;
             }
 
-            var file = null;
-            if($scope.account.files && $scope.account.files[0]) {
-                file = $scope.account.files[0];
-            }
+            // var file = null;
+            // if($scope.account.files && $scope.account.files[0]) {
+            //     file = $scope.account.files[0];
+            // }
             $upload.upload({
                 url: 'trade/bankInfo/save/enterprise',
-                file: file,
+                // file: file,
                 method: 'POST',
                 params : {type : 'sup'},
                 data: {

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

@@ -203,9 +203,9 @@ define([ 'app/app' ], function(app) {
       // 内层DIV的滚动加载
       var window = angular.element($window);
       var docu = angular.element($document);
-      if (docu.scrollTop() + window.height() > docu.height() - 330) {
-        angular.element('#applyBtn').slideUp(0)
-      }
+      // if (docu.scrollTop() + window.height() > docu.height() - 330) {
+      //   angular.element('#applyBtn').slideUp(0)
+      // }
       window.on('scroll', function () {
         var scrollTop = docu.scrollTop();
         if (scrollTop + window.height() > docu.height() - 330) {
@@ -214,6 +214,12 @@ define([ 'app/app' ], function(app) {
           angular.element('#applyBtn').slideDown(300)
         }
       });
+        $scope.$on('ngRepeatFinished', function (ngRepeatFinishedEvent) {
+            // console.log(1)
+            if (docu.scrollTop() + window.height() > docu.height() - 330) {
+                angular.element('#applyBtn').slideUp(0)
+            }
+        });
 
     }]);
 });

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

@@ -6,7 +6,7 @@ define([ 'app/app' ], function(app) {
             $rootScope.$$productOn.leadIn = 'bathOn';
             $rootScope.$$productOn.tab = 'bathOn';
         }
-		$rootScope.active = 'vendor_productOn';
+		$rootScope.active = 'vendor_material';
 		document.title = '产品导入-优软商城';
         //切换展示的信息
         $scope.toggleActive = function(active) {
@@ -234,7 +234,8 @@ define([ 'app/app' ], function(app) {
             upload_text.value = fileInput.value;
         }
     };
-
+    // 是否是pcb
+    // $scope.isPcbStore =  $rootScope.isPcbStore
 		// 上传Excel批量发布（大量）
 		$scope.upload = function() {
 			if(($scope.batch.myFiles == null) || ($scope.batch.myFiles.length == 0)) {
@@ -250,6 +251,7 @@ define([ 'app/app' ], function(app) {
 			} else {
                 var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, repeatImport : $scope.repeatImport};
 			}
+
 			var uploadUrl = $rootScope.isPcbStore ? 'release/product/release/excel/pcb' : 'release/product/release/excel';
 			// 上传文件进度条
 			// $scope.uploadProgressText = ''

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

@@ -28,7 +28,8 @@ require.config({
 		'file-upload-shim': 'lib/angular/angular-file-upload-shim.min',
 		'showdown' : 'lib/showdown/showdown.min',
 		'calendar': 'lib/calendar/calendar',
-		'big': 'lib/decimal/big.min'
+		'big': 'lib/decimal/big.min',
+    'onFinishRender' : 'js/common/directives/onFinishRender'
 	},
 	shim : {
 		'angular' : {
@@ -65,7 +66,8 @@ require.config({
 		},
 		'file-upload': ['angular', 'file-upload-shim'],
 		'calendar': ['jquery'],
-		'big' : ['jquery']
+		'big' : ['jquery'],
+		'onFinishRender': ['angular']
 	}
 });
 require([ 'app/app', 'common/controllers/commonCtrls' ], function(app) {

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

@@ -496,10 +496,10 @@
     display: block
   }
   .count_basic{
-    background: #ecf2fd;
+
     width: 100%;
     margin: 0 auto;
-    height: 40px;
+    /*height: 40px;*/
     line-height: 40px;
     border-bottom: #e8e8e8 1px solid;
   }
@@ -509,7 +509,7 @@
   <!--开票记录-->
   <div class="ticket_record oder">
     <div class="count_basic">
-      <p class="basic_title"><span>发票信息</span>
+      <p class="basic_title" style="background: #ecf2fd;height: 40px;line-height:40px;"><span>发票信息</span>
         <!--<span class="fr"><a href="#">修改</a><a href="#">提交</a><a href="#">删除</a></span>-->
       </p>
     <!--<div style="background: #f5f5f5; height: 11px" ng-if="!changeBillStatusFlag"></div>-->
@@ -517,7 +517,7 @@
     <div class="match-menu" ng-if="changeBillStatusFlag">
                 <span class="active">
                     <a ng-bind="isAdd?'新增发票信息':'修改发票信息'"></a>
-                        <i class="fa fa-remove" ng-click="exitEdit()"></i>
+                        <i class="fa fa-remove" ng-click="exitEdit()" ng-if="invoices.length > 0"></i>
                 </span>
     </div>
     <!--我的发票-->
@@ -667,7 +667,7 @@
             <label class="col-md-2 control-label"><b class="text-inverse">*</b>联系电话：</label>
             <div class="form-input-line">
               <input type="text" class="form-control" ng-class="{'bg-fff8ee':!initFlag.initTelephone&&form.billTel.$error.required, 'bg-fff':!initFlag.initTelephone&&(!form.billTel.$invalid||!form.billTel.$touched)}" ng-model="bill.telephone" ng-focus="form.billTel.$touched = false" ng-blur="form.billTel.$touched = true; initFlag.initTelephone=false;" name="billTel"
-                     ng-pattern="/^[0-9\\-]*$/" ng-minlength="8" ng-maxlength="13" required="required" placeholder="请输入联系电话">
+                     ng-pattern="/^[0-9\\-]*$/" ng-minlength="8" maxlength="13" required="required" placeholder="请输入联系电话">
             </div>
             <div class="text-inverse error col-md-3" ng-show="form.billTel.$touched&&form.billTel.$invalid" ng-bind="form.billTel.$error.required?'请填写联系电话':'请输入8-13位电话号码'"></div>
           </div>

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

@@ -200,10 +200,10 @@
     .name {
         margin-right: 10px;
     }
-    .marginLeft {
-        max-height: 60px;
-        overflow-y: auto;
-    }
+    /*.marginLeft {*/
+        /*max-height: 60px;*/
+        /*overflow-y: auto;*/
+    /*}*/
     .marginLeft p {
         font-size: 14px;
     }
@@ -293,7 +293,7 @@
                                             </div>
                                             <div class="clearboth w100" ng-if="item.invoicetype === 1206">
                                                 <div class="pull-left name">订单号: </div>
-                                                <div class="pull-left marginLeft" style="max-width: 224px">
+                                                <div class="pull-left marginLeft" style="max-width: 224px; max-height: 40px;overflow-y: auto;">
                                                     <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                                 </div>
                                             </div>

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

@@ -276,7 +276,7 @@ body div.ng-table-pager a.page-a {
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="item in orderData track by $index">
+                        <tr ng-repeat="item in orderData track by $index" on-finish-render-filters>
                             <td>
                                 <lable class="check-act">
                                     <input type="checkbox" id={{$index+1}} ng-checked="item.checked" ng-click="checkInvoice(item)" />
@@ -285,8 +285,11 @@ body div.ng-table-pager a.page-a {
                             </td>
                             <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.storeName" target="_blank" style="color:#3f84f6"></a></td>
                             <td ng-bind="item.price"></td>
+                            <!--<td>-->
+                                <!--<a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>-->
+                            <!--</td>-->
                             <td>
-                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>
+                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
                             </td>
                             <td ng-bind="item.paytime | date: 'yyyy-MM-dd HH:mm'">
 

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

@@ -1038,7 +1038,7 @@
 						<b>总共<em ng-bind="::order.batchQty || 0"></em>件产品</b></dd>
 				</div>
 				<div ng-if="currenctOrders.length > 0" class="text-right" style="margin: 20px 0 12px 0;padding-right:15px;" >
-					显示&nbsp;{{(currenctOrdersList.number - 1 ) * currenctOrdersList.tobepaid + 1}}-{{currenctOrdersList.totalElements >= 10 ? (currenctOrdersList.number * currenctOrdersList.tobepaid > currenctOrdersList.totalElements ? currenctOrdersList.totalElements : currenctOrdersList.number * currenctOrdersList.tobepaid) : currenctOrdersList.totalElements}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
+					显示&nbsp;{{(currenctOrdersList.number - 1 ) * currenctOrdersList.numberOfElements + 1}}-{{currenctOrdersList.totalElements >= 10 ? (currenctOrdersList.number * currenctOrdersList.numberOfElements > currenctOrdersList.totalElements ? currenctOrdersList.totalElements : currenctOrdersList.number * currenctOrdersList.numberOfElements) : currenctOrdersList.totalElements}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
 				</div>
 				<div ng-if="currenctOrders.length == 0" class="text-center">
 					<div class="col-xs-offset-3 col-xs-2" >

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

@@ -360,6 +360,7 @@
 		line-height: 32px;
 		float: none;
 		border-radius: 2px;
+		vertical-align: unset;
 	}
 	.screen .sreach a.seek:hover{
 		background: #3f7ae3;
@@ -548,12 +549,11 @@
 							</div>
 						</div>
 						<div class="row">
-							<div class="col-sm-9 col-sm-offset-2" style="position: relative;left: -10px;"><em class="colorRed">*</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
+							<div class="col-sm-9 col-sm-offset-2" style="position: relative;left: -10px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 						</div>
 					</form>
 					<div class="row">
 						<div class="col-sm-12" style="text-align: center;">
-							<button class="btn" ng-click="cancel()" style="background: #acabab;color:#fff">取消</button>
 							<button class="btn" type="submit" ng-click="confirm()" style="background: #5078cb;color:#fff">确定</button>
 						</div>
 					</div>
@@ -833,7 +833,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-sm-10 col-sm-offset-2" style="position: relative;left: -43px;"><em class="colorRed">*</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
+					<div class="col-sm-10 col-sm-offset-2" style="position: relative;left: -43px;font-size: 12px;"><em class="colorRed">*声明：</em>为保障您的资金安全，账户信息加密显示且不可修改，只能删除后重新提交。</div>
 				</div>
 			</form>
 			<div class="row">

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

@@ -399,6 +399,7 @@
         line-height: 32px;
         float: none;
         broder-radius: 2px;
+        vertical-align: unset;
     }
     .screen .sreach a.seek:hover{
         background: #3f7ae3;
@@ -934,7 +935,7 @@
                                 <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
                             </div>
                         </div>
-                        <div class="row">
+                        <!--<div class="row">
                             <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                             <div class="col-sm-5 upload">
                                 <input type="text" readonly ng-model="account.attachUrl" class="form-control" style="width:70%;margin-right:10px;"/>
@@ -945,23 +946,22 @@
                                 <p ng-if="fileError">请上传可支持的格式</p>
                                 <p ng-if="!fileError && fileLegError">请勿超过3M</p>
                             </div>
-                        </div>
+                        </div>-->
                     </form>
                     <div class="row">
                         <button style="width:0;height:0;background: transparent;border:0;"></button>
                         <div class="col-sm-12" style="text-align: center;">
-                            <button class="btn" ng-click="cancelAdd()" style="background: #acabab;color:#fff">取消</button>
                             <button class="btn" type="submit" ng-click="ensureAddAccount()" style="background: #5078cb;color:#fff">确定</button>
                         </div>
                     </div>
-                    <div class="beizhu row">
+                    <div class="beizhu row" style="margin: 15px auto; width: 843px;">
                         <div class="col-sm-1" style="color: #f00;line-height: 20px;">*声明：</div>
                         <div class="col-sm-10">
                             1. 此账户为卖家收款账户，请仔细核对信息内容，若由信息错误造成的损失，优软商城不承担赔偿责任。<br/>
                             2. 卖家只能有唯一一个“使用中”的收款账户，新增账户审核通过后，原账户将自动失效。<br/>
                             3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
                             4. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。<br/>
-                            5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
+                            <!--5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。-->
                         </div>
                     </div>
                 </div>
@@ -1037,7 +1037,7 @@
                         <p ng-if="myForm.accountname.$touched && !account.accountname">开户名称不能为空</p>
                     </div>
                 </div>
-                <div class="row">
+               <!-- <div class="row">
                     <div class="col-sm-3"><em class="colorRed">*</em>上传开户许可证</div>
                     <div class="col-sm-5 upload">
                         <input type="text" readonly ng-model="account.attachUrl" class="form-control" style="width:70%;margin-right:10px;"/>
@@ -1048,7 +1048,7 @@
                         <p ng-if="fileError">请上传可支持的格式</p>
                         <p ng-if="!fileError && fileLegError">请勿超过3M</p>
                     </div>
-                </div>
+                </div>-->
             </form>
             <div class="row">
                 <button style="width:0;height:0;background: transparent;border:0;"></button>
@@ -1064,7 +1064,7 @@
                     2. 卖家只能有唯一一个“使用中”的收款账户，新增账户审核通过后，原账户将自动失效。<br/>
                     3. 如您的企业名称、开户银行及账号变更，您须在优软商城开展资金结算前进行更正，否则发生转账错误优软商城不承担赔偿责任。<br/>
                     4. 更多的条款请阅读<a href="help/helpDetail/51" style="color: #5078cb;" target="_blank">《优软商城代收代付协议》</a> 。<br/>
-                    5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。
+                    <!--5. 附件仅支持JPG、PNG、PDF格式，大小超过3M。-->
                 </div>
             </div>
         </div>

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -353,10 +353,10 @@
     .name {
         margin-right: 10px;
     }
-    .marginLeft {
-        max-height: 60px;
-        overflow-y: auto;
-    }
+    /*.marginLeft {*/
+        /*max-height: 60px;*/
+        /*overflow-y: auto;*/
+    /*}*/
     .marginLeft p {
         font-size: 14px;
     }
@@ -425,7 +425,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="item in billData track by $index">
+                    <tr ng-repeat="item in billData track by $index" on-finish-render >
                         <td  style="width: 60px;">
                             <lable class="check-act">
                                 <input type="checkbox" id={{$index+1}} ng-checked="item.checked" ng-click="checkInvoice(item)" />
@@ -472,7 +472,7 @@
                                     </div>
                                     <div class="pull-left w50">
                                         <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px">
+                                        <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
                                             <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                         </div>
                                     </div>

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

@@ -626,93 +626,93 @@
                             </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>
-                        <!--<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>-->
-                                    <!--<th width="180">产品固有属性</th>-->
-                                    <!--<th width="200">产品自定义属性</th>-->
-                                    <!--<th width="100">梯度/pcs</th>-->
-                                    <!--<th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>-->
-                                    <!--<th width="70">操作</th>-->
-                                <!--</tr>-->
-                                <!--</thead>-->
-                                <!--<tbody>-->
-                                <!--<tr ng-repeat="batchCommodity in pageParams.content">-->
-                                    <!--<td class="check-input">-->
-                                        <!--&lt;!&ndash;<span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>&ndash;&gt;-->
-                                        <!--<span ng-bind="$index+1"></span>-->
-                                    <!--</td>-->
-                                    <!--<td style="padding-left: 10px;">-->
-                                        <!--<div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>-->
-                                        <!--<div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>-->
-                                        <!--<div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>-->
-                                        <!--<div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>-->
-                                    <!--</td>-->
-                                    <!--<td>-->
-                                        <!--&lt;!&ndash;<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>&ndash;&gt;-->
-                                        <!--<div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>-->
-                                        <!--&lt;!&ndash;<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>&ndash;&gt;-->
-                                        <!--<div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>-->
-                                        <!--<div>-->
-                                            <!--<span class="label-commodity">交期：</span>-->
-                                            <!--<span>-->
-                                                 <!--<span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>-->
-                                                 <!--<span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>-->
-                                            <!--</span>-->
+                        <div ng-show="$$productOn.tab == 'bathOn' && isPcbStore">
+                            <table ng-table="relTableParams" class="public-tab table">
+                                <thead>
+                                <tr>
+                                    <th width="60">序号</th>
+                                    <th width="150" style="padding-left: 10px;">器件属性</th>
+                                    <th width="180">产品固有属性</th>
+                                    <th width="200">产品自定义属性</th>
+                                    <th width="100">梯度/pcs</th>
+                                    <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                                </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>-->
+                                        <span ng-bind="$index+1"></span>
+                                    </td>
+                                    <td style="padding-left: 10px;">
+                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.b2cBranden || '空'"></em></div>
+                                        <div class="text-more">物料名称：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
+                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.b2cCode || '空'"></em></div>
+                                        <div class="text-more">规格：&nbsp;<em title="{{batchCommodity.spec || '空'}}" ng-bind="batchCommodity.spec || '空'"></em></div>
+                                    </td>
+                                    <td>
+                                        <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->
+                                        <div>生产日期：&nbsp;<span ng-bind="batchCommodity.productDate"></span></div>
+                                        <!--<div>封装：&nbsp;<span ng-bind="batchCommodity.encapsulation || '无封装信息'"></span></div>-->
+                                        <div>包装：&nbsp;<span ng-bind="batchCommodity.packaging || '无包装信息'"></span></div>
+                                        <div>
+                                            <span class="label-commodity">交期：</span>
+                                            <span>
+                                                 <span ng-if="batchCommodity.selfMinDelivery == batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMaxDelivery"></span>
+                                                 <span ng-if="batchCommodity.selfMinDelivery != batchCommodity.selfMaxDelivery" ng-bind="batchCommodity.selfMinDelivery + '-' + batchCommodity.selfMaxDelivery"></span>
+                                            </span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>
+                                        <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>-->
                                         <!--</div>-->
-                                    <!--</td>-->
-                                    <!--<td>-->
-                                        <!--<div>库存：&nbsp;<span ng-bind="batchCommodity.reserve | number"></span></div>-->
-                                        <!--<div>最小起订量：&nbsp;<span ng-bind="batchCommodity.minBuyQty | number"></span></div>-->
-                                        <!--<div>最小包装数：&nbsp;<span ng-bind="batchCommodity.minPackage | number"></span></div>-->
-                                        <!--&lt;!&ndash;<div>倍数/价格：&nbsp;&ndash;&gt;-->
-                                        <!--&lt;!&ndash;<span ng-bind="batchCommodity.minBuyQty | number"></span>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.usdMinPackPrice">&ndash;&gt;-->
-                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.usdMinPackPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;<span ng-if="batchCommodity.rmbMinPackPrice">&ndash;&gt;-->
-                                        <!--&lt;!&ndash;/<span ng-bind="batchCommodity.rmbMinPackPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;</span>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;</div>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>&ndash;&gt;-->
-                                        <!--<div>-->
-                                            <!--<span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>-->
-                                            <!--&lt;!&ndash;<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>&ndash;&gt;-->
-                                        <!--</div>-->
-                                    <!--</td>-->
-                                    <!--<td style="vertical-align: top !important;">-->
-                                        <!--<div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>-->
-                                    <!--</td>-->
-                                    <!--<td style="vertical-align: top !important;">-->
-                                        <!--<div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>-->
-                                    <!--</td>-->
-                                    <!--<td>-->
-                                        <!--&lt;!&ndash;<a ng-click="editBatch(batchCommodity)">编辑</a><br/>&ndash;&gt;-->
-                                        <!--&lt;!&ndash;<a ng-click="deleteBatch(batchCommodity.id)">删除</a>&ndash;&gt;-->
-                                        <!--<a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>-->
-                                    <!--</td>-->
-                                <!--</tr>-->
-                                <!--<tr class="record-number" ng-if="pageParams.content.length > 0">-->
-                                    <!--<td colspan="7">-->
-                                        <!--<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">-->
-                                <!--<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>-->
-                        <!--</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>-->
-                            <!--<b class="tip" ng-show="$$productOn.tab == 'bathOn'">* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>-->
-                        <!--</div>-->
+                                        <!--<div>样品：&nbsp;<span ng-bind="batchCommodity.sampleqty | number"></span></div>-->
+                                        <div>
+                                            <span ng-bind="batchCommodity.breakUp ? '可拆卖' : '不可拆卖'"></span>
+                                            <!--<span class="switch"><button ng-class="{'active' : commodity.editBreakUp}" ng-click="toggleIsBreadUp(commodity)"></button></span>-->
+                                        </div>
+                                    </td>
+                                    <td style="vertical-align: top !important;">
+                                        <div ng-repeat="price in batchCommodity.prices">{{price.start + '+'}}</div>
+                                    </td>
+                                    <td style="vertical-align: top !important;">
+                                        <div ng-repeat="price in batchCommodity.prices">{{batchCommodity.currency=='RMB' ? price.rMBPrice : price.uSDPrice}}</div>
+                                    </td>
+                                    <td>
+                                        <!--<a ng-click="editBatch(batchCommodity)">编辑</a><br/>-->
+                                        <!--<a ng-click="deleteBatch(batchCommodity.id)">删除</a>-->
+                                        <a name = 'delete-material' ng-click="showDelete(batchCommodity)">删除</a>
+                                    </td>
+                                </tr>
+                                <tr class="record-number" ng-if="pageParams.content.length > 0">
+                                    <td colspan="7">
+                                        <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">
+                                <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>
+                        </div>
+                        <div style="margin-top: -40px;" ng-if="$$productOn.tab == 'bathOn'&& isPcbStore">3、如核对信息无误之后，点击确认发布</div>
+                        <div ng-show="$$productOn.tab == 'bathOn' && isPcbStore">
+                            <span class="blue-bg publish" href="javascript:void(0)" ng-click="publish($event)" ng-disabled="!pageParams.totalElements"><span>确认上架</span></span>
+                            <b class="tip" >* 上架成功30分钟后，方可被客户搜索到，并在公司产品库展示。</b>
+                        </div>
                     </div>
                 </div>
                 <!--<div class="load_next">-->