显示购物车结算员自提点信息

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

@@ -651,13 +651,13 @@
 									<!--<option ng-repeat="rule in ruleMap[details[0].storeid]" value="rule.method">{{deliveryMethod[rule.method]}}</option>-->
 								</select>
 								<em ng-if="order.status != 501">
-									<em class="color333" ng-if="storeArray.length == 1" ng-bind="deliveryMethod[order.deliverytype]"></em>
-									<em class="color333" ng-if="storeArray.length != 1" ng-bind="deliveryMethod[deliveryList[details[0].storeid].method]"></em>
+									<em class="color333" ng-if="!deliveryList" ng-bind="deliveryMethod[order.deliverytype]"></em>
+									<em class="color333" ng-if="deliveryList" ng-bind="deliveryMethod[deliveryList[details[0].storeid].method]"></em>
 								</em>
 								<i ng-if="order.status == 501" ng-bind="deliveryList[details[0].storeid].ruleName">满1000元包邮，未满足的订单收取运费20元</i>
 								<i ng-if="order.status != 501">
-									<i style="margin-left: 0px;" ng-if="storeArray.length != 1" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
-									<i style="margin-left: 0px;" ng-if="storeArray.length == 1" ng-bind="rule.ruleName"></i>
+									<i style="margin-left: 0px;" ng-if="deliveryList" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
+									<i style="margin-left: 0px;" ng-if="!deliveryList" ng-bind="rule.ruleName"></i>
 								</i>
 								<!--<button ng-click="getRule(order.storeid)">获取配送规则</button>-->
 							</span>
@@ -665,8 +665,8 @@
 								<p><strong>运费：</strong>
 									<em ng-if="order.status==501" ng-bind="fareList[details[0].storeid] | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
 									<em ng-if="order.status!=501" style="font-weight: bold">
-										<em ng-if="storeArray.length == 1" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
-										<em ng-if="storeArray.length != 1" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
+										<em ng-if="!deliveryList" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
+										<em ng-if="deliveryList" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
 									</em>
 								</p>
 								<p><strong>店铺合计：</strong>
@@ -693,16 +693,16 @@
 								</ul>
 						</div>
 						<dd class="line60" ng-if="order.status!=501">
-						<span class="user-address" style="padding-left: 40px;" ng-if="takeList">
-							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeList[details[0].storeid].takename">自提点A</strong>
-								营业时间：周一至周五 {{takeList[details[0].storeid].businesstime}}</i><br/>
-							<i class="fl">地址：{{takeList[details[0].storeid].area}}  {{takeList[details[0].storeid].detailAddress}}</i>
-						</span>
+							<span class="user-address" style="padding-left: 40px;" ng-if="takeList && takeList[details[0].storeid]">
+								<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeList[details[0].storeid].takename">自提点A</strong>
+								{{takeList[details[0].storeid].businesstime}}</i><br/>
+								<i class="fl">地址：{{takeList[details[0].storeid].area}}  {{takeList[details[0].storeid].detailAddress}}</i>
+							</span>
 							<span class="user-address" style="padding-left: 40px;" ng-if="!takeList && takeSelf">
-							<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeSelf.takename">自提点A</strong>
-								营业时间：周一至周五 {{takeSelf.businesstime}}</i><br/>
-							<i class="fl">地址：{{takeSelf.area}}  {{takeSelf.detailAddress}}</i>
-						</span>
+								<i class="fl"><strong style="font-weight: inherit; margin-right: 30px;" ng-bind="takeSelf.takename">自提点A</strong>
+								{{takeSelf.businesstime}}</i><br/>
+								<i class="fl">地址：{{takeSelf.area}}  {{takeSelf.detailAddress}}</i>
+							</span>
 						</dd>
 						<!--<div class="self-list" ng-if="order.status!=501">-->
 							<!--<span ng-if="takeList">-->