From 3cd3f10c65f219955991138068b5176e9d67a54a Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Fri, 11 Mar 2022 17:29:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android
---
pages/home/home.vue | 9 ++++
pages/registerUser/registerUser.vue | 40 ++++++++++++++-----
pages/grabOrders/grabOrdersMain/business.vue | 24 ++++++------
3 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/pages/grabOrders/grabOrdersMain/business.vue b/pages/grabOrders/grabOrdersMain/business.vue
index 73261ea..138f60c 100644
--- a/pages/grabOrders/grabOrdersMain/business.vue
+++ b/pages/grabOrders/grabOrdersMain/business.vue
@@ -121,11 +121,11 @@
img: "/static/workbench/task9.png",
url: "",
},
- // {
- // title: "模拟考试",
- // img: "/static/workbench/task5.png",
- // url: "/pages/exam/startexam",
- // }
+ {
+ title: "模拟考试",
+ img: "/static/workbench/task5.png",
+ url: "/pages/exam/startexam",
+ }
],
};
},
@@ -133,13 +133,13 @@
this.getNum();
},
onLoad() {
- if (this.$store.state.billFlag == true) {
- this.dataTwo.push({
- title: "模拟考试",
- img: "/static/workbench/task5.png",
- url: "/pages/exam/startexam",
- });
- }
+ // if (this.$store.state.billFlag == true) {
+ // this.dataTwo.push({
+ // title: "模拟考试",
+ // img: "/static/workbench/task5.png",
+ // url: "/pages/exam/startexam",
+ // });
+ // }
},
onBackPress(e) {
console.log("监听返回按钮事件2", e);
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d89dc1e..657442c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -301,6 +301,12 @@
type: 'warning',
})
return;
+ }else if (index == 3) {
+ this.$refs.uToast.show({
+ title: '功能研发中',
+ type: 'warning',
+ })
+ return;
} else {
uni.navigateTo({
url: url
@@ -333,7 +339,8 @@
method: 'GET',
data: {
current: this.page,
- size: this.pagesize
+ size: this.pagesize,
+ rolename: this.$store.state.UserData.role_name
},
success: (res) => {
if (res.data.code == 200) {
diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 90909d2..3ac9181 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -92,7 +92,7 @@
// return callback(new Error('手机号格式不正确'));
// }
// }
-
+
if (identity.test(value)) {
this.form.carId = value;
return true
@@ -101,7 +101,7 @@
}
// if (value.length > 11) {
-
+
// }
};
@@ -176,7 +176,7 @@
title: '手机号',
img: 'phone-fill',
froms: 'phone',
- requireds: false,
+ requireds: true,
placeholder: '请输入真实手机号'
},
// {
@@ -256,6 +256,24 @@
required: true,
message: '请输入真实姓名',
// 可以单个或者同时写两个触发验证方式
+ trigger: ['change', 'blur'],
+ }],
+ phone: [{
+ required: true,
+ message: '请输入正确的手机号',
+ // 可以单个或者同时写两个触发验证方式
+ trigger: ['change', 'blur'],
+ }, {
+ validator: (rule, value, callback) => {
+ var phone = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;
+
+ if (phone.test(value)) {
+ this.form.phone = value;
+ return true
+ } else {
+ return callback(new Error('手机号格式不正确'));
+ }
+ },
trigger: ['change', 'blur'],
}],
jobUnit: [{
@@ -386,26 +404,26 @@
return
}
var that = this;
-
+
//判断是否必填警号和工作地点
- if(that.form.role == "民警"){
+ if (that.form.role == "民警") {
that.rules.signals[0].required = true;
}
-
- if(that.jobValue == "有"){
+
+ if (that.jobValue == "有") {
that.rules.jobUnit[0].required = true;
that.rules.xq[0].required = true;
}
-
+
that.$refs.uForm.validate(valid => {
if (valid) {
that.registerEvent()
- }else{
+ } else {
return
}
});
-
-
+
+
uni.request({
url: that.$store.state.piAPI + '/zc/inspect',
method: 'GET',
--
Gitblit v1.9.3