|
|
@@ -667,7 +667,7 @@
|
|
|
current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-click="openDatePicker($event, activity, '$startTimeOpened')"
|
|
|
- ng-class="{'showEmpty' : submited && activity.startTime == null}">
|
|
|
+ ng-class="{'showEmpty' : submited && !activity.startTime}">
|
|
|
<span class="fl" style="margin-left: 5px;">至</span>
|
|
|
<input type="text" ng-model="activity.endTime" readonly required
|
|
|
class="date-choose f1 form-control" placeholder="结束时间" title="选择活动开始时间后可选此项"
|
|
|
@@ -676,11 +676,11 @@
|
|
|
current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-click="openDatePicker($event, activity, '$endTimeOpened')"
|
|
|
- ng-class="{'showEmpty' : submited && activity.endTime == null}">
|
|
|
+ ng-class="{'showEmpty' : submited && !activity.endTime}">
|
|
|
|
|
|
- <span class="error" ng-show="submited && activity.startTime == null">*请选择活动开始时间</span>
|
|
|
- <span class="error" ng-show="submited && activity.endTime == null">*请选择活动结束时间</span>
|
|
|
- <span class="error" ng-show="submited && activity.startTime != null && activity.endTime != null && activity.startTime.getTime() == activity.endTime.getTime()">*活动开始时间与结束时间不能相同</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.startTime">*请选择活动开始时间</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.endTime">*请选择活动结束时间</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.startTime && !activity.endTime && activity.startTime.getTime() == activity.endTime.getTime()">*活动开始时间与结束时间不能相同</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="form-group clearfix">
|
|
|
@@ -693,7 +693,7 @@
|
|
|
current-text="今天" clear-text="清除" close-text="关闭" ng-disabled="activity.startTime == null || activity.endTime == null"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-click="openDatePicker($event, activity, '$receiveStartTimeOpened')"
|
|
|
- ng-class="{'showEmpty' : submited && activity.receiveStartTime == null}">
|
|
|
+ ng-class="{'showEmpty' : submited && !activity.receiveStartTime}">
|
|
|
<span class="fl" style="margin-left: 5px;">至</span>
|
|
|
<input type="text" ng-model="activity.receiveEndTime" readonly required
|
|
|
class="date-choose f1 form-control" placeholder="截止兑奖时间" title="选择兑奖开始时间之后可选此项"
|
|
|
@@ -702,11 +702,11 @@
|
|
|
current-text="今天" clear-text="清除" close-text="关闭" ng-disabled="activity.receiveStartTime == null"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-click="openDatePicker($event, activity, '$receiveEndTimeOpened')"
|
|
|
- ng-class="{'showEmpty' : submited && activity.receiveEndTime == null}">
|
|
|
+ ng-class="{'showEmpty' : submited && !activity.receiveEndTime}">
|
|
|
|
|
|
- <span class="error" ng-show="submited && activity.receiveStartTime == null">*请选择开始兑奖时间</span>
|
|
|
- <span class="error" ng-show="submited && activity.receiveEndTime == null">*请选择截止兑奖时间</span>
|
|
|
- <span class="error" ng-show="submited && activity.receiveStartTime != null && activity.receiveEndTime != null && activity.receiveStartTime.getTime() == activity.receiveEndTime.getTime()">*兑奖开始时间与截止时间不能相同</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.receiveStartTime">*请选择开始兑奖时间</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.receiveEndTime">*请选择截止兑奖时间</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.receiveStartTime && !activity.receiveEndTime && activity.receiveStartTime.getTime() == activity.receiveEndTime.getTime()">*兑奖开始时间与截止时间不能相同</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="form-group clearfix">
|
|
|
@@ -715,7 +715,7 @@
|
|
|
<summernote lang="zh-CN" ng-model="activity.summary" height="300px" maxlength="3500">
|
|
|
</summernote>
|
|
|
</div>
|
|
|
- <span class="error" ng-show="submited && activity.summary == null">*请填写活动介绍</span>
|
|
|
+ <span class="error" ng-show="submited && !activity.summary">*请填写活动介绍</span>
|
|
|
</div>
|
|
|
<div class="form-group clearfix">
|
|
|
<label class="control-label fl">封面图片</label>
|
|
|
@@ -731,7 +731,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <span class="error" ng-show="submited && actImgUrl == null && activity.actImg == null">*请上传封面图片</span>
|
|
|
+ <span class="error" ng-show="submited && !actImgUrl && !activity.actImg">*请上传封面图片</span>
|
|
|
</div>
|
|
|
<div class="form-group clearfix">
|
|
|
<label class="control-label fl">Banner</label>
|
|
|
@@ -747,7 +747,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <span class="error" ng-show="submited && bannerUrl == null && activity.banner == null">*请上传Banner</span>
|
|
|
+ <span class="error" ng-show="submited && !bannerUrl && !activity.banner">*请上传Banner</span>
|
|
|
</div>
|
|
|
<div class="form-group clearfix">
|
|
|
<label class="control-label fl">活动奖品</label>
|
|
|
@@ -761,23 +761,24 @@
|
|
|
<div class="award-detail clearfix">
|
|
|
<span class="fl">简介</span>
|
|
|
<input type="text" ng-model="award.awardSummary" maxlength="100" class="fl form-control" required
|
|
|
- ng-class="{'showEmpty' : submited && award.awardSummary == null}"/>
|
|
|
+ ng-class="{'showEmpty' : submited && !award.awardSummary}"/>
|
|
|
|
|
|
- <span class="error" ng-show="submited && award.awardSummary == null">*活动奖品的简介不能为空</span>
|
|
|
+ <span class="error" ng-show="submited && !award.awardSummary">*活动奖品的简介不能为空</span>
|
|
|
</div>
|
|
|
<div class="award-detail clearfix">
|
|
|
<span class="fl">数量</span>
|
|
|
- <input ng-pattern="/^[1-9]\d*$/" type="text" ng-model="award.amount" class="fl form-control" required
|
|
|
- ng-class="{'showEmpty' : submited && award.amount == null}"/>
|
|
|
+ <input ng-pattern="/^[1-9]\d*$/" type="text" name="awardAmount" ng-model="award.amount" class="fl form-control" required
|
|
|
+ ng-class="{'showEmpty' : submited && activityForm.awardAmount.$error.required}"/>
|
|
|
|
|
|
- <span class="error" ng-show="submited && award.amount == null">*活动奖品的数量不能为空</span>
|
|
|
+ <span class="error" ng-show="submited && activityForm.awardAmount.$error.required">*活动奖品的数量不能为空</span>
|
|
|
+ <span class="error" ng-show="submited && activityForm.awardAmount.$error.pattern">*活动奖品的数量不正确</span>
|
|
|
</div>
|
|
|
<div class="award-detail clearfix">
|
|
|
<span class="fl">奖品{{award.awardLevel}}等级</span>
|
|
|
<input type="text" ng-model="award.awardLevel" maxlength="10" class="fl form-control" required
|
|
|
- ng-class="{'showEmpty' : submited && award.awardLevel == null}"/>
|
|
|
+ ng-class="{'showEmpty' : submited && !award.awardLevel}"/>
|
|
|
|
|
|
- <span class="error" ng-show="submited && award.awardLevel">*活动奖品的奖品等级不能为空</span>
|
|
|
+ <span class="error" ng-show="submited && !award.awardLevel">*活动奖品的奖品等级不能为空</span>
|
|
|
</div>
|
|
|
<div class="award-detail clearfix">
|
|
|
<span class="fl">赠送方式</span>
|
|
|
@@ -799,7 +800,7 @@
|
|
|
</span>
|
|
|
</div>
|
|
|
|
|
|
- <span class="error" ng-show="submited && award.img == null">*请上传活动奖品图片</span>
|
|
|
+ <span class="error" ng-show="submited && !award.img">*请上传活动奖品图片</span>
|
|
|
</div>
|
|
|
<div class="add-price">
|
|
|
<a ng-click="addAward()">+添加奖品</a>
|
huangct