修复代码合并的代码遗漏

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

@@ -408,12 +408,6 @@ define(['app/app'], function(app) {
 			});
 		};
 
-		$scope.deliveryMethod = {
-			1301 : '第三方配送',
-			1302 : '卖家配送',
-			1303 : '上门自提'
-		};
-
 		/**
 		 * 是否失效- +
 		 */
@@ -430,6 +424,29 @@ define(['app/app'], function(app) {
 			}
 		};
 
+		//验证配送规则
+		var checkRule = function () {
+			var value = true;
+			angular.forEach($scope.ruleMap, function (v) {
+				if (v.length == 0){
+					value = false;
+				}
+			});
+			return value;
+		};
+		//验证是否选择上门自提，却没有选择自提点
+		var checkTakeSelf = function () {
+			var value = true;
+			angular.forEach($scope.deliveryList, function (v, k) {
+				if (v.method == 1303){
+					if ($scope.takeSelfList[k] == null){
+						value = false;
+					}
+				}
+			});
+			return value;
+		};
+
 		//确认付款
 		$scope.confirmPay = function() {
 			if($scope.order.status == 502 || $scope.order.status == 503) {