订单详情页和结算页，发票展示信息调整。

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

@@ -562,30 +562,22 @@
 					<span ng-if="order.invoicetype == 1205">增值税(专用)发票</span>
 					<span ng-if="order.invoicetype == 1206">增值税普通发票</span>
 				</p>
-				<p>
-					<b>收票人：</b>
-					<span ng-bind="order.invoiceInfo.name || '空'"></span>
-				</p>
-				<p>
-					<b>联系电话：</b>
-					<span ng-bind="order.invoiceInfo.telephone || '空'">13526395698</span>
-				</p>
 				<p>
 					<b>发票抬头：</b>
 					<span ng-bind="order.invoiceInfo.head || '空'"></span>
 				</p>
 				<p>
-					<b>发票地址：</b>
-					<span ng-bind="order.invoiceInfo.area + '，'+ order.invoiceInfo.detailAddress">广东省深圳市南山区高新南四道科苑南路英唐大厦6楼</span>
+					<b>单位地址：</b>
+					<span ng-bind="order.invoiceInfo.companyAddress || '空'"></span>
+				</p>
+				<p ng-if="order.invoicetype == 1205">
+					<b>单位电话：</b>
+					<span ng-bind="order.invoiceInfo.landlineNumber || '空'">0755-58956655</span>
 				</p>
 				<p ng-if="order.invoicetype == 1205">
 					<b>税务登记号：</b>
 					<span ng-bind="::order.invoiceInfo.companyTaxNumber || '空'">4536553333245556668</span>
 				</p>
-				<p>
-					<b>座机号码：</b>
-					<span ng-bind="order.invoiceInfo.landlineNumber || '空'">0755-58956655</span>
-				</p>
 				<p ng-if="order.invoicetype == 1205">
 					<b>开户银行：</b>
 					<span ng-bind="::order.invoiceInfo.bankName || '空'">招商银行深圳分行科技园支行</span>
@@ -594,6 +586,18 @@
 					<b>开户银行账户：</b>
 					<span ng-bind="::order.invoiceInfo.bankAccount || '空'">131362655641531321321321</span>
 				</p>
+				<p>
+					<b>收票人：</b>
+					<span ng-bind="order.invoiceInfo.name || '空'"></span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="order.invoiceInfo.telephone || '空'">13526395698</span>
+				</p>
+				<p>
+					<b>详细地址：</b>
+					<span ng-bind="order.invoiceInfo.area + '，'+ order.invoiceInfo.detailAddress">广东省深圳市南山区高新南四道科苑南路英唐大厦6楼</span>
+				</p>
 			</div>
 		</div>
 	</div>

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

@@ -637,15 +637,15 @@
 			</div>
 			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
 				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
-				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
-				<p><em>收票人电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
-				<p><em>座机：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
-				<p><em>收票人地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>公司地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
+				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>税务登记号：</em><span ng-bind="bill.companyTaxNumber || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>公司电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>开户银行：</em><span ng-bind="bill.bankName || '空'"></span></p>
 				<p ng-if="order.invoicetype == '1205'"><em>开户银行账户：</em><span ng-bind="bill.bankAccount || '空'"></span></p>
+				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
+				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
+				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
 			</div>
 		</div>
 		<!--确认订单信息-->

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -598,31 +598,22 @@
 					<span ng-if="purchase.invoicetype == 1205">增值税(专用)发票</span>
 					<span ng-if="purchase.invoicetype == 1206">增值税普通发票</span>
 				</p>
-				<p>
-					<b>收票人：</b>
-					<span ng-bind="purchase.invoiceInfo.name || '空'">张三</span>
-				</p>
-				<p>
-					<b>收票人联系电话：</b>
-					<span ng-bind="purchase.invoiceInfo.telephone  || '空'">13526395698</span>
-				</p>
 				<p>
 					<b>发票抬头：</b>
 					<span ng-bind="purchase.invoicetitle  || '空'">深圳市优软商城科技有限公司</span>
 				</p>
-				<p>
-					<b>发票地址：</b>
-					<span ng-if="purchase.invoiceInfo.area" ng-bind="purchase.invoiceInfo.area + purchase.invoiceInfo.detailAddress"></span>
-					<span ng-if="!purchase.invoiceInfo.area">空</span>
-				</p>
 				<p ng-if="purchase.invoicetype == 1205">
-					<b>税务登记号：</b>
-					<span ng-bind="purchase.invoiceInfo.companyTaxNumber || '空'"></span>
+					<b>单位地址：</b>
+					<span ng-if="purchase.invoiceInfo.companyAddress" ng-bind="purchase.invoiceInfo.companyAddress || '空'"></span>
 				</p>
 				<p ng-if="purchase.invoicetype == 1205">
-					<b>座机号码：</b>
+					<b>单位电话：</b>
 					<span ng-bind="purchase.invoiceInfo.companyPhone || '空'"></span>
 				</p>
+				<p ng-if="purchase.invoicetype == 1205">
+					<b>税务登记号：</b>
+					<span ng-bind="purchase.invoiceInfo.companyTaxNumber || '空'"></span>
+				</p>
 				<p ng-if="purchase.invoicetype == 1205">
 					<b>开户银行：</b>
 					<span ng-bind="purchase.invoiceInfo.bankName || '空'"></span>
@@ -631,6 +622,19 @@
 					<b>开户银行账户：</b>
 					<span ng-bind="purchase.invoiceInfo.bankAccount || '空'"></span>
 				</p>
+				<p>
+					<b>收票人：</b>
+					<span ng-bind="purchase.invoiceInfo.name || '空'">张三</span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="purchase.invoiceInfo.telephone  || '空'">13526395698</span>
+				</p>
+				<p>
+					<b>详细地址：</b>
+					<span ng-if="purchase.invoiceInfo.area" ng-bind="purchase.invoiceInfo.area + purchase.invoiceInfo.detailAddress"></span>
+					<span ng-if="!purchase.invoiceInfo.area">空</span>
+				</p>
 			</div>
 		</div>
 	</div>