疗休养优化1.4
This commit is contained in:
@@ -304,11 +304,11 @@ public class SysHomeController {
|
|||||||
List<NutMap> rows = new ArrayList<>();
|
List<NutMap> rows = new ArrayList<>();
|
||||||
for (TourSetting setting : settings) {
|
for (TourSetting setting : settings) {
|
||||||
// 优先使用配置上传图片,未上传时使用系统默认疗休养图片,避免首页浮动入口空图。
|
// 优先使用配置上传图片,未上传时使用系统默认疗休养图片,避免首页浮动入口空图。
|
||||||
String imageUrl = StrUtil.blankToDefault(setting.getHomeSignupEntryImage(), Globals.AppDomain + "/assets/platform/images/tour/疗休养图片.jpeg");
|
String imageUrl = StrUtil.blankToDefault(setting.getHomeSignupEntryImage(), Globals.AppDomain + "/assets/platform/images/tour/疗休养logo.png");
|
||||||
rows.add(NutMap.NEW()
|
rows.add(NutMap.NEW()
|
||||||
.addv("id", setting.getId())
|
.addv("id", setting.getId())
|
||||||
.addv("year", setting.getYear())
|
.addv("year", setting.getYear())
|
||||||
.addv("title", setting.getYear() + "暑期教职工疗休养")
|
.addv("title", setting.getYear() + "暑期疗休养")
|
||||||
.addv("imageUrl", imageUrl)
|
.addv("imageUrl", imageUrl)
|
||||||
.addv("href", "/platform/tour/signup"));
|
.addv("href", "/platform/tour/signup"));
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -121,9 +121,9 @@ public class TourTravelAgencyController {
|
|||||||
if (StrUtil.isBlank(agency.getContactPhone())) {
|
if (StrUtil.isBlank(agency.getContactPhone())) {
|
||||||
return Result.error("联系人手机不能为空");
|
return Result.error("联系人手机不能为空");
|
||||||
}
|
}
|
||||||
if (!agency.getContactPhone().matches(MOBILE_PATTERN)) {
|
// if (!agency.getContactPhone().matches(MOBILE_PATTERN)) {
|
||||||
return Result.error("联系人手机格式不正确");
|
// return Result.error("联系人手机格式不正确");
|
||||||
}
|
// }
|
||||||
if (StrUtil.isBlank(agency.getEmail())) {
|
if (StrUtil.isBlank(agency.getEmail())) {
|
||||||
return Result.error("邮箱不能为空");
|
return Result.error("邮箱不能为空");
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@@ -182,11 +182,8 @@ layout("/layouts/platform.html"){
|
|||||||
data() {
|
data() {
|
||||||
const currentYear = moment().format("YYYY")
|
const currentYear = moment().format("YYYY")
|
||||||
const validateMobile = (rule, value, callback) => {
|
const validateMobile = (rule, value, callback) => {
|
||||||
const mobileReg = /^1[3-9]\d{9}$/
|
|
||||||
if (!value) {
|
if (!value) {
|
||||||
callback(new Error("必填"))
|
callback(new Error("必填"))
|
||||||
} else if (!mobileReg.test(value)) {
|
|
||||||
callback(new Error("手机号格式不正确"))
|
|
||||||
} else {
|
} else {
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user