卖家订单详情页显示配送规则和自提点信息

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

@@ -148,6 +148,12 @@ define(['app/app'], function(app) {
 			603: true
 		};
 
+		//配送方式列表
+		$scope.deliveryMethod = {
+			1301 : '第三方配送',
+			1302 : '卖家配送',
+			1303 : '上门自提'
+		};
 
 
 
@@ -167,6 +173,14 @@ define(['app/app'], function(app) {
 				$scope.purchase = result.data;
 				$scope.purchase.purchaseHistory = angular.fromJson($scope.purchase.statushistory);
 				$scope.purchase.currentTotal = $scope.purchase.price;
+				if ($scope.purchase.jsonRule){
+					$scope.rule = angular.fromJson($scope.purchase.jsonRule);
+				}
+				//自提点信息
+				if ($scope.purchase.jsonTakeSelf){
+					$scope.takeSelf = angular.fromJson($scope.purchase.jsonTakeSelf);
+					$scope.takeSelf.area = $scope.takeSelf.area.replace(/,/g,' ');
+				}
 				// 取消原因
 				$scope.purchase.unavailableReason = angular.fromJson($scope.purchase.unavailableReason)
 				// 设置状态样式

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

@@ -459,8 +459,8 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：第三方配送
-							<!--<i style="color: #666;">（满1000元包邮，未满足的订单收取运费20元）</i>-->
+						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
+							<i style="color: #666;font-size: 12px" ng-bind="rule.ruleName">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
 						<span class="total-price">
 								<p><strong>运费：</strong><em ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em></p>
@@ -477,10 +477,10 @@
 						<!--<span ng-show="!canShowInfo" class="wd01">系统无法提供</span>-->
 						<!--<span><em ng-bind="freight | number : 2 | currencySysmbol : purchase.currency">￥20.00</em></span>-->
 					</dd>
-					<dd class="line60">
+					<dd class="line60" ng-if="purchase.sendType == 1303">
 						<span class="user-address" style="padding-left: 40px;">
-							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;">自提点A</strong>营业时间：周一至周五 8:30-18:00</i><br/>
-							<i class="fl">地址：广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>
+							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeSelf.takename">自提点A</strong>营业时间：<i ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</i></i><br/>
+							<i class="fl">地址：<i ng-bind="takeSelf.area"></i>  <i ng-bind="takeSelf.detailAddress"></i></i>
 						</span>
 					</dd>
 					<dd class="change price">