diff --git a/pages/activity/book.vue b/pages/activity/book.vue
index c5a6d9b..b3609ba 100644
--- a/pages/activity/book.vue
+++ b/pages/activity/book.vue
@@ -127,7 +127,7 @@
-
+
@@ -437,7 +437,7 @@
title: "请填写手机号"
})
return false;
- } else if (!uni.$u.test.mobile(this.form.mobile)) {
+ } else if (!this.util.phoneRegex.test(this.form.mobile)) {
uni.showToast({
icon: "none",
title: "请正确填写手机号"
diff --git a/pages/guide/index.vue b/pages/guide/index.vue
index 3c294b9..bdb3d94 100644
--- a/pages/guide/index.vue
+++ b/pages/guide/index.vue
@@ -19,7 +19,7 @@
- 投诉建议
+ 意见建议
diff --git a/pages/order/activityorderinfo.vue b/pages/order/activityorderinfo.vue
index a92438b..c72ce55 100644
--- a/pages/order/activityorderinfo.vue
+++ b/pages/order/activityorderinfo.vue
@@ -106,7 +106,7 @@
},
utilSuccess: function(res) {
that.info = res;
- that.qrFun(res.code);
+ that.qrFun("type=activity,"+res.code);
},
utilFail: function(res) {
uni.showToast({
diff --git a/pages/park/book.vue b/pages/park/book.vue
index be8942b..3148978 100644
--- a/pages/park/book.vue
+++ b/pages/park/book.vue
@@ -19,7 +19,7 @@
-
+
@@ -131,7 +131,8 @@
}
},
onLoad(options) {
- let that = this;
+ let that = this;
+ that.showInfo = true;
if (!that.util.isNull(options.id)) {
this.form.car_park_id = parseInt(options.id);
}
diff --git a/pages/visit/book.vue b/pages/visit/book.vue
index 9f94fcc..438a585 100644
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@@ -157,7 +157,7 @@
-
+
@@ -309,7 +309,8 @@
},
onLoad(options) {
this.loadConfig();
- this.loadInfo();
+ this.loadInfo();
+ this.openNoticeInfo(0);
if (options.currentDate) {
this.bcurrentDate = JSON.parse(options.currentDate);
this.currentDate = this.bcurrentDate;
@@ -411,7 +412,7 @@
title: "请填写手机号"
})
return false;
- } else if (!uni.$u.test.mobile(this.form.mobile)) {
+ } else if (!this.util.phoneRegex.test(this.form.mobile)) {
uni.showToast({
icon: "none",
title: "请正确填写手机号"
@@ -528,7 +529,7 @@
if (!that.util.isValidCardID(that.formUser.idcard)) {
uni.showToast({
icon: "none",
- title: "请正确输入身份证号"
+ title: "请正确输入身份证号1"
})
return false;
}
@@ -539,7 +540,7 @@
title: "请填写手机号"
})
return false;
- } else if (!uni.$u.test.mobile(this.formUser.mobile)) {
+ } else if (!this.util.phoneRegex.test(this.formUser.mobile)) {
uni.showToast({
icon: "none",
title: "请正确填写手机号"
diff --git a/utils/util.js b/utils/util.js
index fd9197b..d3b66a1 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -302,9 +302,11 @@ const isLogin = () => {
const isNull = p => {
return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
-}; // 正则
+}; // 正则
+
-const phoneRegex = /^1\d{10}$/;
+
+const phoneRegex = /^1[3456789]\d{9}$/;
const idCardRegex = /^\d{17}([0-9]|X)$/; // 去掉特殊字符
const filterSpecialChars = str => {