|
@@ -78,6 +78,19 @@
|
|
$scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
|
|
$scope.multi.b = new Date($scope.dream.created_at.replace(/-/g, "/"));
|
|
$scope.multi.c = $scope.dream.c;
|
|
$scope.multi.c = $scope.dream.c;
|
|
$scope.multi.promise = $scope.dream.a;
|
|
$scope.multi.promise = $scope.dream.a;
|
|
|
|
+ $top3user = storage.getObject('top3user');
|
|
|
|
+ if($scope.dream.top3user != $top3user&&$top3user != null){
|
|
|
|
+ //测试动画切换
|
|
|
|
+ if($scope.dream.top3user[0])$scope.sort.first = $scope.dream.top3user[0].avatar;
|
|
|
|
+ if($scope.dream.top3user[1])$scope.sort.second = $scope.dream.top3user[1].avatar;
|
|
|
|
+ if($scope.dream.top3user[2])$scope.sort.third = $scope.dream.top3user[2].avatar;
|
|
|
|
+ $scope.sort.slide1 = 'list-grow-animation';
|
|
|
|
+ $scope.sort.slide2 = 'slide-in-both-ways';
|
|
|
|
+ $scope.sort.slide3 = 'bounce-animation';
|
|
|
|
+ storage.setObject('top3user',$scope.dream.top3user)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
$scope.calcmultiplier();
|
|
$scope.calcmultiplier();
|
|
}, function (error) {
|
|
}, function (error) {
|
|
msg.hide();
|
|
msg.hide();
|
|
@@ -109,7 +122,7 @@
|
|
$scope.$on('$ionicView.beforeEnter', function () {
|
|
$scope.$on('$ionicView.beforeEnter', function () {
|
|
$scope.load(id);
|
|
$scope.load(id);
|
|
$ionicTabsDelegate.showBar(false);
|
|
$ionicTabsDelegate.showBar(false);
|
|
- $scope.user = storage.getObject('user');
|
|
|
|
|
|
+ $scope.thisUser = storage.getObject('user');
|
|
console.log($scope.user);
|
|
console.log($scope.user);
|
|
});
|
|
});
|
|
$scope.$on('$ionicView.leave', function () {
|
|
$scope.$on('$ionicView.leave', function () {
|
|
@@ -149,9 +162,6 @@
|
|
}
|
|
}
|
|
//实时排行
|
|
//实时排行
|
|
$scope.sort = {
|
|
$scope.sort = {
|
|
- first: 'img/demo/head5.jpg',
|
|
|
|
- second: 'img/demo/head6.jpg',
|
|
|
|
- third: 'img/demo/head7.jpg',
|
|
|
|
slide: ''
|
|
slide: ''
|
|
}
|
|
}
|
|
$scope.vidEnded = function () {
|
|
$scope.vidEnded = function () {
|
|
@@ -185,13 +195,6 @@
|
|
homeService.supportDream(data).then(function(result){
|
|
homeService.supportDream(data).then(function(result){
|
|
$scope.tosupport = false;
|
|
$scope.tosupport = false;
|
|
$scope.load(id);
|
|
$scope.load(id);
|
|
- //测试动画切换
|
|
|
|
- $scope.sort.first = 'img/demo/head7.jpg';
|
|
|
|
- $scope.sort.second = 'img/demo/head6.jpg';
|
|
|
|
- $scope.sort.third = 'img/demo/head5.jpg';
|
|
|
|
- $scope.sort.slide1 = 'list-grow-animation';
|
|
|
|
- $scope.sort.slide2 = 'slide-in-both-ways';
|
|
|
|
- $scope.sort.slide3 = 'bounce-animation';
|
|
|
|
$interval.cancel($scope.multi.promise);
|
|
$interval.cancel($scope.multi.promise);
|
|
})
|
|
})
|
|
};
|
|
};
|