Skip to content

html / poolin_app

Go to a project
Commit 19fba810 by zhanghui
Options

Merge branch 'zhanghui' into 'develop' 

fixbug



See merge request !3
parents 6912fc8c 93f17d65
Showing with 184 additions and 28 deletions
.project 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>poolin_app</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
</natures>
<filteredResources>
<filter>
<id>1515998052458</id>
<name></name>
<type>26</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
index.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta content="telephone=no" name="format-detection" /> <meta content="telephone=no" name="format-detection" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta http-equiv="Cache-Control" content="no-siteapp" /> <meta http-equiv="Cache-Control" content="no-siteapp" />
<link rel="stylesheet" href="//at.alicdn.com/t/font_538501_3ahpprkf1ug14i.css" /> <link rel="stylesheet" href="//at.alicdn.com/t/font_538501_5mndck7tpvsoflxr.css" />
<script src="https://cdn.bootcss.com/underscore.js/1.8.3/underscore-min.js"></script> <script src="https://cdn.bootcss.com/underscore.js/1.8.3/underscore-min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/tween.js@16.3.4"></script> <script src="https://cdn.jsdelivr.net/npm/tween.js@16.3.4"></script>
<title>poolin_app</title> <title>poolin_app</title>
......
src/assets/less/function.less
...@@ -244,5 +244,11 @@ ...@@ -244,5 +244,11 @@
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='@color1', endColorstr='@color2',GradientType=1 ); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='@color1', endColorstr='@color2',GradientType=1 );
/* IE6-9 fallback on horizontal gradient */ /* IE6-9 fallback on horizontal gradient */
} }
h1,h2,h3,h4,h5,h6 {.font-wn;}
.ohz(){overflow: hidden; zoom:1;} .ohz(){overflow: hidden; zoom:1;}
.fs36 {font-size:0.36rem;}
.fs32 {font-size:0.32rem;}
.fs30 {font-size:0.3rem;}
.fs28 {font-size:0.28rem;}
.fs26 {font-size:0.26rem;}
.fs24 {font-size:0.24rem;}
src/assets/less/style.less
...@@ -65,13 +65,19 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -65,13 +65,19 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
/*复用颜色*/ /*复用颜色*/
@blue:#103f73; @blue:#103f73;
@fontBlue1:#1c5fa9;
@fontBlue2:#6c87b2;
@gray:#727272;
.c-blue1 {color: @fontBlue1;}
.c-blue2 {color: @fontBlue2;}
.bg-blue{background: #ededf2;}
/*样式修正*/ /*样式修正*/
.mint-header {background:@blue;}
.button-primary {background:@blue;border-color:@blue; box-shadow: 0 0.2rem 0.3rem rgba(16,63,115,0.2);} .button-primary {background:@blue;border-color:@blue; box-shadow: 0 0.2rem 0.3rem rgba(16,63,115,0.2);
&.is-disabled { background: #d6dbe5; box-shadow: none; border-color:#d6dbe5;}
}
.page {width:100%;height:100%; overflow: hidden;.pos(a); .page {width:100%;height:100%; overflow: hidden;.pos(a);
...@@ -120,13 +126,27 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -120,13 +126,27 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
img {width:3rem; height:auto;} img {width:3rem; height:auto;}
} }
.form-content {padding:0 1rem; .form-content {padding:0 1rem;
.el-input__inner {height:0.9rem;border-radius: 0.45rem;font-size:0.32rem;} .el-input__inner {height:0.9rem;border-radius: 0.45rem;font-size:0.32rem; }
.el-form-item__content {line-height: 0.9rem;} .el-form-item__content {line-height: 0.9rem;}
.el-input__prefix {left:0.3rem;} .el-input__prefix {left:0.3rem;}
.el-input--prefix .el-input__inner{padding-left: 0.88rem;} .el-input--prefix .el-input__inner{padding-left: 0.88rem;}
.iconfont {font-size:0.4rem;} .iconfont {font-size:0.4rem;}
} }
} }
.reg {.login;}
.create {
.el-form-item {background: #fff; padding: 0rem 0.3rem;
.el-input {padding:0.1rem 0;}
.el-input__inner {border: 0px; padding:0; font-size: 0.32rem;}
}
label {font-size: 0.28rem;color: @gray; padding:0.2rem 0.3rem;.d-b;}
.coin-area {background: #fff; padding: 0.2rem 0.3rem;
label {padding: 0;}
}
.descript-list {line-height: 1.5; text-align: justify;
li {padding:0.1rem 0; color: @gray;}
}
}
.btn-group { .ohz; .btn-group { .ohz;
&.full { &.full {
button {width: 100%; margin-bottom: 0.4rem;} button {width: 100%; margin-bottom: 0.4rem;}
...@@ -135,6 +155,31 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -135,6 +155,31 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
.el-button {font-size: 0.36rem;} .el-button {font-size: 0.36rem;}
} }
} }
.btn-coin {border: 1px solid #dcdedf;.fl; margin:0.2rem; padding:0;.pos(r);
input {.pos(a); left:0;top:0; opacity:0;}
b {.d-b;vertical-align:middle;padding:0.15rem 0.3rem 0.15rem 0.9rem;background-size:0.5rem 0.5rem; background-repeat: no-repeat; background-position: 0.3rem center;.eq-font; color: #999;}
.ltc {background-image:url(../img/index-tab1.png);}
.eth {background-image:url(../img/index-tab2.png);}
.dash {background-image:url(../img/index-tab3.png);}
.xmr {background-image:url(../img/index-tab4.png);}
.btc {background-image:url(../img/index-tab5.png);}
.sc {background-image:url(../img/index-tab6.png);}
.zcash {background-image:url(../img/index-tab7.png);}
.doge {background-image:url(../img/index-tab8.png);}
&.active { border-color: @blue;
b {color: @blue;}
.ltc {background-image:url(../img/index-tab1-active.png);}
.eth {background-image:url(../img/index-tab2-active.png);}
.dash {background-image:url(../img/index-tab3-active.png);}
.xmr {background-image:url(../img/index-tab4-active.png);}
.btc {background-image:url(../img/index-tab5-active.png);}
.sc {background-image:url(../img/index-tab6-active.png);}
.zcash {background-image:url(../img/index-tab7-active.png);}
.doge {background-image:url(../img/index-tab8-active.png);}
}
}
.v {font-size: 0.4rem; color: #252525} .v {font-size: 0.4rem; color: #252525}
.k {font-size:0.26rem; color: #252525; margin-left: 0.1rem;} .k {font-size:0.26rem; color: #252525; margin-left: 0.1rem;}
.title { .font-wn; .title { .font-wn;
...@@ -159,4 +204,5 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -159,4 +204,5 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
.mobile-ios { .mobile-ios {
.page-header {padding-top: 20px;} .page-header {padding-top: 20px;}
.page-content {top:66px;} .page-content {top:66px;}
} }
\ No newline at end of file
src/components/Create.vue
<template> <template>
<div class=""> <div class="page create">
{{msg}} <button @click="dashboard">跳转到子账户面板</button> <div class="page-header" flex="main:justify cross:center">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
<div class="title">创建子账户</div>
<div class="btns"></div>
</div>
<div class="page-content bg-blue">
<el-form :model="createFrom" :rules="createRules" ref="createFrom">
<label for="">设置子账户名</label>
<el-form-item prop="username">
<el-input v-model="createFrom.username" auto-complete="off" placeholder="输入子账户名，4-30个小写字母或数字"></el-input>
</el-form-item>
<label for="">选择此子账户优先显示的币种</label>
<div class="coin-area f-cb">
<label class="btn-coin" :class="defaultCoin=='ltc'?'active':''"><b class="ltc">LTC</b>
<input type="radio" id="ltc" value="ltc" v-model="defaultCoin">
</label>
<label class="btn-coin" :class="defaultCoin=='eth'?'active':''"><b class="eth">ETH</b>
<input type="radio" id="eth" value="eth" v-model="defaultCoin">
</label>
<label class="btn-coin" :class="defaultCoin=='dash'?'active':''"><b class="dash">DASH</b>
<input type="radio" id="dash" value="dash" v-model="defaultCoin">
</label>
<label class="btn-coin" :class="defaultCoin=='xmr'?'active':''"><b class="xmr">XMR</b>
<input type="radio" id="xmr" value="xmr" v-model="defaultCoin">
</label>
</div>
<label for="">当切换到该子账户时，将默认显示该币种</label>
<div class='btn-group full pl30 pr30 mt50'>
<el-button type="primary" class="button-primary" round disabled v-if="!showBtn">确定</el-button>
<el-button type="primary" class="button-primary" round v-else>确定</el-button>
</div>
</el-form>
<div class="p30">
<ul class="descript-list">
<li>• 子账户支持多个币种和多个地区挖矿，你可以创建多个子账户管理不同的币种和地区挖矿。</li>
<li>• 您最多可设置50个子账户。这一子账户名称加上矿机编号即为矿机设置页的矿机名（worker  name），如: "zizhanghu.001"，"zizhangh</li>
</ul>
</div>
</div>
<!-- {{msg}} <button @click="dashboard">跳转到子账户面板</button> -->
</div> </div>
</template> </template>
<script> <script>
...@@ -8,16 +47,25 @@ export default { ...@@ -8,16 +47,25 @@ export default {
name: 'create', name: 'create',
data() { data() {
return { return {
msg: '创建子账户' msg: '创建子账户',
createFrom: {
username: ''
},
defaultCoin: '',
createRules: {
username: [
{ required: true, message: '请输入子账户名称', trigger: 'blur' },
{ min: 4, max: 30, message: '子账户名长度不够，请输入4-30个字母或数字', trigger: 'blur' }
]
},
showBtn:false
} }
}, },
mounted() { mounted() {},
},
methods: { methods: {
dashboard(){ goBack() {
this.$router.replace("/my/puid/coin_type/region_id/dashboard") this.$router.go(-1)
} },
} }
} }
......
src/components/Login.vue
...@@ -13,17 +13,18 @@ ...@@ -13,17 +13,18 @@
<el-input v-model="loginForm.email" placeholder="输入邮箱"><i slot="prefix" class="iconfont icon-email"></i></el-input> <el-input v-model="loginForm.email" placeholder="输入邮箱"><i slot="prefix" class="iconfont icon-email"></i></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password" label="" :rules="[{ required: true, message: '请输入密码', trigger: 'blur' }]"> <el-form-item prop="password" label="" :rules="[{ required: true, message: '请输入密码', trigger: 'blur' }]">
<el-input v-model="loginForm.password" type="password" placeholder="输入密码"><i slot="prefix" class="iconfont icon-password"></i></el-input> <el-input v-model="loginForm.password" type="password" placeholder="输入密码"><i slot="prefix" class="iconfont icon-password"></i></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="btn-group full mt100"> <div class="btn-group full mt100">
<el-button type="primary" round @click="submitForm('loginForm')" class="button-primary">提交</el-button> <el-button type="primary" round @click="submitForm('loginForm')" class="button-primary">提交</el-button>
</div> </div>
<div class="f-tac">
<router-link to="/forget" class="c-blue">忘记密码?</router-link>
</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class=""></div>
<!-- <button @click="loginOk">登录成功后！</button> -->
</div> </div>
</div> </div>
</template> </template>
...@@ -35,7 +36,7 @@ export default { ...@@ -35,7 +36,7 @@ export default {
msg: '用户登录页', msg: '用户登录页',
loginForm: { loginForm: {
email: '', email: '',
password:'' password: ''
} }
} }
}, },
...@@ -43,9 +44,6 @@ export default { ...@@ -43,9 +44,6 @@ export default {
}, },
methods: { methods: {
// loginOk() {
// this.$router.replace('/jump')
// },
goBack() { goBack() {
this.$router.go(-1) this.$router.go(-1)
}, },
......
src/components/Reg.vue
<template> <template>
<div class="page"> <div class="page reg">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header" flex="main:justify cross:center">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div>
<div class="title">注册</div> <div class="title">注册</div>
<div class="btns" @click="goLogin">登录</div> <div class="btns" @click="goLogin">登录</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div v-if="step===1">
<!-- <button @click="loginOk">注册成功后？重新登录：直接跳jump！</button> --> <h2 class="f-tac c-blue2 fs36 pt80 pb60">使用邮箱地址注册</h2>
<div class="form-content">
<el-form :model="regForm" ref="regForm" label-width="0px">
<el-form-item prop="email" label="" :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur,change' }]">
<el-input v-model="regForm.email" placeholder="输入邮箱"><i slot="prefix" class="iconfont icon-email"></i></el-input>
</el-form-item>
<el-form-item>
<div class="btn-group full mt100">
<el-button type="primary" round @click="submitForm('regForm')" class="button-primary">提交</el-button>
</div>
<!-- <div class="f-tac">
<router-link to="" class="c-blue1">使用手机号注册>></router-link>
</div> -->
</el-form-item>
</el-form>
</div>
</div>
<div v-if="step===2">123123</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -16,12 +33,26 @@ export default { ...@@ -16,12 +33,26 @@ export default {
name: 'reg', name: 'reg',
data() { data() {
return { return {
regForm: {
email: ''
},
step: 1
} }
}, },
mounted() { mounted() {
}, },
methods: { methods: {
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.$router.replace('/jump')
} else {
console.log('error submit!!');
return false;
}
});
},
goBack() { goBack() {
this.$router.go(-1) this.$router.go(-1)
}, },
......
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