master
yuan 7 years ago
parent be462ec53d
commit df901c8745

@ -13,7 +13,7 @@ import java.text.SimpleDateFormat;
* *
*/ */
public class NoticeInfo { public class NoticeInfo {
private final DateFormat format = new SimpleDateFormat("yyyyMMdd"); private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@NotNull @NotNull
private String title; private String title;
private String desc; private String desc;

@ -102,7 +102,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
} }
var notice = angular.copy($scope.notice); var notice = angular.copy($scope.notice);
if (notice.end_time) { if (notice.end_time) {
notice.end_time = $filter('date')(notice.end_time, 'yyyyMMdd') notice.end_time = $filter('date')(notice.end_time, 'yyyy-MM-dd')
} }
if (notice.merchants_type == 1) { if (notice.merchants_type == 1) {
if (notice.send_clients.length == 0) { if (notice.send_clients.length == 0) {
@ -220,7 +220,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
} }
var notice = angular.copy($scope.notice); var notice = angular.copy($scope.notice);
if (notice.end_time) { if (notice.end_time) {
notice.end_time = $filter('date')(notice.end_time, 'yyyyMMdd') notice.end_time = $filter('date')(notice.end_time, 'yyyy-MM-dd')
} else { } else {
if (notice.status == '1') { if (notice.status == '1') {
$scope.notice.status = '0'; $scope.notice.status = '0';

Loading…
Cancel
Save