| xqd
@@ -242,6 +242,8 @@
|
|
|
$scope.$on('$ionicView.afterLeave', function () {
|
|
|
clearInterval(timerID);
|
|
|
timerID = null;
|
|
|
+ if($scope.multi.promise)$interval.cancel($scope.multi.promise);
|
|
|
+ if($scope.leftTimer)$interval.cancel($scope.leftTimer);
|
|
|
});
|
|
|
$scope.$on('$ionicView.beforeEnter', function () {
|
|
|
$scope.video = {};
|
| xqd
@@ -273,10 +275,7 @@
|
|
|
//msg.error(msg.data.error)
|
|
|
})
|
|
|
};
|
|
|
- $scope.$on('$ionicView.leave', function () {
|
|
|
- if($scope.multi.promise)$interval.cancel($scope.multi.promise);
|
|
|
- if($scope.leftTimer)$interval.cancel($scope.leftTimer);
|
|
|
- });
|
|
|
+
|
|
|
$scope.toSort = function(){
|
|
|
//$scope.type = 3;
|
|
|
$scope.changeType(3)
|
| xqd
@@ -526,7 +525,7 @@
|
|
|
id:id,
|
|
|
title:$scope.vm.title,
|
|
|
pics:$scope.imgs,
|
|
|
- video:$scope.video.file
|
|
|
+ video:$scope.video.server
|
|
|
};
|
|
|
homeService.add_interaction(data).then(function(){
|
|
|
$scope.load(id);
|
| xqd
@@ -534,22 +533,22 @@
|
|
|
})
|
|
|
};
|
|
|
|
|
|
- $scope.showAbout = true;
|
|
|
- $scope.hideAbout = false;
|
|
|
- $scope.showText = function(){
|
|
|
+ $scope.showAbout = true;
|
|
|
+ $scope.hideAbout = false;
|
|
|
+ $scope.showText = function(){
|
|
|
$scope.aboutStyle = {
|
|
|
"white-space" : "normal"
|
|
|
};
|
|
|
$scope.showAbout = false;
|
|
|
$scope.hideAbout = true;
|
|
|
};
|
|
|
- $scope.hideText = function(){
|
|
|
- $scope.aboutStyle = {
|
|
|
- "white-space" : "nowrap"
|
|
|
- };
|
|
|
- $scope.showAbout = true;
|
|
|
- $scope.hideAbout = false;
|
|
|
+ $scope.hideText = function(){
|
|
|
+ $scope.aboutStyle = {
|
|
|
+ "white-space" : "nowrap"
|
|
|
};
|
|
|
+ $scope.showAbout = true;
|
|
|
+ $scope.hideAbout = false;
|
|
|
+ };
|
|
|
$scope.input = {
|
|
|
placeholder: '评论',
|
|
|
focus: false,
|
| xqd
@@ -761,7 +760,7 @@
|
|
|
$scope.video.server = response.data.file;
|
|
|
var file = config.imgServer+response.data.file;
|
|
|
$scope.video.isOK = true;
|
|
|
- $scope.video.file = response.data.file;
|
|
|
+ $scope.video.file = file;
|
|
|
$scope.video.vpic = config.server+'upload/vpic/'+response.data.file+'.jpg';
|
|
|
}, function (error) {
|
|
|
//msg.error('视频上传失败');
|