Skip to content

html / poolin_app

Go to a project
Commit ed4ddfe6 by zhanghui
Options

Merge branch 'jingjie' into 'develop' 

Jingjie



See merge request !7
parents 3fae32a4 3d6310c1
Showing with 131 additions and 18 deletions
package-lock.json
......@@ -8489,15 +8489,6 @@
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
},
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
......@@ -8540,6 +8531,15 @@
}
}
},
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"stringstream": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
......
package.json
......@@ -5,7 +5,7 @@
"author": "xin3w <xin3w@126.com>",
"private": true,
"scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 172.16.4.38",
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 172.16.6.191",
"start": "npm run dev",
"build": "node build/build.js"
},
......
src/components/Login.vue
......@@ -64,7 +64,4 @@ export default {
}
</script>
<style lang="less">
</style>
src/components/Settings.vue
<template>
<div class="">
{{msg}}
<div class="page settings">
<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>
<div class="page-content">
<div class="setting-content">
<div class="settings-group current-subaccount">
<mt-cell title="当前子账户">
<span class="fore-link-text">zhiyuan</span>
<img src="../assets/img/index-tab1-active.png" alt="" class="fore-link-img"/>
</mt-cell>
</div>
<div class="mt40 settings-group subaccount-settings">
<div class="settings-title">子账户设置</div>
<mt-cell title="LTC收益地址" is-link></mt-cell>
<mt-cell title="DOGE补贴地址" is-link></mt-cell>
<mt-cell title="默认币种设置" is-link>
<img src="../assets/img/index-tab1-active.png" alt="" class="fore-link-img"/>
</mt-cell>
</div>
<div class="mt40 settings-group notice-content">
<div class="settings-title">通知公告</div>
<mt-cell title="通知中心" is-link>
<span class="notice-badge">2</span>
</mt-cell>
</div>
<div class="mt40 settings-group alarm-settings">
<div class="settings-title">报警设置</div>
<mt-cell title="当算力<=0TH/s时报警" is-link>
<span class="fore-link-text">已开启</span>
</mt-cell>
<mt-cell title="当活跃矿机数<=1580时报警" is-link>
<span class="fore-link-text">已开启</span>
</mt-cell>
<mt-cell title="同类内容报警间隔" is-link>
<span class="fore-link-text">3小时</span>
</mt-cell>
</div>
<div class="mt40 settings-group alarm-contact">
<mt-cell title="报警联系人" is-link></mt-cell>
</div>
<div class="mt40 settings-group miners-lan">
<mt-cell title="矿机设置" is-link>
<span class="fore-link-text">矿工必看</span>
</mt-cell>
<mt-cell title="语言设置" is-link>
<img src="../assets/img/cn.png" alt="" class="fore-link-lang"/>
</mt-cell>
</div>
</div>
</div>
</div>
</template>
<script>
......@@ -15,12 +66,77 @@ export default {
},
methods: {
goBack() {
this.$router.go(-1)
}
}
}
</script>
<style>
<style lang="less">
.settings{
background: #ededf2;
.page-content{
.setting-content{
padding-top: 0.28rem;
.current-subaccount{
.fore-link-img{
margin-right: 0.1rem;
}
.fore-link-text{
margin-right: 0.08rem;
}
}
.settings-group{
.line(){
&.xb{left: 0; right: 0;height: 1px;width: 100%; background: #ededf2;;content: '';position: absolute;bottom:0;transform: scaleY(0.33) translateY(1px);}
}
box-sizing: border-box;
width: 7.5rem;
.settings-title{
font-size: 0.28rem;
color: #727272;
line-height: 0.28rem;
box-sizing: border-box;
padding:0 0 0.18rem 0.18rem;
}
.mint-cell{
font-size: 0.32rem;
color: #252525;
overflow: visible;
.mint-cell-wrapper{
background-image: none;
}
.fore-link-text{
font-size: 0.28rem;
color: #959595;
}
.fore-link-img{
width: 0.41rem;
height: 0.41rem;
}
.notice-badge{
display: inline-block;
width: 0.41rem;
height: 0.41rem;
line-height: 0.42rem;
text-align: center;
background: #ff0000;
border-radius: 50%;
color: #fff;
}
.fore-link-lang{
width: 0.48rem;
height: 0.32rem;
}
&:after{.line.xb;}
}
.mint-cell:last-child{
background-image: none;
}
}
}
}
}
</style>
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