Skip to content

C
campSite
Commit dda620ea authored by ‘yangmengxue’'s avatar ‘yangmengxue’
Browse files
Options

监护人信息

parent 586dacfb
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 100 deletions
src/common/validator.js
View file @ dda620ea
...@@ -22,6 +22,19 @@ export default { ...@@ -22,6 +22,19 @@ export default {
} else { } else {
callback() callback()
} }
},
validatePhone2: function (rule, value, callback) {
if (value.length > 0) {
if (!phoneReg.test(value) || value.length !== 11) {
callback(new Error('手机号格式错误！'))
} else {
callback()
}
} else {
callback()
}
}, },
validateid_card: function (rule, value, callback) { validateid_card: function (rule, value, callback) {
...@@ -31,8 +44,8 @@ export default { ...@@ -31,8 +44,8 @@ export default {
return callback(new Error("你输入的身份证长度或格式错误")); return callback(new Error("你输入的身份证长度或格式错误"));
} }
} }
callback(); callback();
}, },
// 数字验证 // 数字验证
validateNumber: function (rule, value, callback) { validateNumber: function (rule, value, callback) {
......
src/components/index/SignUp/referInfo.vue
View file @ dda620ea
...@@ -742,79 +742,79 @@ ...@@ -742,79 +742,79 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div>
<!-- 监护人信息 --> <!-- 监护人信息 -->
<div <div
v-show=" v-show="
configJson.guardianName == 1 || configJson.guardianName == 1 ||
configJson.guardianPhone == 1 || configJson.guardianPhone == 1 ||
configJson.guardianCard == 1 configJson.guardianCard == 1
" "
> >
<div class="cont_title">监护人信息</div> <div class="cont_title">监护人信息</div>
<el-row :gutter="20"> <el-row :gutter="20">
<!-- 监护人姓名 --> <!-- 监护人姓名 -->
<el-col :span="8" v-show="configJson.guardianName == 1"> <el-col :span="8" v-show="configJson.guardianName == 1">
<el-form-item <el-form-item
:rules=" :rules="
configJson.guardianName == 1 configJson.guardianName == 1
? referInfoRules.guardian_name ? referInfoRules.guardian_name
: [{ required: false }] : [{ required: false }]
" "
label="监护人姓名" label="监护人姓名"
prop="guardian_name" prop="guardian_name"
> >
<el-input <el-input
clearable clearable
placeholder="填写监护人姓名" placeholder="填写监护人姓名"
ref="code" ref="code"
size="small" size="small"
v-model="referForm.guardian_name" v-model="referForm.guardian_name"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 监护人联系电话 --> <!-- 监护人联系电话 -->
<el-col :span="8" v-show="configJson.guardianPhone == 1"> <el-col :span="8" v-show="configJson.guardianPhone == 1">
<el-form-item <el-form-item
:rules=" :rules="
configJson.guardianPhone == 1 configJson.guardianPhone == 1
? referInfoRules.guardian_phone ? referInfoRules.guardian_phone
: [{ required: false }] : [{ required: false }]
" "
label="监护人联系电话" label="监护人联系电话"
prop="guardian_phone" prop="guardian_phone"
> >
<el-input <el-input
clearable clearable
placeholder="填写监护人联系电话" placeholder="填写监护人联系电话"
ref="code" ref="code"
size="small" size="small"
v-model="referForm.guardian_phone" v-model="referForm.guardian_phone"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 监护人身份证号 --> <!-- 监护人身份证号 -->
<el-col :span="8" v-show="configJson.guardianCard == 1"> <el-col :span="8" v-show="configJson.guardianCard == 1">
<el-form-item <el-form-item
:rules=" :rules="
configJson.guardianCard == 1 configJson.guardianCard == 1
? referInfoRules.guardian_card ? referInfoRules.guardian_card
: [{ required: false }] : [{ required: false }]
" "
label="监护人身份证号" label="监护人身份证号"
prop="guardian_card" prop="guardian_card"
> >
<el-input <el-input
clearable clearable
placeholder="填写监护人身份证号" placeholder="填写监护人身份证号"
ref="code" ref="code"
size="small" size="small"
v-model="referForm.guardian_card" v-model="referForm.guardian_card"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div>
</div> </div>
<!-- 学校信息 --> <!-- 学校信息 -->
<div <div
...@@ -964,7 +964,14 @@ ...@@ -964,7 +964,14 @@
</div> </div>
</div> </div>
<!-- 学习成绩证明材料 --> <!-- 学习成绩证明材料 -->
<div> <div
v-show="
configJson.achievementPath == 1 ||
configJson.transcripts == 1 ||
configJson.achievementCertificate == 1 ||
configJson.safetyNotices == 1
"
>
<div class="cont_title">相关资料</div> <div class="cont_title">相关资料</div>
<div class="bgPic"> <div class="bgPic">
<div class="bgInfo"> <div class="bgInfo">
...@@ -1455,29 +1462,28 @@ export default { ...@@ -1455,29 +1462,28 @@ export default {
}, },
{ validator: validator.validatePhone, trigger: "blur" }, { validator: validator.validatePhone, trigger: "blur" },
], ],
guardian_name: [ // guardian_name: [
{ // {
required: true, // required: true,
message: "监护人姓名不能为空！", // message: "监护人姓名不能为空！",
trigger: "blur", // trigger: "blur",
}, // },
], // ],
guardian_phone: [ guardian_phone: [
{ // {
required: true, // required: true,
message: "监护人联系电话不能为空！", // message: "监护人联系电话不能为空！",
trigger: "blur", // trigger: "blur",
}, // },
{ validator: validator.validatePhone, trigger: "blur" }, { validator: validator.validatePhone2, trigger: "blur" },
], ],
guardian_card: [ guardian_card: [
{ // {
required: true, // required: true,
message: "监护人身份证号不能为空！", // message: "监护人身份证号不能为空！",
trigger: "blur", // trigger: "blur",
}, // },
{ validator: validator.validateid_card, trigger: "blur" }, { validator: validator.validateid_card, trigger: "blur" },
], ],
clothesSize: [ clothesSize: [
{ {
......
src/config/server.js
View file @ dda620ea
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
// export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket // export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
// 正式 // 正式
// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境 export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境 export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
// 测试 // 测试
export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境 // export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境
export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境 // export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境
export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket // export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment