From 2ef48835b7a8e14eddf098a82aa462fa5b061394 Mon Sep 17 00:00:00 2001
From: luoyang14z7 <704328506@qq.com>
Date: Fri, 13 Jul 2018 14:04:28 +0800
Subject: [PATCH 1/2] fix : ActChairty
---
.../ui/static/actchairty/templates/act_chairty_merchants.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
index b08680a38..e092d5222 100644
--- a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
+++ b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
@@ -74,6 +74,9 @@
next-text="›"
first-text="«"
last-text="»">
+
+
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
From 45629cb0de99c6f88484ec9d3290e715ab9efd97 Mon Sep 17 00:00:00 2001
From: luoyang14z7 <704328506@qq.com>
Date: Fri, 13 Jul 2018 16:53:35 +0800
Subject: [PATCH 2/2] fix : ActChairty
---
src/main/ui/static/actchairty/act_chairty.js | 7 +++++--
.../static/actchairty/templates/act_chairty_merchants.html | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/ui/static/actchairty/act_chairty.js b/src/main/ui/static/actchairty/act_chairty.js
index 4cd8fc7ef..3a2c64283 100644
--- a/src/main/ui/static/actchairty/act_chairty.js
+++ b/src/main/ui/static/actchairty/act_chairty.js
@@ -23,21 +23,24 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
$http.get('/actchairty/clients', {params: params}).then(function (resp) {
$scope.clients = resp.data.data;
$scope.pagination = resp.data.pagination;
+
})
};
$scope.loadClients();
$scope.new_conf = {};
$scope.ctrl = {dateInput: false};
$scope.submitClient = function () {
- $scope.errmsg = null;
+ var client_moniker = $scope.new_conf.client_moniker;
+ $scope.msg = null;
var conf = {
date: $filter('date')($scope.new_conf.date, 'yyyy-MM-dd'),
};
$http.put('/actchairty/clients/' + $scope.new_conf.client_moniker, conf).then(function () {
$scope.new_conf = {};
$scope.loadClients();
+ $scope.msg = "商户创建成功!商户ID:"+ client_moniker + " 参加时间:" + conf.date;
}, function (resp) {
- $scope.errmsg = resp.data.message;
+ $scope.msg = resp.data.message;
});
};
}]);
diff --git a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
index e092d5222..dd6f2f8b9 100644
--- a/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
+++ b/src/main/ui/static/actchairty/templates/act_chairty_merchants.html
@@ -23,7 +23,7 @@