调整 产品规范

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

@@ -73,6 +73,7 @@ define(["app/app", 'jquery-summernote'], function(app) {
 						$scope.cartMap.push(obj);
 					}
 				});
+				console.log($scope.cartMap)
 				$scope.cartIsEmpty = !$scope.carts.length ? true : false;
 				//设置全选的复选框
 				$scope.isChooseAll = $scope.isAllSelect($scope.carts);

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

@@ -285,14 +285,14 @@ define(['app/app'], function (app) {
 			606: true
 		};
 
-		var getRecommendComps = function (userUU, usedFor, pageable) {
-			Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
-				$scope.recommendComps = data.content;
-			}, function (error) {
-				toaster.pop('error', '获取推荐器件失败');
-			})
-		};
-		getRecommendComps(null, null, {page: 0, size: 12});
+		// var getRecommendComps = function (userUU, usedFor, pageable) {
+		// 	Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
+		// 		$scope.recommendComps = data.content;
+		// 	}, function (error) {
+		// 		toaster.pop('error', '获取推荐器件失败');
+		// 	})
+		// };
+		// getRecommendComps(null, null, {page: 0, size: 12});
 
 		// 重新加载数据
 		$scope.reload = function () {

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

@@ -1106,14 +1106,14 @@ define(['app/app'], function (app) {
             });
         };
 
-        var getRecommendComps = function (userUU, usedFor, pageable) {
-            Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
-                $scope.recommendComps = data.content;
-            }, function (error) {
-                toaster.pop('error', '获取推荐器件失败', error);
-            })
-        };
-        getRecommendComps(null, null, {page: 0, size: 12});
+        // var getRecommendComps = function (userUU, usedFor, pageable) {
+        //     Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
+        //         $scope.recommendComps = data.content;
+        //     }, function (error) {
+        //         toaster.pop('error', '获取推荐器件失败', error);
+        //     })
+        // };
+        // getRecommendComps(null, null, {page: 0, size: 12});
 
 
         // 根据输入单号搜索单据

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

@@ -79,7 +79,7 @@ td {
 }
 .collect-item{
     width: 193px;
-    height: 210px;
+    height: 222px;
     float:left;
     margin:8px 4px;
 	border: 1px solid #d8d8d8;
@@ -276,6 +276,7 @@ td {
 												<p ng-bind="item.componentinfo.brand.nameEn">
 												<p ng-bind="item.componentinfo.kind.nameCn">
 												<p ng-bind="item.componentinfo.code"></p>
+											  <p ng-bind="item.componentinfo.spec"></p>
                     </div> 
                 </a>
                 <span class="collect-delete" ng-click="cancleStore(item.id)" ng-show="show && !isBatch"><i class="fa fa-trash fa-2x"></i></span>      

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

@@ -664,12 +664,13 @@
 								<div class="pro_xq">
 									<a href="store/productDetail/{{::cart.batchCode}}" target="_blank">
                                         <img ng-src="{{cart.img || 'static/img/store/common/default.png'}}" width="60" height="60"/></a>
-									<div class="car_pro_xq">
+									<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">型号：<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>
 								</div>
                         	</span>

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

@@ -907,7 +907,8 @@
 									类目：<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>
-									<a  class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
+									<a  class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a><br/>
+									规格：<a><em ng-bind="::detail.spec || '-'" title="{{::detail.spec}}"></em></a><br/>
 								</p>
 							</div>
 						</span>

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

@@ -437,11 +437,14 @@
                             <p class="style01" ng-if="detail.uuid">类目：
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
-							 <p class="style01" style="margin-top: 10px;" ng-if="!detail.uuid">类目：
+							 <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">规格：
+								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
 							</p>
 												</span>
 							<span class="wd01">交期：

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

@@ -278,6 +278,7 @@
 		margin-left: 4px;
 	}
 	.oder_xq_list dl .oder_l{
+		height: 104px;
 		background: #f6f9ff;
 		border-bottom: #fff 1px solid;
 	}
@@ -734,6 +735,7 @@
 								<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>
                         </span>
 						<span class="wd01" ng-if="order.status == 501">
@@ -772,7 +774,7 @@
 							<span ng-if="order.status != 501" ng-bind="detail.number" class="number" style="border: none;"></span>
                             </div>
                         </span>
-							<span class="price-step"  style="width: 10%" ng-class="{'none': detail.goodsHistory.prices.length > 1}">
+							<span class="price-step"  style="width: 10%;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;" ng-class="{'none': detail.goodsHistory.prices.length > 1}">
 								<em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" class="red"></em>
 								<p>
 									<a name="{{detail.id}}" ng-click="togglePrice(detail)" ng-if="detail.goodsHistory.prices.length > 1" ng-blur="togglePriceBlur(detail)" style="font-size: 12px">价格梯度</a>

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

@@ -478,20 +478,23 @@
 						<dd class="oder_l" ng-repeat="detail in purchase.purchaseDetails">
 						<span class="wd02">
 							<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
-							<p class="style01" style="margin-top: 10px;" ng-if="detail.uuid">类目：
+							<p class="style01" ng-if="detail.uuid" style="margin-top: 10px;">品牌：
+								<a ng-bind="detail.brName || '-'" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>
+							</p>
+							<p class="style01" ng-if="!detail.uuid" style="margin-top: 10px;">品牌：
+								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
+							</p>
+							<p class="style01"  ng-if="detail.uuid">类目：
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
-							<p class="style01" style="margin-top: 10px;" ng-if="!detail.uuid">类目：
+							<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" ng-if="detail.uuid">品牌：
-								<a ng-bind="detail.brName || '-'" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>
-							</p>
-							<p class="style01" ng-if="!detail.uuid">品牌：
-								<a ng-bind="detail.brName || '-'" title="{{detail.brName}}" class="unstand"></a>
+							<p class="style01">型号：
+								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
 							</p>
 						</span>
 						<span class="wd01">交期：

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

@@ -1388,8 +1388,8 @@
                                     <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 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>
-
+																	  型号：<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>
                                 </p>
                             </div>
                         </span>