1、修改买卖家发票显示问题

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

@@ -61,6 +61,7 @@ define([ 'app/app' ], function(app) {
                     param.keyword = $scope.keyword;
                     Order.getOrderOnBillByPersonal(param, function (page) {
                         $scope.isAllCheck = false;
+                        $scope.orderData = []
                         $scope.$$kdnData.totalElements = page.totalElements;
                         if(Number(page.totalElements) > 0) {
                             $scope.$$kdnData.start = Number(page.size) * (Number(page.number) - 1) + 1;

src/main/webapp/resources/view/sso/ssoInvoice.html

@@ -496,10 +496,10 @@
     display: block
   }
   .count_basic{
-    background: #ecf2fd;
+
     width: 100%;
     margin: 0 auto;
-    height: 40px;
+    /*height: 40px;*/
     line-height: 40px;
     border-bottom: #e8e8e8 1px solid;
   }
@@ -509,7 +509,7 @@
   <!--开票记录-->
   <div class="ticket_record oder">
     <div class="count_basic">
-      <p class="basic_title"><span>发票信息</span>
+      <p class="basic_title" style="background: #ecf2fd;height: 40px;line-height:40px;"><span>发票信息</span>
         <!--<span class="fr"><a href="#">修改</a><a href="#">提交</a><a href="#">删除</a></span>-->
       </p>
     <!--<div style="background: #f5f5f5; height: 11px" ng-if="!changeBillStatusFlag"></div>-->
@@ -517,7 +517,7 @@
     <div class="match-menu" ng-if="changeBillStatusFlag">
                 <span class="active">
                     <a ng-bind="isAdd?'新增发票信息':'修改发票信息'"></a>
-                        <i class="fa fa-remove" ng-click="exitEdit()"></i>
+                        <i class="fa fa-remove" ng-click="exitEdit()" ng-if="invoices.length > 0"></i>
                 </span>
     </div>
     <!--我的发票-->

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

@@ -200,10 +200,10 @@
     .name {
         margin-right: 10px;
     }
-    .marginLeft {
-        max-height: 60px;
-        overflow-y: auto;
-    }
+    /*.marginLeft {*/
+        /*max-height: 60px;*/
+        /*overflow-y: auto;*/
+    /*}*/
     .marginLeft p {
         font-size: 14px;
     }
@@ -293,7 +293,7 @@
                                             </div>
                                             <div class="clearboth w100" ng-if="item.invoicetype === 1206">
                                                 <div class="pull-left name">订单号: </div>
-                                                <div class="pull-left marginLeft" style="max-width: 224px">
+                                                <div class="pull-left marginLeft" style="max-width: 224px; max-height: 60px;overflow-y: auto;">
                                                     <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                                 </div>
                                             </div>

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

@@ -285,8 +285,11 @@ body div.ng-table-pager a.page-a {
                             </td>
                             <td><a ng-href="{{'store/' + item.storeid}}" ng-bind="item.storeName" target="_blank" style="color:#3f84f6"></a></td>
                             <td ng-bind="item.price"></td>
+                            <!--<td>-->
+                                <!--<a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>-->
+                            <!--</td>-->
                             <td>
-                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-repeat="orderid in item.orderid.split(',')" ng-bind="orderid" target="_blank" style="display: block;"></a>
+                                <a  style="color:#3f84f6" ng-href="user#/order/detail/{{orderid | EncryptionFilter}}" ng-bind="item.orderid" target="_blank" style="display: block;"></a>
                             </td>
                             <td ng-bind="item.paytime | date: 'yyyy-MM-dd HH:mm'">
 

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

@@ -1038,7 +1038,7 @@
 						<b>总共<em ng-bind="::order.batchQty || 0"></em>件产品</b></dd>
 				</div>
 				<div ng-if="currenctOrders.length > 0" class="text-right" style="margin: 20px 0 12px 0;padding-right:15px;" >
-					显示&nbsp;{{(currenctOrdersList.number - 1 ) * currenctOrdersList.tobepaid + 1}}-{{currenctOrdersList.totalElements >= 10 ? (currenctOrdersList.number * currenctOrdersList.tobepaid > currenctOrdersList.totalElements ? currenctOrdersList.totalElements : currenctOrdersList.number * currenctOrdersList.tobepaid) : currenctOrdersList.totalElements}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
+					显示&nbsp;{{(currenctOrdersList.number - 1 ) * currenctOrdersList.numberOfElements + 1}}-{{currenctOrdersList.totalElements >= 10 ? (currenctOrdersList.number * currenctOrdersList.numberOfElements > currenctOrdersList.totalElements ? currenctOrdersList.totalElements : currenctOrdersList.number * currenctOrdersList.numberOfElements) : currenctOrdersList.totalElements}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
 				</div>
 				<div ng-if="currenctOrders.length == 0" class="text-center">
 					<div class="col-xs-offset-3 col-xs-2" >

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -353,10 +353,10 @@
     .name {
         margin-right: 10px;
     }
-    .marginLeft {
-        max-height: 60px;
-        overflow-y: auto;
-    }
+    /*.marginLeft {*/
+        /*max-height: 60px;*/
+        /*overflow-y: auto;*/
+    /*}*/
     .marginLeft p {
         font-size: 14px;
     }
@@ -472,7 +472,7 @@
                                     </div>
                                     <div class="pull-left w50">
                                         <div class="pull-left name">订单号: </div>
-                                        <div class="pull-left marginLeft" style="max-width: 224px">
+                                        <div class="pull-left marginLeft" style="max-width: 224px;max-height: 60px;overflow-y: auto;">
                                             <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
                                         </div>
                                     </div>