Merge remote-tracking branch 'origin/release-201839-wangcz' into release-201839-wangcz

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -321,6 +321,7 @@ define(['app/app'], function(app) {
         // 产品导出事件
         $scope.exportClick = function () {
             var url = '';
+            getChooseBatch();
             if($scope.ids.length > 0) {
                 var idList = [];
                 angular.forEach($scope.ids, function(val) {

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

@@ -720,7 +720,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: 10%;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;" ng-class="{'none': detail.goodsHistory.prices.length > 1}">
+							<span class="price-step"  style="width: 10%;white-space: nowrap;" ng-class="{'none': detail.goodsHistory.prices.length > 1}">
 								<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>