xiaoxin 2 anos atrás
pai
commit
1f8a863bd2

+ 7 - 5
pages/login/login.vue

@@ -75,11 +75,13 @@ const getCode = async () => {
 			}
 		})
 		// console.log(res)
-		uni.showToast({
-			title: '验证码已发送',
-			icon: 'none'
-		})
-		codeDom.value.start()
+		if (res.code == 200) {
+			uni.showToast({
+				title: '验证码已发送',
+				icon: 'none'
+			})
+			codeDom.value.start()
+		}
 	} else {
 		uni.showToast({
 			title: '倒计时结束后再发送',

+ 9 - 0
pagesReservation/register/register.vue

@@ -143,6 +143,7 @@ import { ref, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { myRequest } from '@/utils/api.js'
 import { time_format } from '@/utils/formatTime.js'
+import { isVehicleNumber } from '@/utils/plate.js'
 
 // 判断是哪种身份 1为学生家长 2为其他访客
 const type = ref('')
@@ -391,6 +392,14 @@ const verifyValue = () => {
 		})
 		return false
 	}
+	if (visCarNumber.value && !isVehicleNumber(visCarNumber.value)) {
+		uni.showToast({
+			title: '请输入正确的车牌号',
+			icon: 'none'
+		})
+		return false
+	}
+
 	if (type.value === '1' && !list.value.length) {
 		uni.showToast({
 			title: '请绑定学生后再开始预约',

+ 5 - 3
pagesWarning/home/home.vue

@@ -143,8 +143,10 @@ const getData = async () => {
 		}
 	})
 	// console.log(res)
-	listData.value = [...listData.value, ...res.data.list]
-	total.value = res.data.totalCount
+	if (res.code == 200) {
+		listData.value = [...listData.value, ...res.data.list]
+		total.value = res.data.totalCount
+	}
 }
 
 // 处理完成按钮回调
@@ -346,4 +348,4 @@ const handleOperation = async (id, remark) => {
 		}
 	}
 }
-</style>
+</style>

+ 8 - 0
unpackage/dist/dev/mp-weixin/pagesReservation/register/register.js

@@ -2,6 +2,7 @@
 const common_vendor = require("../../common/vendor.js");
 const utils_api = require("../../utils/api.js");
 const utils_formatTime = require("../../utils/formatTime.js");
+const utils_plate = require("../../utils/plate.js");
 if (!Array) {
   const _easycom_uni_datetime_picker2 = common_vendor.resolveComponent("uni-datetime-picker");
   _easycom_uni_datetime_picker2();
@@ -200,6 +201,13 @@ const _sfc_main = {
         });
         return false;
       }
+      if (visCarNumber.value && !utils_plate.isVehicleNumber(visCarNumber.value)) {
+        common_vendor.index.showToast({
+          title: "请输入正确的车牌号",
+          icon: "none"
+        });
+        return false;
+      }
       if (type.value === "1" && !list.value.length) {
         common_vendor.index.showToast({
           title: "请绑定学生后再开始预约",

+ 1 - 1
utils/formatTime.js

@@ -22,6 +22,6 @@ export const getNowDate = () => {
 	const date = new Date()
 	let year = date.getFullYear()
 	let month = (date.getMonth() + 1).toString().padStart(2, 0)
-	let day = date.getDate()
+	let day = date.getDate().toString().padStart(2, 0)
 	return `${year}-${month}-${day}`
 }

+ 15 - 0
utils/plate.js

@@ -0,0 +1,15 @@
+export const isVehicleNumber = (vehicleNumber) => {
+	// 新能源车
+	var xxreg =
+		/^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DABCEFGHJK]$)|([DABCEFGHJK][A-HJ-NP-Z0-9][0-9]{4}$))/;
+	// 燃油车
+	var creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/;
+
+	if (vehicleNumber.length == 7) {
+		return creg.test(vehicleNumber);
+	} else if (vehicleNumber.length == 8) {
+		return xxreg.test(vehicleNumber);
+	} else {
+		return false;
+	}
+}