|
|
@@ -22,7 +22,7 @@
|
|
|
width: 160px;
|
|
|
}
|
|
|
#pay-cart .oder_xq_list dl span.wd01{
|
|
|
- width: 15%;
|
|
|
+ width: 14%;
|
|
|
}
|
|
|
#pay-cart .oder_xq_list dl span.wd02{
|
|
|
width: 22%;
|
|
|
@@ -30,7 +30,12 @@
|
|
|
.sure_oder .oder_xq_list dl span{
|
|
|
width: 13%;
|
|
|
}
|
|
|
-
|
|
|
+ .sure_oder .btn-wrap{
|
|
|
+ margin-left: 7px;
|
|
|
+ }
|
|
|
+ .sure_oder .oder_xq_list dl span textarea{
|
|
|
+ border: #fff 1px solid;
|
|
|
+ }
|
|
|
.payment .bill-radio {
|
|
|
font-size: 14px;
|
|
|
padding-top: 25px;
|
|
|
@@ -301,7 +306,7 @@
|
|
|
.oder_xq_list dl .price-step .dropdown-menu{
|
|
|
min-width: 330px;
|
|
|
top: 0;
|
|
|
- left: -280px;
|
|
|
+ left: -310px;
|
|
|
padding-top: 0;
|
|
|
padding-bottom: 0;
|
|
|
border-bottom: none;
|
|
|
@@ -362,6 +367,70 @@
|
|
|
.oder_xq_list dl .price-step p a,.oder_xq_list dl .price-step p a:hover{
|
|
|
color: #5078cb;
|
|
|
}
|
|
|
+
|
|
|
+ /*自提点样式*/
|
|
|
+ .self-list{
|
|
|
+ width: 100%;
|
|
|
+ margin: 0 auto;
|
|
|
+ padding: 0 0 8px 0;
|
|
|
+ border-bottom: #5078CB 1px solid;
|
|
|
+ background: #f1f6ff;
|
|
|
+ position: relative;
|
|
|
+ top: -1px;
|
|
|
+ }
|
|
|
+ .check-act input{
|
|
|
+ display: none;
|
|
|
+ }
|
|
|
+ .check-act label{
|
|
|
+ width: 12px;
|
|
|
+ height: 12px;
|
|
|
+ margin-right: 5px;
|
|
|
+ display: inline-block;
|
|
|
+ background: url(static/img/icon/check-rule.png) no-repeat;
|
|
|
+ position: relative;
|
|
|
+ top: 7px;
|
|
|
+ }
|
|
|
+ .check-act label{
|
|
|
+ background-position: 0 0;
|
|
|
+ }
|
|
|
+ .check-act input:checked + label{
|
|
|
+ background-position: -15px 0;
|
|
|
+ }
|
|
|
+ .oder_xq_list dl .self-advice{
|
|
|
+ width: 100%;
|
|
|
+ margin: 0 auto;
|
|
|
+ display: inline-block;
|
|
|
+ }
|
|
|
+ .oder_xq_list dl .self-advice li{
|
|
|
+ text-align: left;
|
|
|
+ float: left;
|
|
|
+ padding-left: 40px;
|
|
|
+ font-size: 14px;
|
|
|
+ line-height: 20px;
|
|
|
+ }
|
|
|
+ .oder_xq_list dl .self-advice li strong{
|
|
|
+ font-weight: normal;
|
|
|
+ font-size: 14px;
|
|
|
+ margin-left: 40px;
|
|
|
+ }
|
|
|
+ .oder_xq_list dl .self-advice li strong i{
|
|
|
+ font-size: 14px;
|
|
|
+ margin-left: 0;
|
|
|
+ }
|
|
|
+ .payment .adress_list ul li p{
|
|
|
+ max-height: 40px;
|
|
|
+ overflow: hidden;
|
|
|
+ margin-bottom: 5px;
|
|
|
+ margin-top: 25px;
|
|
|
+ line-height: 20px;
|
|
|
+ margin-left: 20px;
|
|
|
+ width: 88%;
|
|
|
+ }
|
|
|
+ .payment .adress_list ul li span.adderss-name {
|
|
|
+ max-height: 40px;
|
|
|
+ overflow: hidden;
|
|
|
+ margin-top: 0;
|
|
|
+ }
|
|
|
</style>
|
|
|
<!--右侧主体部分-->
|
|
|
<div class="user_right fr" id="pay-cart">
|
|
|
@@ -380,14 +449,14 @@
|
|
|
<ul id="address" class="clearfix address" ng-if="sendAddress.length != 0" ng-class="{'inital' : !expand}">
|
|
|
<li class="clearfix" ng-repeat="address in sendAddress" ng-click="selectAdd(address)" ng-class="{'active' : payment.address.id == address.id}">
|
|
|
<!--<h4 ng-bind="address.company"></h4>-->
|
|
|
- <p class="textmore" style="margin-top: 30px">{{address.area}}, {{address.detailAddress}}</p>
|
|
|
- <span>{{address.tel}} {{address.name}}（收）<a ng-if="order.status == 501" href="javascript:void(0)" ng-click="addShippingAddress(address, $index)"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 编辑</a></span>
|
|
|
+ <p class="">{{address.area}}, {{address.detailAddress}}</p>
|
|
|
+ <span class="adderss-name">{{address.tel}} {{address.name}}（收）<a ng-if="order.status == 501" href="javascript:void(0)" ng-click="addShippingAddress(address, $index)"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> 编辑</a></span>
|
|
|
<em ng-if="address.num ==1">默认地址</em>
|
|
|
</li>
|
|
|
</ul>
|
|
|
<div class="f14 notice margin-top-20 margin-bottom-10 text-center" ng-if="sendAddress.length == 0">您还没有添加收货地址信息，请先新增收货地址信息</div>
|
|
|
<div class="pay_add">
|
|
|
- <a class="add_adr fl" ng-click="addShippingAddress()" ng-if="order.status == 501 && sendAddress.length < 20"><i class="fa fa-plus-square" aria-hidden="true"></i> 新增地址</a>
|
|
|
+ <a class="add_adr fl" ng-click="addShippingAddress()" ng-if="order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i> 新增地址</a>
|
|
|
<a class="add_adr fr" ng-click="toggleAddress()" ng-if="sendAddress.length/3 > 1"><b ng-if="expand">隐藏地址</b><b ng-if="!expand">显示地址</b></a>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -441,7 +510,8 @@
|
|
|
<span class="wd01">交期(天)</span>
|
|
|
<span class="wd01">单价</span>
|
|
|
<span class="wd01">数量</span>
|
|
|
- <span style="width: 18%">小计</span>
|
|
|
+ <span style="width: 10%">小计</span>
|
|
|
+ <span>物料编码</span>
|
|
|
<span>备注</span>
|
|
|
</dt>
|
|
|
<div ng-repeat="(key, details) in $$orderDetailsMap">
|
|
|
@@ -456,29 +526,35 @@
|
|
|
</dd>
|
|
|
<dd class="oder_l" ng-repeat="detail in details">
|
|
|
<span class="wd02">
|
|
|
- <a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" href="javascript:void(0)"> <img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
|
|
|
+ <a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
|
|
|
<div class="style-type">
|
|
|
- <p title="{{detail.kiName}}"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName"></b></a></p>
|
|
|
- <p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode" title="{{detail.cmpCode}}"></b></a></p>
|
|
|
- <p><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName" style="color: #323232" title="{{detail.brName}}"></b></a></p>
|
|
|
+ <p>
|
|
|
+ <a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName" title="{{detail.kiName}}"></b></a>
|
|
|
+ </p>
|
|
|
+ <p>
|
|
|
+ <a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode" title="{{detail.cmpCode}}"></b></a>
|
|
|
+ </p>
|
|
|
+ <p>
|
|
|
+ <a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName" style="color: #323232" title="{{detail.brName}}"></b></a>
|
|
|
+ </p>
|
|
|
</div>
|
|
|
</span>
|
|
|
- <span class="wd01" ng-if="order.status == 501">
|
|
|
+ <span class="wd01" ng-if="order.status == 501">
|
|
|
交期 :
|
|
|
<i ng-if="detail.goodsHistory.b2cMinDelivery == detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery"></i>
|
|
|
<i ng-if="detail.goodsHistory.b2cMinDelivery != detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery + '-' + detail.goodsHistory.b2cMaxDelivery"></i>
|
|
|
- <!--{{detail.goodsHistory.b2cMinDelivery}}-{{detail.goodsHistory.b2cMaxDelivery}}-->
|
|
|
+ <!--{{detail.goodsHistory.b2cMinDelivery}}-{{detail.goodsHistory.b2cMaxDelivery}}-->
|
|
|
</span>
|
|
|
- <span class="wd01" ng-if="order.status != 501">
|
|
|
+ <span class="wd01" ng-if="order.status != 501">
|
|
|
交期 :
|
|
|
<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
|
|
|
<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
|
|
|
</span>
|
|
|
- <span class="wd01" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.goodsHistory.currencyName.indexOf('RMB') > -1 && order.status == 501"></span>
|
|
|
- <span class="wd01" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.goodsHistory.currencyName.indexOf('USD') > -1 && order.status == 501"></span>
|
|
|
- <span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.currencyName.indexOf('RMB') > -1 && order.status != 501"></span>
|
|
|
- <span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.currencyName.indexOf('USD') > -1 && order.status != 501"></span>
|
|
|
- <span class="wd01">
|
|
|
+ <span class="wd01" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.goodsHistory.currencyName.indexOf('RMB') > -1 && order.status == 501"></span>
|
|
|
+ <span class="wd01" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.goodsHistory.currencyName.indexOf('USD') > -1 && order.status == 501"></span>
|
|
|
+ <span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.currencyName.indexOf('RMB') > -1 && order.status != 501"></span>
|
|
|
+ <span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.currencyName.indexOf('USD') > -1 && order.status != 501"></span>
|
|
|
+ <span class="wd01">
|
|
|
<div class="btn-wrap">
|
|
|
<span class="number add-minus" ng-if="order.status == 501">
|
|
|
<a href="javascript:void(0)" class="reduce" ng-click="reduce(detail)" ng-disabled="detail.minusDisabled">-</a>
|
|
|
@@ -488,7 +564,7 @@
|
|
|
<span ng-if="order.status != 501" ng-bind="detail.number" class="number" style="border: none;"></span>
|
|
|
</div>
|
|
|
</span>
|
|
|
- <span class="price-step" style="width: 18%">
|
|
|
+ <span class="price-step" style="width: 10%">
|
|
|
<em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" class="red"></em>
|
|
|
<p>
|
|
|
<a name="{{detail.id}}" ng-click="togglePrice(detail)" ng-if="detail.goodsHistory.prices.length > 1" ng-blur="togglePriceBlur(detail)" style="font-size: 12px">价格梯度</a>
|
|
|
@@ -507,35 +583,80 @@
|
|
|
</p>
|
|
|
</span>
|
|
|
<span>
|
|
|
- <textarea ng-if="order.status==501" placeholder="可填写产品备注！例如物料编号" ng-model="detail.remark" maxlength="200"></textarea>
|
|
|
+ <textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.remark"></textarea>
|
|
|
+ <em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
|
|
|
+ </span>
|
|
|
+ <span>
|
|
|
+ <textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark"></textarea>
|
|
|
<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>
|
|
|
</span>
|
|
|
</dd>
|
|
|
<dd class="oder-remark">
|
|
|
- <span style="width: 100%">
|
|
|
- <em>订单备注：</em>
|
|
|
- <input type="text" class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
|
|
|
+ <span style="width: 100%;">
|
|
|
+ <em style="margin-left: 40px;">订单备注：</em>
|
|
|
+ <input type="text" class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
|
|
|
</span>
|
|
|
</dd>
|
|
|
<dd class="line60">
|
|
|
- <span class="style01" style="width: 60%;">配送方式：
|
|
|
+ <span class="style01" style="width: 60%; padding-left: 40px;">配送方式：
|
|
|
<select ng-if="order.status == 501" class="select" ng-switch="order.deliverytype" style="opacity: 1;" >
|
|
|
<option ng-switch-when="1301">第三方配送</option>
|
|
|
<!--<option ng-switch-when="1301">卖家配送</option>-->
|
|
|
<!--<option ng-switch-when="1301">上门自提</option>-->
|
|
|
<!--<option ng-switch-when="1302">上门自提</option>-->
|
|
|
</select>
|
|
|
- <em ng-if="order.status != 501">物流配送</em>
|
|
|
+ <em ng-if="order.status != 501" class="color333">物流配送</em>
|
|
|
<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
|
|
|
</span>
|
|
|
- <span class="total-price">
|
|
|
+ <span class="total-price">
|
|
|
<p><strong>运费：</strong><em ng-bind="0 | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em></p>
|
|
|
<p><strong>店铺合计：</strong>
|
|
|
<em ng-if="order.status==501" ng-bind="storePrice[key] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
|
|
|
<em ng-if="order.status!=501" ng-bind="order.ensurePrice | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
|
|
|
</p>
|
|
|
</span>
|
|
|
- </dd>
|
|
|
+ </dd>
|
|
|
+ <div class="self-list">
|
|
|
+ <!--自提点列表-->
|
|
|
+ <ul class="self-advice">
|
|
|
+ <li>
|
|
|
+ <label class="check-act">
|
|
|
+ <input type="radio" id="1" name="1"/>
|
|
|
+ <label for="1"></label>
|
|
|
+ </label>
|
|
|
+ <strong style="margin-left: 0">自提点A</strong>
|
|
|
+ <strong>地址：<i>广东省 深圳市 南山区 科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
|
|
|
+ <strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <label class="check-act">
|
|
|
+ <input type="radio" id="2" name="2"/>
|
|
|
+ <label for="2"></label>
|
|
|
+ </label>
|
|
|
+ <strong style="margin-left: 0">自提点A</strong>
|
|
|
+ <strong>地址：<i>广东省 深圳市 南山区 科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
|
|
|
+ <strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <label class="check-act">
|
|
|
+ <input type="radio" id="3" name="3"/>
|
|
|
+ <label for="3"></label>
|
|
|
+ </label>
|
|
|
+ <strong style="margin-left: 0">自提点A</strong>
|
|
|
+ <strong>地址：<i>广东省 深圳市 南山区 科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
|
|
|
+ <strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
|
|
|
+ </li>
|
|
|
+ <li>
|
|
|
+ <label class="check-act">
|
|
|
+ <input type="radio" id="4" name="4"/>
|
|
|
+ <label for="4"></label>
|
|
|
+ </label>
|
|
|
+ <strong style="margin-left: 0">自提点A</strong>
|
|
|
+ <strong>地址：<i>广东省 深圳市 南山区 科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></strong>
|
|
|
+ <strong>营业时间：<i>周一至周五 8:30-18:00</i></strong>
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<dd class="pay_price">
|
|
|
<div>
|
hulh