Merge branch 'dev-mysql-1227' of ssh://10.10.100.21/source/platform-b2c into dev-mysql-1227

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_onSaleCtrl.js

@@ -286,6 +286,11 @@ define([ 'app/app' ], function(app) {
                 $scope.goodsAll = data;
                 $scope.currenctGoods = data.content;
                 $scope.param.currentPage = data.number;
+                if ($scope.param.currentPage == data.totalPages) {
+                    $scope.endNumber = data.totalElements;
+                } else {
+                    $scope.endNumber = data.number * data.size;
+                }
                 $scope.acculatePages(data.number, data.totalPages);
                 if($scope.currenctGoods.length > 0) {
                     //防止默认选择的RMB不是用户上传的币别信息

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

@@ -1954,7 +1954,9 @@
 						<!--<strong class="text-inverse">*</strong>商城暂未收录的 品牌/器件，”原厂型号“将会显示为空且不可上架售卖，<br/>-->
 						<!--如需上架可先点击 【匹配】按钮，若匹配不成功，可前往<a ui-sref="vendor_brand_apply" target="_blank"> 品牌申请/</a><a ui-sref="vendor_component_apply" target="_blank">器件申请</a>，提出申请-->
 					<!--</div>-->
-					<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-<!--<span ng-bind="materialAll.size"></span>-->{{ param.page * 10 }}， 共： <span ng-bind="materialAll.totalElements" cl style="color: #5078cb;"></span> 个</div>
+					<div ng-if="currenctMaterial.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
+						<span ng-if="param.currentPage == materialAll.totalPages" ng-bind="materialAll.totalElements"></span>
+						<span ng-if="param.currentPage != materialAll.totalPages" ng-bind="param.page * param.count"></span>， 共： <span ng-bind="materialAll.totalElements" style="color: #5078cb;"></span> 个</div>
 				</div>
 				<div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px; padding-bottom: 80px;" ng-if="materialAll.totalPages>1">
 					<ul class="pagination ng-table-pagination">
@@ -2073,7 +2075,10 @@
 										<option value="20">20</option>
 									</select>
 								</span>
-									显示<span>{{(param.currentPage - 1) * param.count + 1}}</span>-<span>{{param.currentPage * param.count}}</span>，共：<span style="color: #5078cb;">{{materialAll.totalElements}}</span>个
+									显示<span>{{(param.currentPage - 1) * param.count + 1}}</span>-
+									<span ng-if="param.currentPage != materialAll.totalPages">{{param.currentPage * param.count}}</span>
+									<span ng-if="param.currentPage == materialAll.totalPages">{{materialAll.totalElements}}</span>
+									，共：<span style="color: #5078cb;">{{materialAll.totalElements}}</span>个
 								</div>
 							</td>
 						</tr>

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

@@ -1193,7 +1193,8 @@
                     </tr>
                     </tbody>
                 </table>
-                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示1-<span ng-bind="goodsAll.size"></span>个，共：<span ng-bind="goodsAll.totalElements" cl style="color: #5078cb;"></span>个</div>
+                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
+                    <span ng-bind="endNumber"></span>， 共： <span ng-bind="goodsAll.totalElements" style="color: #5078cb;"></span> 个</div>
                 <div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" ng-if="goodsAll.totalPages>1">
                     <ul class="pagination ng-table-pagination">
                         <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">