Skip to content

B
binhai-people
Commit b9257acd authored by 盖献康's avatar 盖献康
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b643346e 35acc9d2
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 53 deletions
src/views/mobilityServices/index.vue
View file @ b9257acd
......@@ -36,7 +36,7 @@ border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1re
</bm-info-window>
<bm-control class="map__control" @wheel.native.stop>
<el-tabs class="tab-pane-style" type="border-card" v-model="operationTypeName"
@tab-click="clearAllRouteResult">
@tab-click="wrapTabChange">
<!--路径规划-->
<el-tab-pane active-background-color="#f0f0f0" label="路径规划" name="pathPlanning">
<div slot="label" style="text-align: center;">路径规划</div>
......@@ -918,17 +918,19 @@ export default {
},
/*地图加载完成*/
mapReady({BMap, map}) {
/*输入框赋值*/
this.navigator.form.start = this.$route.params.start
/*输入框赋值*/
this.navigator.form.end = this.$route.params.end
/*起始经纬度赋值*/
this.navigator.formControl.start.location = [this.$route.params.stratLocation.lat, this.$route.params.stratLocation.lng]
/*目的地经纬度赋值*/
this.navigator.formControl.end.location = [this.$route.params.endLocation.lat, this.$route.params.endLocation.lng]
console.log("起始点传进来的经纬度", this.navigator.formControl.start.location)
console.log("目的地传进来的经纬度", this.navigator.formControl.end.location)
this.direction()
if (this.$route.params.start && this.$route.params.end) {
/*输入框赋值*/
this.navigator.form.start = this.$route.params.start
/*输入框赋值*/
this.navigator.form.end = this.$route.params.end
/*起始经纬度赋值*/
this.navigator.formControl.start.location = [this.$route.params.stratLocation.lat, this.$route.params.stratLocation.lng]
/*目的地经纬度赋值*/
this.navigator.formControl.end.location = [this.$route.params.endLocation.lat, this.$route.params.endLocation.lng]
console.log("起始点传进来的经纬度", this.navigator.formControl.start.location)
console.log("目的地传进来的经纬度", this.navigator.formControl.end.location)
this.direction()
}
this.BMap = BMap
this.map = map
// 加载事故点
......@@ -1059,12 +1061,16 @@ export default {
})
})
},
/**
* 最外层tab切换
*/
wrapTabChange() {
this.handleSearch(2)
this.clearAllRouteResult()
},
/*清除所有的线路规划结果*/
clearAllRouteResult() {
this.handleSearch(2)
this.map.clearOverlays()
},
/*公交导航 originObj 起点对象 {lat, lng} destinationObj 终点对象 {lat, lng}
* origin 起点[纬度,经度] destination 终点[纬度,经度] origin_uid 起点uid? destination_uid 终点uid? */
......
src/views/personalCenter/registration.vue
View file @ b9257acd
<template>
<div class="resetPwdList">
<nav-list></nav-list>
<!-- <com-layout-wrapper class="resetPwd">-->
<nav-list />
<!-- <com-layout-wrapper class="resetPwd">-->
<div class="tab-container">
<img style="width: 600px; margin: 0px 180px 0px 0px" src="@/assets/loginImage/loginBiaoyu.png" />
<img style="width: 600px; margin: 0px 180px 0px 0px" src="@/assets/loginImage/loginBiaoyu.png">
<el-form
style="background-color:#ffffff; border: 1px solid #c8c9cc; padding: 20px 20px 20px 20px; width: 400px; border-radius: 5px"
ref="resetPasswordForm"
class="resetPasswordForm"
:model="resetPasswordForm"
:rules="resetPasswordFormRules"
label-width="100px"
ref="resetPasswordForm"
style="background-color:#ffffff; border: 1px solid #c8c9cc; padding: 20px 20px 20px 20px; width: 400px; border-radius: 5px"
class="resetPasswordForm"
:model="resetPasswordForm"
:rules="resetPasswordFormRules"
label-width="100px"
>
<h3 style="text-align: center; font-size: 20px">个人用户注册</h3>
<el-form-item label="登录名" prop="userName">
<el-input
v-model="resetPasswordForm.userName"
type="text"
placeholder="请输入登录名"
v-model="resetPasswordForm.userName"
type="text"
placeholder="请输入登录名"
/>
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input
v-model.trim="resetPasswordForm.password"
type="password"
placeholder="请输入您的密码"
v-model.trim="resetPasswordForm.password"
type="password"
placeholder="请输入您的密码"
/>
</el-form-item>
<el-form-item label="重复密码" prop="confirmedPassword">
<el-input
v-model.trim="resetPasswordForm.confirmedPassword"
type="password"
placeholder="请再次输入您的密码"
v-model.trim="resetPasswordForm.confirmedPassword"
type="password"
placeholder="请再次输入您的密码"
/>
</el-form-item>
<el-form-item label="联系电话" prop="phonenumber">
<!-- <el-input-->
<!-- onkeyup="value=value.replace(/[^\d]/g, '')"-->
<!-- v-model="resetPasswordForm.phonenumber"-->
<!-- maxlength="11"-->
<!-- type="text"-->
<!-- placeholder="请输入联系电话"-->
<!-- />-->
<!-- <el-input-->
<!-- onkeyup="value=value.replace(/[^\d]/g, '')"-->
<!-- v-model="resetPasswordForm.phonenumber"-->
<!-- maxlength="11"-->
<!-- type="text"-->
<!-- placeholder="请输入联系电话"-->
<!-- />-->
<el-input
class="delInput"
v-model="resetPasswordForm.phonenumber"
maxlength="11"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
placeholder="请输入联系电话"
></el-input>
v-model="resetPasswordForm.phonenumber"
class="delInput"
maxlength="11"
type="number"
oninput="if(value.length>11)value=value.slice(0,11)"
placeholder="请输入联系电话"
/>
</el-form-item>
<el-form-item label="邮箱地址" prop="email">
<el-input
v-model="resetPasswordForm.email"
maxlength="50"
show-word-limit
placeholder="请输入您的邮箱地址"
v-model="resetPasswordForm.email"
maxlength="50"
show-word-limit
placeholder="请输入您的邮箱地址"
/>
</el-form-item>
<div>
......@@ -71,7 +71,7 @@
</el-form>
</div>
<!-- </com-layout-wrapper>-->
<!-- </com-layout-wrapper>-->
</div>
</template>
......@@ -112,6 +112,18 @@ export default {
}
}
}
var checkPhone = (rule, value, callback) => { // 手机号验证
if (!value) {
return callback(new Error('手机号不能为空'))
} else {
const reg = /^1[3456789]\d{9}$/
if (reg.test(value)) {
callback()
} else {
return callback(new Error('请输入正确的手机号'))
}
}
}
return {
// 确认密码
resetPasswordForm: {
......@@ -131,7 +143,8 @@ export default {
{ required: true, validator: confirmPasswordValidator, trigger: 'blur' }
],
phonenumber: [
{ required: true, message: '请输入联系电话', trigger: 'blur' }
{ required: true, message: '请输入联系电话', trigger: 'blur' },
{ required: true, validator: checkPhone, trigger: 'blur' }
],
email: [
{ required: true, message: '请输入邮箱地址', trigger: 'blur' },
......
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