Skip to content

html / poolin_app

Go to a project
Commit 2ed978d7 by zhanghui
Options

Merge branch 'gaolei' into 'develop' 

Gaolei



See merge request !14
parents 78b54381 8ddb3f40
Showing with 286 additions and 6 deletions
src/assets/less/style3.less
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
h1,h3,b{font-weight: 400; } h1,h3,b{font-weight: 400; }
b {text-transform: uppercase;font-size: .20rem;margin-left: .08rem;display: inline-block;} b {text-transform: uppercase;font-size: .20rem;margin-left: .08rem;display: inline-block;}
.pay-list {position: fixed;z-index: 9; left: 0; right: 0; height: 3.15rem; background-color: #103f73; color: #fff; box-sizing: border-box; .pay-list {position: fixed;z-index: 9; left: 0; right: 0; height: 3.15rem; background-color: #103f73; color: #fff; box-sizing: border-box;
h1 {font-size: .90rem; span{color: #fff}
b {font-size: .48rem; } .v1{font-size: .90rem}
} .k1{font-size: .48rem}
.v2{font-size: .30rem;}
.k2{width: 2.8rem;}
h3 {font-size: .24rem;color: #c3cfdc;} h3 {font-size: .24rem;color: #c3cfdc;}
p{font-size: .30rem;}
.d2{width: 2.8rem;}
i{font-size: .22rem;color: #dbe2ea;display: inline-block; vertical-align: top;margin-left: .05rem;} i{font-size: .22rem;color: #dbe2ea;display: inline-block; vertical-align: top;margin-left: .05rem;}
} }
.balance-list {margin: 3.35rem 0 .05rem 0;font-size: .34rem;background: #fff; .balance-list {margin: 3.35rem 0 .05rem 0;font-size: .34rem;background: #fff;
...@@ -144,3 +144,32 @@ ...@@ -144,3 +144,32 @@
} }
} }
} }
//manager
//admin-list
.admin-list{background-color: #ededf2;
a{.pos(r);
&:after{.line.xb;}
}
}
//setEmail
.setEmail{background-color: #ededf2;
label{display: block;font-size: 0.28rem; color: #6c87b2;padding: 0 0 0 .30rem;}
.label{padding: 0.2rem 0.3rem; }
.el-input__inner{border:none;border-radius: 0;}
.el-form-item{margin-bottom: 0;background-color: #fff;}
.el-form-item__error{padding:.10rem 15px;}
.el-row{background-color: #fff;line-height: 40px;}
.el-col-8{.tr;padding-right: 15px;}
.btn-code{box-shadow: none;vertical-align: middle;}
.input_custom.is-disabled .el-input__inner{background-color: #fff;color: #1c5fa9;}
.el-form-item__error{z-index: 99999;}
.el-form-item.is-required .el-form-item__label:before{content: ''}
.line{
.el-form-item{.pos(r);
&:after{.line.xb;}
}
}
}
src/components/Dashboard/index.vue
...@@ -252,5 +252,4 @@ export default { ...@@ -252,5 +252,4 @@ export default {
}, },
} }
}; };
</script> </script>
src/components/Dashboard/region.vue
...@@ -20,6 +20,7 @@ export default { ...@@ -20,6 +20,7 @@ export default {
language: localStorage.getItem('language'), language: localStorage.getItem('language'),
regions: [] regions: []
} }
}, },
mounted() { mounted() {
......
src/components/Users/Manager/Admin.vue 0 → 100644
<template>
<div class="page admin-list">
<div class="page-header" flex="main:justify cross:center">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
<div class="title">{{msg}}</div>
<div class="btns"></div>
</div>
<div class="page-content">
<div class="mt40">
<mt-cell title="登录名">
<span class="fore-link-text">abc***@gmail.com</span>
</mt-cell>
</div>
<div class="mt40">
<mt-cell title="邮箱" v-if="!email" is-link to="/setEmail">
<span class="fore-link-text">设置</span>
</mt-cell>
<mt-cell title="邮箱" v-else is-link>
<span class="fore-link-text">{{email}}</span>
</mt-cell>
<mt-cell title="修改密码" is-link></mt-cell>
</div>
</div>
</div>
</template>
<script>
export default {
name: "Admin",
data() {
return {
msg: '账户管理',
email: ''
};
},
computed: {
},
mounted() {},
methods: {
goBack() {
//this.$router.go(-1);
},
}
};
</script>
src/components/Users/Manager/SetEmail.vue 0 → 100644
<template>
<div class="page setEmail">
<div class="page-header" flex="main:justify cross:center">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
<div class="title">{{msg}}</div>
<div class="btns"></div>
</div>
<div class="page-content">
<!-- 未设置邮箱 -->
<el-form :model="setEmail" ref="setEmail" label-width="0px">
<label class="label" for="">请输入你的邮箱地址</label>
<el-form-item prop="email" label="" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur,change' }]">
<el-input v-model="setEmail.email" placeholder="输入邮箱"></el-input>
</el-form-item>
<div class='btn-group full pl30 pr30 mt70'>
<el-button type="primary" round @click="submitForm('setEmail')" :disabled="!showBtnEmail">下一步</el-button>
</div>
</el-form>
<!-- 未设置邮箱 -->
<!-- 已设置邮箱 -->
<el-form label-width="0px">
<label class="label" for="">你的邮箱地址为</label>
<el-form-item>
<el-input disabled v-model="messageEmail" class="input_custom"></el-input>
</el-form-item>
</el-form>
<!-- 已设置邮箱 -->
<!-- 输入验证码 -->
<el-form :model="setCode" ref="setCode" label-width="0px">
<label class="label" for="">已发送验证码到您的邮箱，请检查邮箱，在下方输入验证码</label>
<el-row>
<el-col :span="16">
<el-form-item prop="code" label="" :rules="[
{ required: true, message: '请输入验证码', trigger: 'blur,change' },
{ min: 6, max: 6, message: '请输入6位数字验证码', trigger: 'blur,change' }
]">
<el-input v-model="setCode.code" placeholder="请输入6位数字验证码"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-button type="primary" class="btn-code" size="small" :disabled="!showCode" @click="getCode">{{text}}</el-button>
</el-col>
</el-row>
<div class='btn-group full pl30 pr30 mt70'>
<el-button type="primary" round @click="submitForm('setCode')" :disabled="!showBtnCode">提交</el-button>
</div>
</el-form>
<!-- 输入验证码 -->
<!-- 修改密码 -->
<el-form status-icon :model="setPwd" ref="setPwd" :rules="modifyPsd" :label-position="labelPosition" label-width="85px">
<div class="mb85">
<el-form-item label="原密码" prop="usedPsd" :rules="[
{ required: true, message: '请输入原密码', trigger: 'blur,change' },
]">
<el-input type="password" v-model="setPwd.usedPsd" auto-complete="off"></el-input>
</el-form-item>
</div>
<div class="line">
<el-form-item label="密码" prop="newPsd">
<el-input type="password" v-model="setPwd.newPsd" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="checkPsd">
<el-input type="password" v-model="setPwd.checkPsd" auto-complete="off"></el-input>
</el-form-item>
</div>
<div class='btn-group full pl30 pr30 mt70'>
<el-button type="primary" round @click="submitForm('setPwd')" :disabled="!showBtnPwd">提交</el-button>
</div>
</el-form>
<!-- 修改密码 -->
</div>
</div>
</template>
<script>
export default {
name: "setEmail",
data() {
var validatePass = (rule, value, callback) => {
if (value === null) {
callback(new Error('请再次输入密码'));
} else if (value !== this.setPwd.newPsd) {
callback(new Error('两次输入密码不一致!'));
} else {
callback();
}
}
return {
msg: "设置邮箱",
setEmail: {
email: ''
},
messageEmail: 'abc***@gmail.com',
setCode: {
code: ''
},
count: '',
showCode: true,
timer: null,
text: "获取验证码",
setPwd: {
usedPsd: null,
newPsd: null,
checkPsd: null
},
labelPosition: 'left',
modifyPsd: {
newPsd: [
{ required: true, message: '请输入新密码', trigger: 'blur,change' },
{
min: 6,
max: 18,
message: "密码过短，密码为6-18位数字+字母",
trigger: "blur,change"
}
],
checkPsd: [
{ validator: validatePass, trigger: 'blur,change' },
]
},
}
},
computed: {
showBtnEmail: function() {
return this.setEmail.email;
},
showBtnCode: function() {
return this.setCode.code;
},
showBtnPwd: function() {
return this.setPwd.usedPsd && this.setPwd.newPsd && this.setPwd.checkPsd;
},
},
mounted() {},
methods: {
goBack() {
this.$router.go(-1);
},
//设置邮箱
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
//this.$router.replace('/jump')
} else {
console.log('error submit!!');
return false;
}
});
},
//输入验证码
getCode() {
const TIME_COUNT = 60;
if (!this.timer) {
this.count = TIME_COUNT;
this.showCode = false;
this.timer = setInterval(() => {
if (this.count > 0 && this.count <= TIME_COUNT) {
this.text = this.count + 's 后重新获取'
this.count--;
} else {
this.showCode = true;
this.text = '获取验证码'
clearInterval(this.timer);
this.timer = null;
}
}, 1000)
}
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
//this.$router.replace('/jump')
this.$toast({
message: '邮箱已设置~',
iconClass: 'iconfont icon-dui'
});
} else {
console.log('error submit!!');
return false;
}
});
},
//修改密码
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
//this.$router.replace('/jump')
this.$toast({
message: '密码设置成功~',
iconClass: 'iconfont icon-dui'
});
} else {
console.log('error submit!!');
return false;
}
});
},
}
};
</script>
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 sign in to comment