Browse Source

新建订单物流、点击发货、订单详情等功能修改。

ouxq 8 năm trước cách đây
mục cha
commit
52e02a8a6b

+ 101 - 58
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -17,7 +17,7 @@
 		width: 14%;
 	}
 	#oder-detail .oder_xq_list dl span.wd01{
-		width: 16%;
+		width: 13%;
 	}
 	#oder-detail .oder_xq_list dl span.wd02{
 		width: 25%;
@@ -89,7 +89,7 @@
 		padding: 5px;
 		width: 120px;
 		height: 60px;
-		border: #ccc 1px solid;
+		border: #fff 1px solid;
 		margin-top: 10px;
 	}
 	.oder_xq_list dl span a{
@@ -219,11 +219,37 @@
 		width: 60px;
 		height: 60px;
 	}
+	.logistics_list01.status{
+		margin-top: 0;
+	}
+	.color999{
+		color: #999 !important;
+	}
+	.log_menu span{
+		width: 97%;
+	}
+	.text-area{
+		width: 120px;
+		height: 60px;
+		background: #fff;
+		margin-top: 15px;
+		overflow-y: auto;
+		text-align: left;
+		padding: 0 3px;
+		margin-left: 5px;
+	}
+	.text-area i{
+		text-align: left;
+		position: relative;
+		top: 4px;
+		font-size: 12px;
+		color: #666;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
 	<div class="oder_detail" id="oder-detail">
-		<div class="logistics">
+		<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<ul>
 				<li ng-class="{ 'active' : (steps.step2 || steps.step3 || steps.step4 || steps.step5) }">
 					<p>拍下产品</p>
@@ -253,32 +279,41 @@
 			</ul>
 		</div>
 		<!--<div class="logistics_list01">-->
-			<!--<div class="log_menu">-->
-				<!--<span>收发货地址</span>-->
-			<!--</div>-->
-			<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
-			<!--<div class="com_log_list">-->
-				<!--<ul>-->
-					<!--<li class="log_line">收货人信息:</li>-->
-					<!--<li>-->
-						<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress" title="{{::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress}}" class="text-more"></p>-->
-						<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
-						<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
-					<!--</li>-->
-					<!--<li class="log_line" ng-if="order.sendAddress">发货人信息:</li>-->
-					<!--<li ng-if="order.sendAddress">-->
-						<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + ',' + order.sendAddress.detailAddress" title="{{::order.sendAddress.area + ',' + order.sendAddress.detailAddress}}" class="text-more"></p>-->
-						<!--<p ng-if="!order.sendAddress.area">空</p>-->
-						<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
-					<!--</li>-->
-				<!--</ul>-->
-			<!--</div>-->
+		<!--<div class="log_menu">-->
+		<!--<span>收发货地址</span>-->
+		<!--</div>-->
+		<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
+		<!--<div class="com_log_list">-->
+		<!--<ul>-->
+		<!--<li class="log_line">收货人信息:</li>-->
+		<!--<li>-->
+		<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress" title="{{::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress}}" class="text-more"></p>-->
+		<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
+		<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--<li class="log_line" ng-if="order.sendAddress">发货人信息:</li>-->
+		<!--<li ng-if="order.sendAddress">-->
+		<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + ',' + order.sendAddress.detailAddress" title="{{::order.sendAddress.area + ',' + order.sendAddress.detailAddress}}" class="text-more"></p>-->
+		<!--<p ng-if="!order.sendAddress.area">空</p>-->
+		<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--</ul>-->
+		<!--</div>-->
 		<!--</div>-->
 		<!--订单信息-->
-		<div class="logistics_list01">
-			<div class="log_menu"><span>订单信息<b>订单号:{{order.orderid}}<em><font style="color: #333">订单状态:</font>{{order.status | orderStatus}}</em></b></span></div>
+		<div class="logistics_list01" ng-class="{'status': order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315}">
+			<div class="log_menu">
+				<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">订单信息<b>订单号:{{order.orderid}}<em><font style="color: #333;">订单状态:</font>{{order.status | orderStatus}}</em></b></span>
+				<span ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
+					<i class="f14">订单号:{{order.orderid}}</i>
+					<b>
+						<em style="margin-right: 0;"><font class="color999">取消原因:</font>{{order.unavailableReason.reason}}</em>
+						<em><font class="color999">订单状态:</font>{{order.status | orderStatus}}</em>
+					</b>
+				</span>
+			</div>
 			<div class="oder_xq clearfix" ng-if="address" style="background: #f8f8f8">
 				<p>
 					<b>收货人:</b>
@@ -301,6 +336,7 @@
 						<span class="wd01">单价</span>
 						<span style="width: 10%;">数量</span>
 						<span class="wd01">小计</span>
+						<span class="wd01">物料编码</span>
 						<span class="wd01">备注</span>
 					</dt>
 					<dd class="order-company">
@@ -330,20 +366,27 @@
 								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
                         </span>
-						<span class="wd01">交期:
+							<span class="wd01">交期:
 							<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 							<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
 						</span>
-						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName">$1.23</span>
-						<span style="width: 10%;" ng-bind="detail.number">100</span>
-						<span class="wd01 red" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-						<span class="wd01" style="line-height: 20px;">
+							<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : detail.currencyName">$1.23</span>
+							<span style="width: 10%;" ng-bind="detail.number">100</span>
+							<span class="wd01 red" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+							<!--物料编码-->
+							<span class="wd01" style="line-height: 18px;">
 							<!--<textarea placeholder="可填写产品备注!例如物料编号"></textarea>-->
-							<div style="width: 133px; height: 74px; background: #fff; margin-top: 7px; overflow-y: auto;" ng-if="detail.remark">
-								<i style="line-height: 20px; text-align: left; position: relative; top: 4px;" ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							<div class="text-area">
+								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
 							</div>
 						</span>
-					</dd>
+							<span class="wd01" style="line-height: 18px;">
+							<!--<textarea placeholder="可填写产品备注!例如物料编号"></textarea>-->
+							<div class="text-area" ng-if="detail.remark">
+								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+						</dd>
 					</div>
 					<div class="open-more row" ng-class="{'none': order.orderDetails.length < 3}">
 						<a href="javascript:void(0)" ng-click="open=!open" ng-class="{'active': open}">
@@ -376,7 +419,7 @@
 						<!--物流的价格先隐藏-->
 					</dd>
 					<!--<dd class="price">-->
-						<!--<span style="width: 100%;">总计:<i  ng-bind="order.price | formateNumber : 2 | currencySysmbol : order.currency">¥820.00</i></span>-->
+					<!--<span style="width: 100%;">总计:<i  ng-bind="order.price | formateNumber : 2 | currencySysmbol : order.currency">¥820.00</i></span>-->
 					<!--</dd>-->
 				</dl>
 			</div>
@@ -401,28 +444,28 @@
 			</div>
 		</div>
 		<!--<div class="logistics_list01">-->
-			<!--<div class="log_menu">-->
-				<!--<span>收发货地址</span>-->
-			<!--</div>-->
-			<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
-			<!--<div class="com_log_list">-->
-				<!--<ul>-->
-					<!--<li class="log_line">收货人信息:</li>-->
-					<!--<li>-->
-						<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress"></p>-->
-						<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
-						<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
-					<!--</li>-->
-					<!--<li class="log_line" ng-if="order.sendAddress">发货人信息:</li>-->
-					<!--<li ng-if="order.sendAddress">-->
-						<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
-						<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + ',' + order.sendAddress.detailAddress"></p>-->
-						<!--<p ng-if="!order.sendAddress.area">空</p>-->
-						<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
-					<!--</li>-->
-				<!--</ul>-->
-			<!--</div>-->
+		<!--<div class="log_menu">-->
+		<!--<span>收发货地址</span>-->
+		<!--</div>-->
+		<!--&lt;!&ndash;订单物流信息&ndash;&gt;-->
+		<!--<div class="com_log_list">-->
+		<!--<ul>-->
+		<!--<li class="log_line">收货人信息:</li>-->
+		<!--<li>-->
+		<!--<h4 ng-bind="::order.deliveryAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.deliveryAddress.area" ng-bind="::order.deliveryAddress.area + ',' + order.deliveryAddress.detailAddress"></p>-->
+		<!--<p ng-if="!order.deliveryAddress.area">空</p>-->
+		<!--<span>{{order.deliveryAddress.tel || '空'}}&nbsp;&nbsp;{{order.deliveryAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--<li class="log_line" ng-if="order.sendAddress">发货人信息:</li>-->
+		<!--<li ng-if="order.sendAddress">-->
+		<!--<h4 ng-bind="order.sendAddress.company">华商龙商务科技有限公司</h4>-->
+		<!--<p ng-if="order.sendAddress.area" ng-bind="::order.sendAddress.area + ',' + order.sendAddress.detailAddress"></p>-->
+		<!--<p ng-if="!order.sendAddress.area">空</p>-->
+		<!--<span>{{order.sendAddress.tel || '空'}}&nbsp;&nbsp;{{order.sendAddress.name || '空'}}</span>-->
+		<!--</li>-->
+		<!--</ul>-->
+		<!--</div>-->
 		<!--</div>-->
 		<!--发票信息-->
 		<div class="logistics_list01">

+ 107 - 25
src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -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;
@@ -438,10 +443,11 @@
 				<dl class="clearfix">
 					<dt style="background: #f6f9ff;">
 						<span class="wd02">产品信息</span>
-						<span class="wd01">交期(天)</span>ss
+						<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 +462,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 +500,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 +519,105 @@
 								</p>
 							</span>
 							<span>
-                            	<textarea ng-if="order.status==501" placeholder="可填写产品备注!例如物料编号" ng-model="detail.remark"></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>
+							<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="1301">卖家配送</option>-->
+									<!--<option ng-switch-when="1301">上门自提</option>-->
 									<!--<option ng-switch-when="1302">上门自提</option>-->
 								</select>
 								<em ng-if="order.status != 501">物流配送</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>
+							<!--自提点列表-->
+							<span style="width: 100%">
+								<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>
+								</ul>
+							</span>
+							<style>
+								.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%;
+									background: #f1f6ff;
+									margin: 0 auto;
+									display: inline-block;
+									border-bottom: #5078CB 1px solid;
+								}
+								.oder_xq_list dl .self-advice li{
+									text-align: left;
+									float: left;
+									padding-left: 40px;
+									font-size: 14px;
+									line-height: 25px;
+								}
+								.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;
+								}
+							</style>
+						</dd>
 					</div>
 					<dd class="pay_price">
 						<div>

+ 541 - 49
src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -29,13 +29,26 @@
     }
     .pay_price div{
         border: none;
-        margin-top: -15px;
+        margin-top: -20px;
         height: 60px;
+        width: auto;
+        padding: 0;
+        margin-right: 0;
+        margin-bottom: 30px;
     }
     .pay_price a{
         width: 70px;
-        height: 32px;
+        height: 28px;
         font-size: 14px;
+        line-height: 28px;
+        margin-right: 10px;
+    }
+    .pay_price a:first-child{
+        margin-right: 0;
+    }
+    .pay_price a.add{
+        width: 90px;
+        background: #fc5902;
     }
     .pay_price a.cancel{
         background: #b4b5b9;
@@ -57,7 +70,7 @@
         border-radius: 3px;
     }
     .sell_oder .sure_oder .oder_xq_list dl span .dropdown-menu{
-        top: 49%;
+        top: 95%;
         line-height: 23px;
         max-height: 240px;
         overflow-y: auto;
@@ -113,10 +126,324 @@
         background: #9b9b9b;
         cursor: pointer;
     }
+    /*修改部分*/
+    .logistics_list_xq dl dd:last-child em{
+        background: #5078cb;
+    }
+    #oder-detail .oder_xq_list dl .oder_l p{
+        font-size: 14px;
+        text-align: left;
+        width: 100%;
+        position: relative;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: normal;
+        overflow: hidden;
+    }
+    #oder-detail .oder_xq_list dl span{
+        width: 14%;
+    }
+    #oder-detail .oder_xq_list dl span.wd01{
+        width: 13%;
+    }
+    #oder-detail .oder_xq_list dl span.wd02{
+        width: 25%;
+    }
+    #oder-detail .oder_xq_list dl .oder_l p.style01{
+        width: 160px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        word-break: normal;
+        overflow: hidden;
+    }
+    #oder-detail .oder_xq_list dl .oder_l img{
+        margin-left: 20px;
+    }
+    #oder-detail .oder_xq_list dl .change-price span{
+        width: 74px;
+        height: 30px;
+        display: inline-block;
+        text-align: center;
+        background: #5078cb;
+        line-height: 30px;
+        color: #fff;
+        font-size: 14px;
+        margin-right: 5px;
+        float: right;
+    }
+    #oder-detail .oder_xq_list dl .change-price span:hover{
+        cursor: pointer;
+    }
+    .oder_xq_list dl .change{
+        height: 70px;
+    }
+    .oder_xq_list dl .change span{
+        height: 40px;
+        line-height: 40px;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl .change .change-price{
+        width: 100% !important;
+        margin-top: 0;
+        padding-right: 30px;
+    }
+    #oder-detail .oder_xq_list dl .change-price span:hover{
+        background: #3f7ae3;
+        color: #fff !important;
+    }
+    #oder-detail .oder_xq_list dl .change-price span.off{
+        background: #fa5a02;
+    }
+    .oder_xq_list dl .price span i {
+        margin-right: 35px;
+        font-weight: bold;
+    }
+    .no-record{
+        height: 60px;
+        text-align: center;
+        line-height: 60px;
+        background: #fff;
+        font-size: 14px;
+    }
+    .logistics_list01 .oder_xq p{
+        display: inline-block;
+        margin-left: 10px;
+    }
+    .red{
+        color: #f00;
+    }
+    #oder-detail .oder_xq_list dl dd.line60 span{
+        width: 20%;
+    }
+    #oder-detail .oder_xq_list dl dd.line60 span.wd001{
+        width: 35%;
+        margin-left: 25px;
+    }
+    /*订单详情修改*/
+    .logistics_list01{
+        background: #fff;
+    }
+    .oder_xq_list dl dt{
+        border: #f1f6ff 1px solid;
+        height: 40px;
+        border-bottom: #769be9 2px solid !important;
+        background: #f6f9ff;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl .oder_l {
+        background: #f6f9ff;
+        border-bottom: #fff 1px solid;
+    }
+    .oder_xq_list dl dd{
+        border-bottom: none;
+    }
+    .oder_xq_list dl dd.order-company{
+        height: 50px;
+        line-height: 50px;
+        border-bottom: #f1f6ff 1px solid;
+    }
+    .oder_xq_list dl .oder_l span.wd02{
+        margin-top: 0;
+    }
+    .oder_xq_list dl .oder_l span.wd02 a img{
+        margin-top: 15px;
+    }
+    .oder_xq_list dl .oder_l span textarea {
+        padding: 5px;
+        width: 120px;
+        height: 60px;
+        border: #ccc 1px solid;
+        margin-top: 10px;
+    }
+    .oder_xq_list dl span a{
+        color: #333;
+    }
+    .oder-remark,.oder_xq_list dl .line60{
+        background: #f1f6ff;
+    }
+    .oder_xq_list dl .line60{
+        height: 50px;
+        border-bottom: #5078cb 1px solid;
+    }
+    .oder-remark .form-control {
+        width: 546px;
+        height: 30px;
+        border-radius: 2px;
+        float: left;
+        margin-top: 5px;
+        margin-left: 4px;
+    }
+    .oder-remark span em {
+        float: left;
+        color: #333 !important;
+        margin-left: 20px;
+    }
+    .oder_xq_list dl span.total-price{
+        float: right;
+        width: auto !important;
+        position: relative;
+        bottom: 10px;
+        margin-right: 20px;
+    }
+    .oder_xq_list dl span.total-price p{
+        line-height: 25px;
+        font-size: 14px;
+        text-align: right;
+        font-weight: bold;
+        display: flex;
+    }
+    .oder_xq_list dl span.total-price p:first-child em{
+        color: #333;
+    }
+    .oder_xq_list dl span.total-price p:last-child{
+        color: #e64040;
+    }
+    .oder_xq_list dl span.total-price p em{
+        color: #e64040;
+    }
+    .oder_xq_list dl span.total-price strong {
+        width: 70px;
+        display: inline-block;
+        float: left;
+    }
+    .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:nth-of-type(1){
+        margin-left: 20px;
+    }
+    .oder_xq_list dl span.user-address i:nth-of-type(2){
+        margin-left: 70px;
+    }
+    .open-more{
+        text-align: center;
+        background: #f6f9ff;
+        height: 2px;
+    }
+    .oder-remark.length3{
+        border-top: #a5d6f7 1px dashed
+    }
+    .open-more a{
+        font-size: 12px;
+        width: 200px;
+        height: 15px;
+        display: inline-block;
+        border: #5e9fcb 1px dashed;
+        border-top: 0;
+        font-weight: inherit;
+        background: #f6f9ff;
+        border-bottom-left-radius: 50px;
+        border-bottom-right-radius: 50px;
+        line-height: 15px;
+        text-decoration: none;
+        position: relative;
+        top: 0;
+    }
+    .open-more a i{
+        margin-right: 5px;
+        font-size: 20px;
+        vertical-align: middle;
+        position: relative;
+        top: -5px;
+        color: #ff8423;
+    }
+    .open-more a.active{
+        border-top-left-radius: 50px;
+        border-top-right-radius: 50px;
+        position: relative;
+        top: -12px;
+        border-bottom: none;
+        border-top: #5e9fcb 1px dashed;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        background: #f1f6ff;
+    }
+    .open-more a.active em{
+        top: 3px;
+    }
+    .open-more a.active i{
+        top: 0;
+    }
+    .open-more a em{
+        position: relative;
+        top: -4px;
+        color: #ff8423;
+    }
+    .open-more a:hover em,.open-more a:hover i{
+        color: #5078cb;
+        text-decoration: none;
+    }
+    .limit-3{
+        width: 100%;
+        margin: 0 auto;
+        max-height: 270px;
+        overflow: hidden;
+    }
+    .open-more.none{
+        display: none;
+    }
+    .logistics_list01 .oder_xq p b{
+        color: #959595;
+    }
+    .logistics_list01 .oder_xq{
+        width: 97%;
+    }
+    .oder_xq_list dl .price-style em{
+        width: 18px;
+        height: 28px;
+        background: #5078cb;
+        text-align: center;
+        line-height: 28px;
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+        color: #fff;
+        display: inline-block;
+    }
+    .oder_xq_list dl .price-style input{
+        width: 100px;
+        border: #5078cb 1px solid;
+        font-size: 14px;
+        position: relative;
+        height: 28px;
+        left: -6px;
+        top: -1px;
+        text-align: center;
+    }
+    .oder_xq_list dl .oder_l img{
+        width: 60px;
+        height: 60px;
+    }
+    .color999{
+        color: #999 !important;
+    }
+    .log_menu span{
+        margin-left: 11px;
+    }
+    .text-area{
+        width: 120px;
+        height: 60px;
+        background: #fff;
+        margin-top: 15px;
+        overflow-y: auto;
+        text-align: left;
+        padding: 0 3px;
+        margin-left: 5px;
+    }
+    .text-area i{
+        text-align: left;
+        position: relative;
+        top: 4px;
+        font-size: 12px;
+        color: #666;
+    }
 </style>
 <div class="user_right fr">
     <!--订单发货-->
-    <div class="sell_oder payment">
+    <div class="sell_oder payment" id="oder-detail">
         <!--确认订单信息-->
         <div class="sure_oder">
             <div class="log_menu">
@@ -153,69 +480,234 @@
                     </li>
                 </ul>
             </div>
+            <!--订单列表-->
             <div class="oder_xq_list">
                 <dl class="clearfix">
                     <dt>
-                        <span class="wid01">产品型号</span>
-                        <span class="wid01">属性</span>
-                        <span>数量</span>
-                        <span>单价/币种</span>
-                        <span>小计</span>
-                        <span>备注</span>
+                        <span class="wd02">产品信息</span>
+                        <span class="wd01">交期(天)</span>
+                        <span class="wd01">单价</span>
+                        <span style="width: 10%;">数量</span>
+                        <span class="wd01">小计</span>
+                        <span class="wd01">物料编码</span>
+                        <span class="wd01">备注</span>
                     </dt>
-                    <dd>
-                        <span style="width: 100%; text-align: left;">买家:<em class="de_color" ng-bind="checkinvoice.buyerentername">HKJKLJKL</em></span>
+                    <!--<dd>-->
+                    <!--<span style="width: 100%; text-align: left; padding-left: 20px;" class="ng-binding"><img src="static/img/user/images/shop_home01.png">{{purchase.buyentername}}</span>-->
+                    <!--</dd>-->
+                    <dd class="order-company">
+						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
+							<i style="min-width: 315px; display: inline-block">
+								&nbsp;&nbsp;{{checkinvoice.buyerentername}} <!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
+							</i>
+							<img src="static/img/common/songguo.png" style="margin-right:0; ">
+                            <!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
+							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
+						</span>
+                    </dd>
+                    <div ng-class="{'limit-3': !open}">
+                        <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
+						<span class="wd02">
+							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/user/images/pro02.jpg'}}"/></a>
+							<p class="style01" style="margin-top: 10px;">类目:
+								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
+							</p>
+							<p class="style01">型号:
+								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
+							</p>
+							<p class="style01">品牌:
+								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
+							</p>
+						</span>
+                            <span class="wd01">交期:
+                                1-5
+							<!--<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>-->
+							<!--<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>-->
+						</span>
+                            <span class="wd01">
+							<em  ng-show="!isChange" ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="color: #333;"></em>
+							<em ng-show="isChange" class="price-style">
+								<em  ng-bind="'' | currencySysmbol : detail.currencyName"></em>
+								<input ng-model="detail.currentTaxUnitPrice" type="number" ng-change="updateTotal()"/>
+							</em>
+						</span>
+                            <span style="width: 10%;" ng-bind="detail.number">100</span>
+                            <span ng-show="!isChange" class="wd01 red" ng-bind="detail.taxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+                            <span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
+                            <!--物料编码-->
+                            <span class="wd01" style="line-height: 18px;">
+						<!--<textarea placeholder="可填写产品备注!例如物料编号"></textarea>-->
+							<div class="text-area">
+								<i>金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+                            <span class="wd01" style="line-height: 18px;">
+							<!--<textarea placeholder="可填写产品备注!例如物料编号"></textarea>-->
+							<div class="text-area" ng-if="detail.remark">
+								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+							</div>
+						</span>
+                        </dd>
+                    </div>
+                    <div class="open-more row" ng-class="{'none': purchase.purchaseDetails.length < 3}">
+                        <a href="javascript:void(0)" ng-click="$open=!open" ng-class="{'active': open}">
+                            <em ng-bind="open ? '收起' : '查看所有产品'"></em>
+                            <i class="fa fa-angle-up" ng-if="open"></i>
+                            <i class="fa fa-angle-down" ng-if="!open"></i>
+                        </a>
+                    </div>
+                    <dd class="oder-remark" ng-class="{'length3': purchase.purchaseDetails.length > 3}">
+						<span style="width: 100%;">
+							<em>订单备注:</em>
+							<i class="fl" ng-bind="purchase.purchaseRemark || '无'">用便宜的物流最好!</i>
+                            <!--<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>-->
+						</span>
                     </dd>
-                    <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
-                            <span class="wid01">
-                                <a href="javascript:void(0)"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>
-                                <p ng-bind="detail.cmpCode"></p>
-                            </span>
-                        <span  class="wid01" ng-bind="detail.kiName"></span>
-                        <span ng-bind="detail.number | number"></span>
-                        <span ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
-                        <span><em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></em></span>
-                        <!--<span><font class="gray">无</font></span>-->
+                    <dd class="line60" style="border-bottom: none;">
+						<span class="wd02" style="width: 60%;text-align: left; margin-left: 20px;line-height: 30px; max-height: min-content;">配送方式:第三方配送
+                            <!--<i style="color: #666;">(满1000元包邮,未满足的订单收取运费20元)</i>-->
+						</span>
+                        <span class="total-price">
+								<p><strong>运费:</strong><em ng-bind="0 | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em></p>
+								<p><strong>店铺合计:</strong>
+									<!--<em ng-if="!isChange" ng-bind="purchase.price | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>-->
+									<!--<em ng-if="isChange" ng-bind="purchase.currentTotal | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>-->
+                                    <em ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName" style="font-weight: bold"></em>
+								</p>
+						</span>
+                        <!--<span class="user-address">-->
+                        <!--<i class="fl"><strong style="font-weight: inherit">自提点:</strong>营业时间:周一至周五 8:30-18:00</i><br/>-->
+                        <!--<i class="fl">地址:广东省  深圳市  南山区  科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i>-->
+                        <!--&lt;!&ndash;<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>&ndash;&gt;-->
+                        <!--</span>-->
+                        <!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd02">物流:{{logistics.companyName || '空'}}</span>-->
+                        <!--<span ng-if="!noLogisticInfoArray[purchase.status]" class="wd01">物流单号:{{logistics.number || '空'}}</span>-->
+                        <!--<span ng-show="!canShowInfo && !noLogisticInfoArray[purchase.status]" class="wd01 wd001"><em style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息,请根据物流单号到相应的官网查询。</em></span>-->
+                        <!--<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">
-                        <span style="width: 165px; text-align: left;padding-left: 10px;">配送方式:<b>物流配送</b></span>
-                        <span style="width: 5%;"> 物流 :&nbsp;</span>
-                        <span style="width: 170px;top: 50%;margin-top: -15px; margin-right: 55px;">
-                             <!--<input type="text" style="vertical-align: middle;width:170px; margin-top: -2px;" class="form-control" ng-model="logistics.companyName" placeholder="请输入物流公司" autocomplete="off" typeahead="log.companyName as log.companyName for log in logisticsInfo | filter:$viewValue | limitTo : 10" typeahead-on-select="onAssociateKindClick($item)" typeahead-min-length="0" />-->
-                            <input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off" style="vertical-align: middle;width:170px; margin-top: -2px;" maxlength="15">
+                    <style>
+                        #oder-detail .line60.logistic-input{
+                            position: relative;
+                            top: -15px;
+                            height: 80px;
+                        }
+                        #oder-detail .line60.logistic-input span{
+                            height: 30px;
+                            line-height: 30px;
+                            float: left;
+                            margin-top: 10px;
+                        }
+                        #oder-detail .line60.logistic-input span .form-control{
+                            border-radius: 2px;
+                            border: #ccc 1px solid;
+                        }
+                        #oder-detail .line60.logistic-input span.input-ul{
+                            width: 170px;
+                            margin-right: 55px;
+                            float: left
+                        }
+                        #oder-detail .line60.logistic-input span.input-ul input{
+                            vertical-align: middle;
+                            width:170px;
+                            margin-top: -1px;
+                            height: 32px;
+                        }
+                        #oder-detail .line60.logistic-input span.input-ul em{
+                        }
+                    </style>
+                    <dd class="line60 logistic-input">
+                        <span style="width: 10%;"> 物流公司 :&nbsp;</span>
+                        <span class="input-ul">
+                            <input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off"  maxlength="15">
                             <em name="companyName" ng-click="changeShowLogistics()" class="btn-position"><i class="fa fa-caret-down" aria-hidden="true"></i></em>
                             <ul id="ulContent" ng-if="showCompanyName && matchData" class="dropdown-menu">
-                                <li ng-click="showText(companyName)" ng-repeat="companyName in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="companyName"></li>
+                            <li ng-click="showText(companyName)" ng-repeat="companyName in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="companyName"></li>
                             </ul>
                         </span>
-
-                        <span style="margin-right: 20px; width: 160px;">
+                        <span  style="width: 10%;"> 物流单号 :&nbsp;</span>
+                        <span style="margin-right: 20px; width: 160px; float: left;">
                             <form name="myForm">
-                                <input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>
-                                <!--<span ng-show="myForm.number.$invalid && myForm.number.$dirty">请输入正确的</span>-->
+                            <input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>
                             </form>
-                            <!--<input type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/"/>-->
                         </span>
-                        <em ng-if="showTip" style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息,请根据物流单号到相应的官网查询。</em>
-                        <!--<span style="width: 22%"><em>¥20.00</em></span>-->
-                    </dd>
-                    <dd class="price">
-                        <span style="width: 90%;">总计:<i ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName"></i></span>
+                        <em ng-if="showTip" style="color: #b0b0b0;
+                            font-size: 12px;
+                            float: left;
+                            line-height: 33px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息,请根据物流单号到相应的官网查询。</em>
                     </dd>
                     <dd class="pay_price">
-                        <p>
-                            <div ng-if="checkinvoice.status==406">
-                                <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认</a>
-                                <a href="vendor#/order/center" class="cancel">取消</a>
-                            </div>
-                            <div ng-if="checkinvoice.status==404">
-                                <a href="javascript:void(0)" ng-click="upateLogistic(checkinvoice)" class="confirm">确认</a>
-                                <a href="vendor#/order/center" class="cancel">取消</a>
-                            </div>
-                        </p>
+                        <div ng-if="checkinvoice.status==406">
+                            <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认发货</a>
+                            <a href="vendor#/order/center" class="cancel">取消</a>
+                            <a href="" class="add">新增供应商</a>
+                        </div>
                     </dd>
                 </dl>
             </div>
+            <!--<div class="oder_xq_list">-->
+                <!--<dl class="clearfix">-->
+                    <!--<dt>-->
+                        <!--<span class="wid01">产品型号</span>-->
+                        <!--<span class="wid01">属性</span>-->
+                        <!--<span>数量</span>-->
+                        <!--<span>单价/币种</span>-->
+                        <!--<span>小计</span>-->
+                        <!--<span>备注</span>-->
+                    <!--</dt>-->
+                    <!--<dd>-->
+                        <!--<span style="width: 100%; text-align: left;">买家:<em class="de_color" ng-bind="checkinvoice.buyerentername">HKJKLJKL</em></span>-->
+                    <!--</dd>-->
+                    <!--<dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">-->
+                            <!--<span class="wid01">-->
+                                <!--<a href="store/{{::detail.storeid}}/{{::detail.batchCode}}"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>-->
+                                <!--<p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" ng-bind="detail.cmpCode" title="{{detail.cmpCode}}" class="text-more" style="width: 160px;margin-top: 3px;"></a></p>-->
+                            <!--</span>-->
+                        <!--<span  class="wid01" ng-bind="detail.kiName"></span>-->
+                        <!--<span ng-bind="detail.number | number"></span>-->
+                        <!--<span ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>-->
+                        <!--<span><em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></em></span>-->
+                        <!--&lt;!&ndash;<span><font class="gray">无</font></span>&ndash;&gt;-->
+                    <!--</dd>-->
+                    <!--<dd class="line60">-->
+                        <!--<span style="width: 165px; text-align: left;padding-left: 10px;">配送方式:<b>物流配送</b></span>-->
+                        <!--<span style="width: 5%;"> 物流 :&nbsp;</span>-->
+                        <!--<span style="width: 170px;top: 50%;margin-top: -15px; margin-right: 55px;">-->
+                             <!--&lt;!&ndash;<input type="text" style="vertical-align: middle;width:170px; margin-top: -2px;" class="form-control" ng-model="logistics.companyName" placeholder="请输入物流公司" autocomplete="off" typeahead="log.companyName as log.companyName for log in logisticsInfo | filter:$viewValue | limitTo : 10" typeahead-on-select="onAssociateKindClick($item)" typeahead-min-length="0" />&ndash;&gt;-->
+                            <!--<input id="addr" type="text" class="form-control" ng-change="textChange()" ng-blur="onBlur()" ng-focus="getFocus()" ng-keydown="onKeyup()" ng-model="logistics.companyName"  placeholder="请输入物流公司" autocomplete="off" style="vertical-align: middle;width:170px; margin-top: -2px;" maxlength="15">-->
+                            <!--<em name="companyName" ng-click="changeShowLogistics()" class="btn-position"><i class="fa fa-caret-down" aria-hidden="true"></i></em>-->
+                            <!--<ul id="ulContent" ng-if="showCompanyName && matchData" class="dropdown-menu">-->
+                                <!--<li ng-click="showText(companyName)" ng-repeat="companyName in resultList" ng-class="{'active': $index==selectIndex}" ng-bind="companyName"></li>-->
+                            <!--</ul>-->
+                        <!--</span>-->
+
+                        <!--<span style="margin-right: 20px; width: 160px;">-->
+                            <!--<form name="myForm">-->
+                                <!--<input name="number" type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/" maxlength="20"/>-->
+                                <!--&lt;!&ndash;<span ng-show="myForm.number.$invalid && myForm.number.$dirty">请输入正确的</span>&ndash;&gt;-->
+                            <!--</form>-->
+                            <!--&lt;!&ndash;<input type="text" class="form-control" ng-model="logistics.number" placeholder="请输入物流单号" style="margin-top: 13px;" ng-pattern="/^[A-Za-z0-9]+$/"/>&ndash;&gt;-->
+                        <!--</span>-->
+                        <!--<em ng-if="showTip" style="color: #b0b0b0; font-size: 12px;"><i class="fa fa-info-circle"></i>系统无法提供此物流信息,请根据物流单号到相应的官网查询。</em>-->
+                        <!--&lt;!&ndash;<span style="width: 22%"><em>¥20.00</em></span>&ndash;&gt;-->
+                    <!--</dd>-->
+                    <!--<dd class="price">-->
+                        <!--<span style="width: 90%;">总计:<i ng-bind="checkinvoice.ensurePrice  | formateNumber : 2 | currencySysmbol : checkinvoice.currencyName"></i></span>-->
+                    <!--</dd>-->
+                    <!--<dd class="pay_price">-->
+                        <!--<p>-->
+                            <!--<div ng-if="checkinvoice.status==406">-->
+                                <!--<a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认</a>-->
+                                <!--<a href="vendor#/order/center" class="cancel">取消</a>-->
+                            <!--</div>-->
+                            <!--<div ng-if="checkinvoice.status==404">-->
+                                <!--<a href="javascript:void(0)" ng-click="upateLogistic(checkinvoice)" class="confirm">确认</a>-->
+                                <!--<a href="vendor#/order/center" class="cancel">取消</a>-->
+                            <!--</div>-->
+                        <!--</p>-->
+                    <!--</dd>-->
+                <!--</dl>-->
+            <!--</div>-->
         </div>
     </div>
 </div>