|
|
@@ -770,7 +770,7 @@
|
|
|
</dd>
|
|
|
<dd class="line60" ng-class="{'none-border': deliveryList ? deliveryList[details[0].storeid].method==1303 : order.deliverytype=1303}">
|
|
|
<span class="style01" style="width: 60%; padding-left: 40px;" ng-class="{'line35': order.status!=501}">配送方式：
|
|
|
- <select ng-if="order.status == 501" class="select" ng-model="deliveryList[details[0].storeid]" style="opacity: 1;"
|
|
|
+ <select ng-if="order.status == 501 && ruleMap[details[0].storeid].length != 0" class="select" ng-model="deliveryList[details[0].storeid]" style="opacity: 1;"
|
|
|
ng-options="rule as deliveryMethod[rule.method] for rule in ruleMap[details[0].storeid]"
|
|
|
ng-change="changeFare(details)">
|
|
|
<!--ng-options="rule.method as deliveryMethod[rule.method] for rule in ruleMap[details[0].storeid]"-->
|
|
|
@@ -782,8 +782,8 @@
|
|
|
</em>
|
|
|
<i ng-if="order.status == 501">
|
|
|
<i style="margin-left: 0px;" ng-if="deliveryList[details[0].storeid]" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
|
|
|
- <i style="margin-left: 0px;" ng-if="!payment.address">请选择收货地址</i>
|
|
|
- <i style="margin-left: 0px;" ng-if="payment.address && ruleMap[details[0].storeid].length == 0">当前地址不支持配送，请与卖家协商处理</i>
|
|
|
+ <i style="color: #ef2324; margin-left: 0px;" ng-if="!payment.address">请选择收货地址</i>
|
|
|
+ <i style="color: #ef2324; margin-left: 0px; " ng-if="payment.address && ruleMap[details[0].storeid].length == 0">当前地址不支持配送，请与卖家协商处理</i>
|
|
|
</i>
|
|
|
<i ng-if="order.status != 501">
|
|
|
<i style="margin-left: 0px;" ng-if="deliveryList" ng-bind="deliveryList[details[0].storeid].ruleName"></i>
|
hulh