|
|
@@ -7,7 +7,6 @@ define([ 'app/app' ], function(app) {
|
|
|
$scope.orderList = '';
|
|
|
if($stateParams.orderid) {
|
|
|
Order.get({orderid : $stateParams.orderid}, function(data) {
|
|
|
- console.log(data);
|
|
|
var arr = new Array();
|
|
|
$scope.$$bankTransfer = {};
|
|
|
$scope.$$bankTransfer.total = 0.0;
|
|
|
@@ -18,6 +17,13 @@ define([ 'app/app' ], function(app) {
|
|
|
$scope.$$bankTransfer.currency = data[0].currency;
|
|
|
$scope.orderNum = arr.join('，');
|
|
|
$scope.orderList = arr;
|
|
|
+
|
|
|
+ // 日期换算
|
|
|
+ $scope.availabletime = '';
|
|
|
+ $scope.availabletime = data[0].availabletime;
|
|
|
+ $scope.creattime = '';
|
|
|
+ $scope.creattime = data[0].creattime;
|
|
|
+ var SurplusTime = $scope.availabletime - $scope.creattime;
|
|
|
}, function (response) {
|
|
|
toaster.pop('info', '获取订单的信息有误，请确定付款的订单');
|
|
|
})
|
|
|
@@ -103,4 +109,36 @@ define([ 'app/app' ], function(app) {
|
|
|
};
|
|
|
getTodayDate();
|
|
|
}]);
|
|
|
+ /**
|
|
|
+ * 与现在的时间对比，距离多少天多少小时
|
|
|
+ */
|
|
|
+ app.register.filter('restTime', function () {
|
|
|
+ var day = 0, hours = 0, minute = 0;
|
|
|
+ return function (time) {
|
|
|
+ if(!time) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ var nowTime = new Date();
|
|
|
+ var s1 = time - nowTime.getTime();
|
|
|
+ var totalHours = s1/(1000*60*60);//算多少个小时
|
|
|
+ day = parseInt(totalHours) / 24;
|
|
|
+ hours = parseInt(totalHours) % 24;
|
|
|
+ minute = parseInt(hours)% 60;
|
|
|
+ return parseInt(day) + "天" + parseInt(hours) + "小时" + parseInt(minute) + '分';
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ /**
|
|
|
+ * totalHours传入小时，被减去minuesTime转换成天数
|
|
|
+ * 返回格式时 x天y小时
|
|
|
+ */
|
|
|
+ app.register.filter('hoursToDay', function () {
|
|
|
+ var day = 0, hours = 0;
|
|
|
+ return function (totalHours, minuesdTime) {
|
|
|
+ var h = minuesdTime - totalHours;
|
|
|
+ day = parseInt(h) / 24;
|
|
|
+ hours = parseInt(h) % 24;
|
|
|
+ return "还剩 " + parseInt(day) + "天" + parseInt(hours) + "小时";
|
|
|
+ }
|
|
|
+ });
|
|
|
});
|
ouxq