结算页发票选择逻辑调整

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -469,6 +469,15 @@ define(['app/app'], function(app) {
 			return billSpecial;
 		};
 
+		$scope.cancelFrame = function () {
+			$scope.showBillFrame = false;
+		};
+
+		$scope.goToBillPage = function () {
+			$scope.showBillFrame = false;
+			window.open("user#/invoice");
+		};
+
 		//确认付款
 		$scope.confirmPay = function() {
 			if($scope.order.status == 502 || $scope.order.status == 503) {
@@ -499,7 +508,8 @@ define(['app/app'], function(app) {
 			}
 			var validBill = checkBill();
 			if (!validBill){
-				toaster.pop('info', '请完善专票信息');
+				// toaster.pop('info', '请完善专票信息');
+				$scope.showBillFrame = true;
 				return ;
 			}
 			var orderInfos = [], orderInfo;

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

@@ -1,4 +1,49 @@
 <style type="text/css">
+	.buyer-contact {
+		position:fixed;
+		top:50%;
+		left:50%;
+		transform:translate(-50%,-50%);
+		z-index: 2;
+		min-height: 155px;
+		opacity: 1;
+		background-color: white;
+		width: 350px;
+		border: 1px solid #E7E5E2;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+	}
+
+	.buyer-contact .contact-title {
+		height: 26px;
+		background-color: #5078cb;
+		text-align: right;
+		padding-right: 15px;
+		line-height: 26px;
+		color: white;
+	}
+
+	.buyer-contact .company-name{
+		margin:30px;
+	}
+	.buyer-contact .company-name p{
+		font-size:14px;
+		line-height: 25px;
+		padding-bottom:10px;
+	}
+	.buyer-contact .company-name p:last-child{
+		text-align: center;
+	}
+	.buyer-contact .company-name a{
+		color:#5078cb;
+	}
+	.buyer-contact .company-name i{
+		font-size:20px;
+	}
+	.buyer-contact .contact-title a,.buyer-contact .contact-title a:hover {
+		color: white !important;
+	}
+
 	.payment a {
 		text-decoration:none;
 	}
@@ -45,10 +90,16 @@
 	.payment .bill-radio span{
 		margin-right: 10px;
 	}
+	.payment .bill-radio b{
+		margin-left: 100px;
+		font-size:12px;
+		color: #5078cb;
+	}
 	.payment .bill-radio span:hover{
 		cursor: pointer;
 		color: #5078cb;
 	}
+
 	.payment .bill-radio input {
 		display: none;
 	}
@@ -577,6 +628,7 @@
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
 					<label></label><em>增值税专用发票</em>
 				</span>
+				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
 			</p>
 			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
 			</div>
@@ -620,17 +672,17 @@
 							<a class="contact_btn" title="联系卖家">联系卖家</a>
 							<!--<a class="contact_btn" title="联系卖家" ng-click="contactSeller(details[0])">联系卖家</a>-->
 							<!--<div class="contact-box" ng-if="details[0].contactSeller">-->
-								<!--<div class="title"><i class="fa fa-close fa-lg" ng-click="details[0].contactSeller = false"></i></div>-->
-								<!--<div class="content">-->
-									<!--<div class="company-title" ng-bind="order.sellername">深圳市优软科技</div>-->
-									<!--<div class="list">-->
-										<!--<em>手机：<em ng-bind="order.sellPhone || '暂无联系电话'">45413413131313</em></em>-->
-										<!--<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>-->
-									<!--</div>-->
-									<!--<div class="list">地址：-->
-										<!--<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>-->
-									<!--</div>-->
-								<!--</div>-->
+							<!--<div class="title"><i class="fa fa-close fa-lg" ng-click="details[0].contactSeller = false"></i></div>-->
+							<!--<div class="content">-->
+							<!--<div class="company-title" ng-bind="order.sellername">深圳市优软科技</div>-->
+							<!--<div class="list">-->
+							<!--<em>手机：<em ng-bind="order.sellPhone || '暂无联系电话'">45413413131313</em></em>-->
+							<!--<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>-->
+							<!--</div>-->
+							<!--<div class="list">地址：-->
+							<!--<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>-->
+							<!--</div>-->
+							<!--</div>-->
 							<!--</div>-->
 						</span>
 						</dd>
@@ -643,22 +695,22 @@
 								<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>
@@ -752,17 +804,17 @@
 						</dd>
 						<div class="self-list" ng-if="order.status==501 && deliveryList[details[0].storeid].method == 1303">
 							<!--自提点列表-->
-								<ul class="self-advice" ng-if="order.status == 501">
-									<li ng-repeat="item in takeSelfMap[details[0].storeid]">
-										<label class="check-act">
-											<input type="radio" id="{{item.id}}" name="1" ng-click="updateTakeSelf(details[0].storeid, item)"/>
-											<label for="{{item.id}}"></label>
-										</label>
-										<strong style="margin-left: 0" ng-bind="item.takename"></strong>
-										<strong>地址：<i ng-bind="item.area"></i>&nbsp;&nbsp;<i ng-bind="item.detailAddress"></i></strong>
-										<strong>营业时间：<i ng-bind="item.businesstime">周一至周五 8:30-18:00</i></strong>
-									</li>
-								</ul>
+							<ul class="self-advice" ng-if="order.status == 501">
+								<li ng-repeat="item in takeSelfMap[details[0].storeid]">
+									<label class="check-act">
+										<input type="radio" id="{{item.id}}" name="1" ng-click="updateTakeSelf(details[0].storeid, item)"/>
+										<label for="{{item.id}}"></label>
+									</label>
+									<strong style="margin-left: 0" ng-bind="item.takename"></strong>
+									<strong>地址：<i ng-bind="item.area"></i>&nbsp;&nbsp;<i ng-bind="item.detailAddress"></i></strong>
+									<strong>营业时间：<i ng-bind="item.businesstime">周一至周五 8:30-18:00</i></strong>
+								</li>
+							</ul>
 						</div>
 						<dd class="line60" ng-if="order.status!=501 && (takeList ? takeList[details[0].storeid] : takeSelf)">
 							<span class="user-address" style="padding-left: 40px;" ng-if="takeList && takeList[details[0].storeid]">
@@ -777,16 +829,16 @@
 							</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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<i ng-bind="takeSelf.detailAddress"></i></strong>-->
-								<!--<strong>营业时间：<i ng-bind="takeSelf.businesstime">周一至周五 8:30-18:00</i></strong>-->
-							<!--</span>-->
+						<!--<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>&nbsp;&nbsp;<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>&nbsp;&nbsp;<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">
@@ -830,4 +882,13 @@
 			</div>
 		</div>
 	</div>
+	<div class="buyer-contact" ng-if="showBillFrame">
+		<div class="contact-title">
+			<a ng-click="cancelFrame()"><i style="font-size: 20px" class="fa fa-close fa-lg" aria-hidden="true"></i></a>
+		</div>
+		<div class="company-name">
+			<p>您还未填写&nbsp;<a target="_blank" ng-click="goToBillPage()">增值税专票信息</a>&nbsp;，请进行完善，否则无法进行付款</p>
+			<P>前往买家&nbsp;<a target="_blank" ng-click="goToBillPage()" class="send">发票管理&nbsp;<i class="fa fa-arrow-right"></i></a></P>
+		</div>
+	</div>
 </div>