|
|
@@ -453,6 +453,20 @@
|
|
|
color: #666;
|
|
|
word-break: break-all;
|
|
|
}
|
|
|
+ .oder_xq_list dl span.user-address{
|
|
|
+ width: 100% !important;
|
|
|
+ line-height: 30px;
|
|
|
+ position: relative;
|
|
|
+ top: -23px;
|
|
|
+ background: #f1f6ff;
|
|
|
+ }
|
|
|
+ .oder_xq_list dl span.user-address i{
|
|
|
+ margin-left: 0;
|
|
|
+ font-size: 14px;
|
|
|
+ }
|
|
|
+ .sure_oder .oder_xq_list dl .style01.line35{
|
|
|
+ line-height: 35px;
|
|
|
+ }
|
|
|
</style>
|
|
|
<!--右侧主体部分-->
|
|
|
<div class="user_right fr" id="pay-cart">
|
|
|
@@ -629,7 +643,7 @@
|
|
|
</span>
|
|
|
</dd>
|
|
|
<dd class="line60">
|
|
|
- <span class="style01" style="width: 60%; padding-left: 40px;">配送方式:
|
|
|
+ <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;"
|
|
|
ng-options="rule as deliveryMethod[rule.method] for rule in ruleMap[details[0].storeid]"
|
|
|
ng-change="changeFare(details)">
|
|
|
@@ -678,18 +692,30 @@
|
|
|
</li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
- <div class="self-list" ng-if="order.status!=501">
|
|
|
- <span ng-if="takeList">
|
|
|
- <strong style="margin-left: 0" ng-bind="takeList[details[0].storeid].takename"></strong>
|
|
|
- <strong>地址:<i ng-bind="takeList[details[0].storeid].area"></i> <i ng-bind="takeList[details[0].storeid].detailAddress"></i></strong>
|
|
|
- <strong>营业时间:<i ng-bind="takeList[details[0].storeid].businesstime">周一至周五 8:30-18:00</i></strong>
|
|
|
- </span>
|
|
|
- <span ng-if="!takeList && takeSelf">
|
|
|
- <strong style="margin-left: 0" ng-bind="takeSelf.takename"></strong>
|
|
|
- <strong>地址:<i ng-bind="takeSelf.area"></i> <i ng-bind="takeSelf.detailAddress"></i></strong>
|
|
|
- <strong>营业时间:<i ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</i></strong>
|
|
|
- </span>
|
|
|
- </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 && 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>
|
|
|
+ </dd>
|
|
|
+ <!--<div class="self-list" ng-if="order.status!=501">-->
|
|
|
+ <!--<span ng-if="takeList">-->
|
|
|
+ <!--<strong style="margin-left: 0" ng-bind="takeList[details[0].storeid].takename"></strong>-->
|
|
|
+ <!--<strong>地址:<i ng-bind="takeList[details[0].storeid].area"></i> <i ng-bind="takeList[details[0].storeid].detailAddress"></i></strong>-->
|
|
|
+ <!--<strong>营业时间:<i ng-bind="takeList[details[0].storeid].businesstime">周一至周五 8:30-18:00</i></strong>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--<span ng-if="!takeList && takeSelf">-->
|
|
|
+ <!--<strong style="margin-left: 0" ng-bind="takeSelf.takename"></strong>-->
|
|
|
+ <!--<strong>地址:<i ng-bind="takeSelf.area"></i> <i ng-bind="takeSelf.detailAddress"></i></strong>-->
|
|
|
+ <!--<strong>营业时间:<i ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</i></strong>-->
|
|
|
+ <!--</span>-->
|
|
|
+ <!--</div>-->
|
|
|
</div>
|
|
|
<dd class="pay_price">
|
|
|
<div>
|