|
|
@@ -129,9 +129,9 @@ define([ 'app/app' ], function(app) {
|
|
|
// 内层DIV的滚动加载
|
|
|
var window = angular.element($window);
|
|
|
var docu = angular.element($document);
|
|
|
- if (docu.scrollTop() + window.height() > docu.height() - 330) {
|
|
|
- angular.element('#applyBtn').slideUp(0)
|
|
|
- }
|
|
|
+ // if (docu.scrollTop() + window.height() > docu.height() - 330) {
|
|
|
+ // angular.element('#applyBtn').slideUp(0)
|
|
|
+ // }
|
|
|
window.on('scroll', function () {
|
|
|
var scrollTop = docu.scrollTop();
|
|
|
if (scrollTop + window.height() > docu.height() - 330) {
|
|
|
@@ -140,7 +140,12 @@ define([ 'app/app' ], function(app) {
|
|
|
angular.element('#applyBtn').slideDown(300)
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+ $scope.$on('ngRepeatFinished', function (ngRepeatFinishedEvent) {
|
|
|
+ // console.log(1)
|
|
|
+ if (docu.scrollTop() + window.height() > docu.height() - 330) {
|
|
|
+ angular.element('#applyBtn').slideUp(0)
|
|
|
+ }
|
|
|
+ });
|
|
|
|
|
|
}]);
|
|
|
app.register.controller('NoInvoiceSubmitCtrl', ['$scope','$rootScope','$modal', 'Order', 'toaster', 'submitInvoice', '$modalInstance','invoiceData','BillSubmit','$state', function ($scope, $rootScope, $modal, Order, toaster, submitInvoice, $modalInstance, invoiceData, BillSubmit, $state) {
|
|
|
@@ -231,4 +236,5 @@ define([ 'app/app' ], function(app) {
|
|
|
}
|
|
|
|
|
|
}]);
|
|
|
+
|
|
|
});
|