diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index 0c154eff..def3b05b 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -304,11 +304,11 @@ public class SysHomeController { List rows = new ArrayList<>(); 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() .addv("id", setting.getId()) .addv("year", setting.getYear()) - .addv("title", setting.getYear() + "暑期教职工疗休养") + .addv("title", setting.getYear() + "暑期疗休养") .addv("imageUrl", imageUrl) .addv("href", "/platform/tour/signup")); } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourTravelAgencyController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourTravelAgencyController.java index 900a571a..6addabdb 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourTravelAgencyController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourTravelAgencyController.java @@ -121,9 +121,9 @@ public class TourTravelAgencyController { if (StrUtil.isBlank(agency.getContactPhone())) { return Result.error("联系人手机不能为空"); } - if (!agency.getContactPhone().matches(MOBILE_PATTERN)) { - return Result.error("联系人手机格式不正确"); - } +// if (!agency.getContactPhone().matches(MOBILE_PATTERN)) { +// return Result.error("联系人手机格式不正确"); +// } if (StrUtil.isBlank(agency.getEmail())) { return Result.error("邮箱不能为空"); } diff --git a/src/main/resources/static/assets/platform/images/tour/疗休养logo.png b/src/main/resources/static/assets/platform/images/tour/疗休养logo.png new file mode 100644 index 00000000..4dd624bc Binary files /dev/null and b/src/main/resources/static/assets/platform/images/tour/疗休养logo.png differ diff --git a/src/main/resources/static/assets/platform/images/tour/疗休养图片.jpeg b/src/main/resources/static/assets/platform/images/tour/疗休养图片.jpeg deleted file mode 100644 index 9df824ed..00000000 Binary files a/src/main/resources/static/assets/platform/images/tour/疗休养图片.jpeg and /dev/null differ diff --git a/src/main/resources/views/platform/zhgh/dayofficework/Tour/travelAgency/index.html b/src/main/resources/views/platform/zhgh/dayofficework/Tour/travelAgency/index.html index b7784c3c..9be5d19f 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/Tour/travelAgency/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/Tour/travelAgency/index.html @@ -182,11 +182,8 @@ layout("/layouts/platform.html"){ data() { const currentYear = moment().format("YYYY") const validateMobile = (rule, value, callback) => { - const mobileReg = /^1[3-9]\d{9}$/ if (!value) { callback(new Error("必填")) - } else if (!mobileReg.test(value)) { - callback(new Error("手机号格式不正确")) } else { callback() }