暂时影藏 违规与寄售协议模块

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

@@ -321,8 +321,8 @@ define(['app/app'], function (app) {
 			if(!$scope.checkGoodsInfo(standard)) {
 				return ;
 			}
-
-            // 如果没有开启店铺，第一次寄售时则弹出寄售协议
+            productStandardPutOnInfoPutOn(standard, index);
+            /*// 如果没有开启店铺，第一次寄售时则弹出寄售协议
             if (!$scope.$$putOn.isSelfStore) {
 				ConsignmentAgreementRecord.findRecordOfUser({}, {}, function (record) {
 					if (!record.id) {
@@ -345,7 +345,7 @@ define(['app/app'], function (app) {
 				});
             } else {
 				productStandardPutOnInfoPutOn(standard, index);
-            }
+            }*/
         };
 
         function productStandardPutOnInfoPutOn(standard, index) {
@@ -373,9 +373,10 @@ define(['app/app'], function (app) {
 			    console.log('AVSSC');
 				return ;
 			}
+			updateProductStandardPutOnInfo(standard, index);
 
 			// 如果没有开启店铺，第一次寄售时则弹出寄售协议
-			if (!$scope.$$putOn.isSelfStore) {
+			/*if (!$scope.$$putOn.isSelfStore) {
 				ConsignmentAgreementRecord.findRecordOfUser({}, {}, function (record) {
 					if (!record.id) {
 						// 弹出寄售协议弹窗
@@ -397,7 +398,7 @@ define(['app/app'], function (app) {
 				});
 			} else {
 				updateProductStandardPutOnInfo(standard, index);
-			}
+			}*/
         };
 
         function updateProductStandardPutOnInfo(standard, index) {
@@ -419,9 +420,9 @@ define(['app/app'], function (app) {
         $scope.changeSale = function (standard) {
             standard.editIsSelfSale = standard.editSelfSaleNum == 0;
 
-            if (!standard.editIsSelfSale) {
+            /*if (!standard.editIsSelfSale) {
 				checkAndShowConsignmentAgreement(standard);
-            }
+            }*/
         };
 
 		/**

src/main/webapp/resources/view/admin/store/store_info_detail.html

@@ -107,7 +107,7 @@
 		<div class="col-sm-8">
 			<div class="btn-group" role="group">
 				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'ENTERPRISE' }" ng-click="switchTab('ENTERPRISE')">企业信息</a>
-				<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')" ng-if="storeType !== 'CONSIGNMENT'">违规</a>
+				<!--<a role="presentation" class="btn btn-default" ng-class="{ 'btn-primary': tabSelected === 'VIOLATIONS' }" ng-click="switchTab('VIOLATIONS')" ng-if="storeType !== 'CONSIGNMENT'">违规</a>-->
 			</div>
 		</div>
 	</div>