Commit fac602f9 by zhanghui1

最新合并代码

parent 772f3082
...@@ -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_iihxu81if6r.css" /> <link rel="stylesheet" href="//at.alicdn.com/t/font_538501_lcbajj2vb7ta9k9.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>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"author": "xin3w <xin3w@126.com>", "author": "xin3w <xin3w@126.com>",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 192.168.1.57", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev", "start": "npm run dev",
"build": "node build/build.js" "build": "node build/build.js"
}, },
......
...@@ -98,26 +98,70 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -98,26 +98,70 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
} }
.page {width:100%;height:100%; overflow: hidden;.pos(a); .page {width:100%;height:100%; overflow: hidden;.pos(a);
.page-header {background:@blue;color:#fff;.pos(f); left:0; top:0; right:0; height:44px; z-index: 9999;
.back {width:44px;height:44px; vertical-align: middle;.tc; //moban新定义
i {font-size:30px;.txt-ver(44px);} .page-header{background:@blue;color:#fff;height:44px;z-index: 9999;.pos(r);
//位置
.fix-top {.pos(f); left:0; top:0; right:0; }
.abs-left {.pos(a); left:0;top:0;}
.abs-right {.pos(a); right:0;top:0;}
//左右中布局
.l {width: 100px; height:44px;left: 0;bottom:0;.pos(a);}
.c {font-size:0.36rem;.pos(a); left:100px; right:100px; .tc;.txt-ver(44px);
h3 {.txt-ver(30px);}
p {.pos(a);.d-b;.tc; font-size:0.16rem;left: 0; right:0; bottom:0;.txt-ver(14px);.font-wn;}
} }
.side {.back;} .r {width: 100px; height: 44px; .pos(a); right:0; bottom:0; text-align: right;}
.title {font-size:0.36rem;.pos(a); left:100px; right:100px; .tc;.txt-ver(44px);} //风格设定bg
.btns {font-size:0.36rem; padding:0 15px;} .icon-back {width:44px;height:44px; vertical-align: middle;.tc;.d-b;
.btn-choose-coin{ height: 44px; vertical-align: middle; padding-right: 10px; i {font-size:20px;.txt-ver(44px);}
span {.d-ib; background-size: 32px 32px; width:44px; height: 44px; background-repeat: no-repeat; background-position: center center;.fl;} }
.iconfont {margin-top: 15px;.d-ib; vertical-align: middle} .icon-sch {.icon-back;
.ltc {background-image:url(../img/index-tab1-active.png);} i {font-size:18px;}
.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);}
} }
.icon-side{.icon-back;
i {font-size: 24px;}
} }
.bg-coin {.wh(44px);.d-ib; background-size: 33px; background-position: right center; background-repeat: no-repeat; margin-right: 0;}
.txt {.txt-ver(44px); padding: 0 0.2rem;font-size:0.32rem;}
}
// .page-header {background:@blue;color:#fff;.pos(f); left:0; top:0; right:0; height:44px; z-index: 9999;
// .back {width:44px;height:44px; vertical-align: middle;.tc;
// i {font-size:30px;.txt-ver(44px);}
// }
// .side {.back;}
// .title {font-size:0.36rem;.pos(a); left:100px; right:100px; .tc;.txt-ver(44px);}
// .btns {font-size:0.36rem; padding:0 15px;}
// .btn-choose-coin{ height: 44px; vertical-align: middle; padding-right: 10px;
// span {.d-ib; background-size: 32px 32px; width:44px; height: 44px; background-repeat: no-repeat; background-position: center center;.fl;}
// .iconfont {margin-top: 15px;.d-ib; vertical-align: middle}
// .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);}
// }
// .edit {.back;
// i {font-size: 22px;}
// }
// .search{.back;
// i {font-size: 22px;}
// }
// }
.page-content {position:absolute;top:44px;width:100%;height:auto;left:0;right:0;bottom:0;overflow-x:hidden;overflow-y:auto;} .page-content {position:absolute;top:44px;width:100%;height:auto;left:0;right:0;bottom:0;overflow-x:hidden;overflow-y:auto;}
} }
.home{ .home{
...@@ -251,7 +295,13 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac ...@@ -251,7 +295,13 @@ html,body {-webkit-tap-highlight-color: rgba(0, 0, 0,0); font-size: 0.28rem; bac
} }
} }
.miners {
.page-content{
.top {top:44px;}
}
.miners-fixed { z-index: 1000!important;}
}
.mobile-ios { .mobile-ios {
.page-header {padding-top: 20px;} .page-header {padding-top: 20px;}
.page-content {top:64px;} .page-content {top:64px;}
......
...@@ -198,6 +198,7 @@ export default { ...@@ -198,6 +198,7 @@ export default {
} }
}, },
created() { created() {
this.$indicator.open({ spinnerType: 'fading-circle' })
this.pageInit(72, "1h", parseInt((new Date().getTime() - 86400000 * 3) / 1000)); this.pageInit(72, "1h", parseInt((new Date().getTime() - 86400000 * 3) / 1000));
}, },
methods: { methods: {
...@@ -243,6 +244,7 @@ export default { ...@@ -243,6 +244,7 @@ export default {
path: "/my/" + self.$route.params.puid + "/" + self.$route.params.coin_type path: "/my/" + self.$route.params.puid + "/" + self.$route.params.coin_type
}); });
} }
this.$indicator.close()
}); });
} }
}); });
......
<template> <template>
<div class="dashboard"> <div class="dashboard">
<div class="page-header" :class="hasZIndex==true?'zIndexAuto':''" flex="main:justify cross:center"> <div class="page-header" :class="hasZIndex==true?'zIndexAuto':''">
<div class="side" @click="getSide"><i class="iconfont icon-mulu"></i></div> <div class="l" @click="getSide"><span class="icon-side abs-left"><i class="iconfont icon-mulu"></i></span></div>
<div class="title" @click="getRegion">{{account_name}} - {{cur_region['text_zh-cn']}}<i class="iconfont icon-down"></i></div> <div class="c" @click="getRegion">{{account_name}} - {{cur_region['text_zh-cn']}} <i class="iconfont icon-down"></i></div>
<div class="btn-choose-coin" @click="getCoin"><span :class="coin_type"></span><i class="iconfont icon-down"></i></div> <div class="r" @click="getCoin"><span class="abs-right"><b class="bg-coin" :class="coin_type"></b><i class="iconfont icon-down mr10"></i></span></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<!-- 切换币种 --> <!-- 切换币种 -->
...@@ -137,6 +137,7 @@ export default { ...@@ -137,6 +137,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.$indicator.open({ spinnerType: 'fading-circle' })
this.pageInitInterval(); this.pageInitInterval();
}, },
methods: { methods: {
...@@ -171,7 +172,6 @@ export default { ...@@ -171,7 +172,6 @@ export default {
} else { } else {
this.$message.error("请求支付状态错误!") this.$message.error("请求支付状态错误!")
} }
this.$indicator.close();
}); });
} }
}) })
...@@ -254,4 +254,5 @@ export default { ...@@ -254,4 +254,5 @@ export default {
}, },
} }
}; };
</script> </script>
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div class="subaccount"> <div class="subaccount">
<div class="subtop"> <div class="subtop">
<div class="logo"> <div class="logo">
<img style="width:2.63rem" src="../../assets/img/logo3.png" alt="">
<p>{{infoUser}}<i class="iconfont icon-jiantou"></i></p> <p>{{infoUser}}<i class="iconfont icon-jiantou"></i></p>
</div> </div>
<h2>选择子账户</h2> <h2>选择子账户</h2>
...@@ -114,8 +115,9 @@ export default { ...@@ -114,8 +115,9 @@ export default {
z-index: 999; z-index: 999;
} }
.logo { .logo {
background:url(../../assets/img/logo3.png) no-repeat 0.3rem -0.1rem/2.36rem 0.53rem;
height: 2rem; height: 2rem;
padding: 1.1rem .30rem 0; padding: 0.2rem .30rem 0;
line-height: .9rem; line-height: .9rem;
background-color: #103f73; background-color: #103f73;
color: #Fff; color: #Fff;
......
<template> <template>
<div class="page login"> <div class="page login">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">登录</div> <div class="c">登录</div>
<div class="btns" @click="goReg">注册</div> <div class="r" @click="goReg"><span class="txt abs-right">注册</span></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div class="logo"><img src="../../assets/img/logo2.png" alt="" /></div> <div class="logo"><img src="../../assets/img/logo2.png" alt="" /></div>
<div class="form-content"> <div class="form-content">
...@@ -63,4 +64,3 @@ export default { ...@@ -63,4 +64,3 @@ export default {
} }
</script> </script>
<template> <template>
<div class="miners"> <div class="miners">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="edit"><i class="iconfont icon-fanhui"></i></div> <div class="l"><span class="icon-sch abs-left"><i class="iconfont icon-bianji"></i></span></div>
<div class="title" @click="getGroup">{{messageGroup}}</div> <div class="c" @click="getGroup">{{messageGroup}} <i class="iconfont icon-down"></i></div>
<div class="search"><i class="iconfont icon-fanhui"></i></div> <div class="r"><span class="icon-sch abs-right"><i class="iconfont icon-sousuo"></i></span></div>
</div> </div>
<div class="page-content bottom"> <div class="page-content bottom">
<div class="miners-fixed">
<ul class="miners-tab" flex="dir:center box:mean cross:center">
<li v-for="(items,index) in tablist" @click="tabActive(items,index)" :class="index==i?'active':''"><span><b>{{items.text}}<br>{{items.num}}</b></span></li>
</ul>
<div class="miners-sort f-tar"><span @click="getSort"><b><i class="iconfont icon-paixujiang"></i>排序:</b><b>{{messageSort}}<i class="iconfont icon-down"></i></b></span></div>
<!-- 默认分组 --> <!-- 默认分组 -->
<mt-popup v-model="showGroup" position="top" class='top show-center'> <mt-popup v-model="showGroup" position="top" class='top show-center'>
<group :group="messageGroup" v-on:childGroup="formGroup"></group> <group :group="messageGroup" v-on:childGroup="formGroup"></group>
</mt-popup> </mt-popup>
<!-- 切换排序 --> <!-- 切换排序 -->
<mt-popup v-model="showSort" position="top" class='top show-center'> <mt-popup v-model="showSort" class='show-center'>
<sort :sort="messageSort" v-on:childSort="fromSort"></sort> <sort :sort="messageSort" v-on:childSort="fromSort"></sort>
</mt-popup> </mt-popup>
<!-- 固定 -->
<div class="miners-fixed">
<ul class="miners-tab" flex="dir:center box:mean cross:center">
<li v-for="(items,index) in tablist" @click="tabActive(items,index)" :class="index==i?'active':''"><span><b>{{items.text}}<br>{{items.num}}</b></span></li>
</ul>
<div class="miners-sort f-tar"><span @click="getSort"><b><i class="iconfont icon-paixujiang"></i>排序:</b><b>{{messageSort}}<i class="iconfont icon-down"></i></b></span></div>
<div class="title list-row"> <div class="title list-row">
<div class="s1">矿机名</div> <div class="s1">矿机名</div>
<div class="s2">实时算力</div> <div class="s2">实时算力</div>
...@@ -31,7 +28,6 @@ ...@@ -31,7 +28,6 @@
<div class="s5"></div> <div class="s5"></div>
</div> </div>
</div> </div>
<div class="miners-content"> <div class="miners-content">
<!-- 添加刷新加载位置 --> <!-- 添加刷新加载位置 -->
<div class="list list-row" v-for="items in tableData" :class="{'redBg':items.status==1,'greyBg':items.status==2} "> <div class="list list-row" v-for="items in tableData" :class="{'redBg':items.status==1,'greyBg':items.status==2} ">
...@@ -50,9 +46,6 @@ ...@@ -50,9 +46,6 @@
</div> </div>
<!-- page end --> <!-- page end -->
</template> </template>
<script> <script>
import fn from '@/utils/function.js'; import fn from '@/utils/function.js';
import sort from "@/components/Miners/sort"; import sort from "@/components/Miners/sort";
...@@ -65,18 +58,18 @@ export default { ...@@ -65,18 +58,18 @@ export default {
}, },
data() { data() {
return { return {
tablist:[{ tablist: [{
text:'全部', text: '全部',
num:'1006' num: '1006'
},{ }, {
text:'活跃', text: '活跃',
num:'1002' num: '1002'
},{ }, {
text:'不活跃', text: '不活跃',
num:'107' num: '107'
},{ }, {
text:'失效', text: '失效',
num:'17' num: '17'
}], }],
tableData: [{ tableData: [{
name: '1103037', name: '1103037',
...@@ -98,7 +91,7 @@ export default { ...@@ -98,7 +91,7 @@ export default {
dayPower: '252.752', dayPower: '252.752',
refuse: '19.45%', refuse: '19.45%',
unit: 'H', unit: 'H',
},{ }, {
name: '3103037', name: '3103037',
realPower: '205.204', realPower: '205.204',
dayPower: '252.752', dayPower: '252.752',
...@@ -118,7 +111,7 @@ export default { ...@@ -118,7 +111,7 @@ export default {
dayPower: '252.752', dayPower: '252.752',
refuse: '19.45%', refuse: '19.45%',
unit: 'H', unit: 'H',
},{ }, {
name: '3103037', name: '3103037',
realPower: '205.204', realPower: '205.204',
dayPower: '252.752', dayPower: '252.752',
...@@ -138,7 +131,7 @@ export default { ...@@ -138,7 +131,7 @@ export default {
dayPower: '252.752', dayPower: '252.752',
refuse: '19.45%', refuse: '19.45%',
unit: 'H', unit: 'H',
},{ }, {
name: '3103037', name: '3103037',
realPower: '205.204', realPower: '205.204',
dayPower: '252.752', dayPower: '252.752',
...@@ -158,7 +151,7 @@ export default { ...@@ -158,7 +151,7 @@ export default {
dayPower: '252.752', dayPower: '252.752',
refuse: '19.45%', refuse: '19.45%',
unit: 'H', unit: 'H',
},{ }, {
name: '3103037', name: '3103037',
realPower: '205.204', realPower: '205.204',
dayPower: '252.752', dayPower: '252.752',
...@@ -181,42 +174,56 @@ export default { ...@@ -181,42 +174,56 @@ export default {
}], }],
i: 0, //miners-tab默认第一个选中 i: 0, //miners-tab默认第一个选中
hasZIndex: false, hasZIndex: false,
showSort:false, showSort: false,
showGroup:false, showGroup: false,
messageSort:'矿机名 倒序', messageSort: '矿机名 倒序',
messageGroup:'全部' messageGroup: '全部'
}
},
computed: {
puid() {
return this.$store.state.puid || localStorage.getItem('puid');
},
coin_type() {
return this.$store.state.coin_type || localStorage.getItem('coin_type');
},
region_id() {
return this.$store.state.region_id || localStorage.getItem('region_id');
},
language() {
return this.$store.state.language || localStorage.getItem('language');
} }
}, },
mounted() { mounted() {
this.$indicator.close(); this.$indicator.close();
}, },
methods: { methods: {
goMinerShow() { //矿机详情
// <button @click="goMinerShow">跳转到矿机详情页</button> goMinerShow(worker_id) {
this.$router.push('/my/puid/coin_type/region_id/miners/worker_id') this.$router.push('/my/' + this.puid + '/' + this.coin_type + '/' + this.region_id + '/miners/' + worker_id)
}, },
//miners-tab点击切换的选中状态 //miners-tab点击切换的选中状态
tabActive(items,index) { tabActive(items, index) {
this.i = index this.i = index
console.log(items.text) console.log(items.text)
}, },
getSort() { getSort() {
this.hasZIndex = true; this.hasZIndex = true;
this.showSort = !this.showSort; this.showSort = !this.showSort;
this.showGroup=false; this.showGroup = false;
}, },
getGroup(){ getGroup() {
this.hasZIndex = false; this.hasZIndex = false;
this.showGroup = !this.showGroup; this.showGroup = !this.showGroup;
this.showSort=false; this.showSort = false;
}, },
fromSort(msg){ fromSort(msg) {
this.messageSort = msg; this.messageSort = msg;
this.showSort=false; this.showSort = false;
}, },
formGroup(msg){ formGroup(msg) {
this.messageGroup = msg; this.messageGroup = msg;
this.showGroup=false; this.showGroup = false;
} }
} }
} }
......
<template> <template>
<div class="page detail"> <div class="page detail">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">公告详情</div> <div class="c">公告详情</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div class="title-content pt20 pb20 pl30 pr30"> <div class="title-content pt20 pb20 pl30 pr30">
...@@ -14,17 +14,16 @@ ...@@ -14,17 +14,16 @@
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'noticeShow', name: 'noticeShow',
data() { data() {
return { return {
notice:{ notice: {
id: 0, id: 0,
time: '2017-11-05 11:33', time: '2017-11-05 11:33',
title:'矿池关于比特币现金版本升级及更名的通知', title: '矿池关于比特币现金版本升级及更名的通知',
status: 'unread', status: 'unread',
detail: '日前,Bitcoin ABC发布了比特币现金BCH(原BCC)包含有算法难度调整(DAA)的0.16.0版本。该版本中将原BC' detail: '日前,Bitcoin ABC发布了比特币现金BCH(原BCC)包含有算法难度调整(DAA)的0.16.0版本。该版本中将原BC'
} }
......
<template> <template>
<div class="page notice"> <div class="page notice">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">通知中心</div> <div class="c">通知中心</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div class="notice-content"> <div class="notice-content">
<div class="notice-notice" flex="dir:left box:first" @click="goNoticeList"> <div class="notice-notice" flex="dir:left box:first" @click="goNoticeList">
......
<template> <template>
<div class="page list"> <div class="page list">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">公告列表</div> <div class="c">公告列表</div>
<div class="btn-mark" @click="markAllList">全标已读</div> <div class="r" @click="markAllList"><span class="txt abs-right">全标已读</span></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<ul class="list-content"> <ul class="list-content">
...@@ -22,20 +22,20 @@ export default { ...@@ -22,20 +22,20 @@ export default {
name: 'noticeList', name: 'noticeList',
data() { data() {
return { return {
noticeList:[{ noticeList: [{
id: 0, id: 0,
time: '2017-11-05 11:33', time: '2017-11-05 11:33',
title:'矿池关于比特币现金版本升级及更名的通知', title: '矿池关于比特币现金版本升级及更名的通知',
status: 'unread' status: 'unread'
},{ }, {
id: 1, id: 1,
time: '2017-11-04 11:33', time: '2017-11-04 11:33',
title:'矿池关于比特币现金版本升级及更名的通知', title: '矿池关于比特币现金版本升级及更名的通知',
status: 'unread' status: 'unread'
},{ }, {
id: 2, id: 2,
time: '2017-11-04 11:33', time: '2017-11-04 11:33',
title:'矿池关于比特币现金版本升级及更名的通知', title: '矿池关于比特币现金版本升级及更名的通知',
status: 'read' status: 'read'
}], }],
} }
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
this.$router.push('/NoticeShow'); this.$router.push('/NoticeShow');
}, },
markAllList() { markAllList() {
this.noticeList.forEach((notice)=>{ this.noticeList.forEach((notice) => {
notice.status = 'read'; notice.status = 'read';
}) })
} }
......
<template> <template>
<div class="page reg"> <div class="page reg">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">注册</div> <div class="c">注册</div>
<div class="btns" @click="goLogin">登录</div> <div class="r" @click="goLogin"><span class="txt abs-right">登录</span></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div v-if="step===1"> <div v-if="step===1">
......
<template> <template>
<div class="page account"> <div class="page account">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">子账户选择</div> <div class="c">子账户选择</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<h2>请选择子账户</h2> <h2>请选择子账户</h2>
......
<template> <template>
<div class="page default-coin"> <div class="page default-coin">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">设置默认币种</div> <div class="c">设置默认币种</div>
</div> </div>
<div class="page-content"> <div class="page-content">
<el-form :model="createForm" :rules="createRules" ref="createForm"> <el-form :model="createForm" :rules="createRules" ref="createForm">
......
<template> <template>
<div class="page language"> <div class="page language">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">语言设置</div> <div class="c">语言设置</div>
</div> </div>
<div class="page-content top"> <div class="page-content top">
<div class="language-content"> <div class="language-content">
......
<template> <template>
<div class="settings"> <div class="settings">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="title">设置页面</div> <div class="c">设置页面</div>
</div> </div>
<div class="page-content bottom bg-blue"> <div class="page-content bottom bg-blue">
<div class="setting-content"> <div class="setting-content">
...@@ -77,8 +77,10 @@ export default { ...@@ -77,8 +77,10 @@ export default {
return this.$store.state.language || localStorage.getItem('language'); return this.$store.state.language || localStorage.getItem('language');
} }
}, },
created() {
this.$indicator.open({ spinnerType: 'fading-circle' })
},
mounted() { mounted() {
this.$indicator.close();
this.pageInit(); this.pageInit();
}, },
methods: { methods: {
...@@ -86,14 +88,14 @@ export default { ...@@ -86,14 +88,14 @@ export default {
//获取当前用户信息 //获取当前用户信息
fn.getSubAccountById(this.puid).then(res => { fn.getSubAccountById(this.puid).then(res => {
if (res.data.err_no == 0) { if (res.data.err_no == 0) {
console.log(res.data.data)
this.account_name = res.data.data.name; this.account_name = res.data.data.name;
this.account_default_coin_type = res.data.data.default_coin_type; this.account_default_coin_type = res.data.data.default_coin_type;
this.$indicator.close();
} }
}) })
}, },
}, },
watch:{ watch: {
} }
} }
......
<template> <template>
<div class="page create"> <div class="page create">
<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="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">创建子账户</div> <div class="c">创建子账户</div>
<div class="btns"></div>
</div> </div>
<div class="page-content bg-blue"> <div class="page-content bg-blue">
<el-form :model="createForm" :rules="createRules" ref="createForm"> <el-form :model="createForm" :rules="createRules" ref="createForm">
...@@ -89,7 +88,7 @@ export default { ...@@ -89,7 +88,7 @@ export default {
} else { } else {
this.$toast({ this.$toast({
message: '子账号已创建!', message: '子账号已创建!',
iconClass: 'iconfont icon-caozuochenggong c-green' iconClass: 'iconfont icon-iconfontzhizuobiaozhunbduan22 c-green'
}); });
this.$store.commit('setPuid', res.data.data.puid); this.$store.commit('setPuid', res.data.data.puid);
this.$store.commit('setCoinType', res.data.data.default_coin_type); this.$store.commit('setCoinType', res.data.data.default_coin_type);
......
<template> <template>
<div class="page admin-list"> <div class="page admin-list">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">{{msg}}</div> <div class="c">{{msg}}</div>
<div class="btns"></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<div class="mt40"> <div class="mt40">
......
<template> <template>
<div class="page setEmail"> <div class="page setEmail">
<div class="page-header" flex="main:justify cross:center"> <div class="page-header">
<div class="back" @click="goBack"><i class="iconfont icon-fanhui"></i></div> <div class="l" @click="goBack"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="title">{{msg}}</div> <div class="c">{{msg}}</div>
<div class="btns"></div>
</div> </div>
<div class="page-content"> <div class="page-content">
<!-- 未设置邮箱 --> <!-- 未设置邮箱 -->
......
<template>
<div class="page">
<div class="page-header">
<div class="c">模板</div>
</div>
<div class="page-content">
<h1>icons</h1>
<div class="box icons">
<i class="iconfont icon-bianji"></i>
<i class="iconfont icon-sousuo"></i>
<i class="iconfont icon-licaishouyi"></i>
<i class="iconfont icon-down"></i>
<i class="iconfont icon-mulu"></i>
<i class="iconfont icon-icon--"></i>
<i class="iconfont icon-cabinet-settings"></i>
<i class="iconfont icon-jiantou"></i>
<i class="iconfont icon-dui"></i>
<i class="iconfont icon-network"></i>
<i class="iconfont icon-iconfontzhizuobiaozhunbduan22"></i>
<i class="iconfont icon-keyongyue"></i>
<i class="iconfont icon-tongyongleibaojing"></i>
<i class="iconfont icon-gantanhao"></i>
<i class="iconfont icon-paixusheng"></i>
<i class="iconfont icon-paixujiang"></i>
<i class="iconfont icon-tubiaozhexiantu"></i>
<i class="iconfont icon-xiaoxigonggao"></i>
<i class="iconfont icon-close"></i>
<i class="iconfont icon-unie606"></i>
<i class="iconfont icon-email"></i>
<i class="iconfont icon-password"></i>
<i class="iconfont icon-fanhui"></i>
</div>
<h1>公共头</h1>
<div class="box header">
<div class="page-header">
<div class="l"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="c">DOGE补贴地址</div>
</div>
<br />
<div class="page-header">
<div class="l"><span class="icon-back"><i class="iconfont icon-fanhui"></i></span></div>
<div class="c">报警联系人</div>
<div class="r"><span class="txt abs-right">保存</span></div>
</div>
<br />
<div class="page-header">
<div class="l"><span class="txt abs-left">完成</span></div>
<div class="c">标题</div>
<div class="r"><span class="icon-sch abs-right"><i class="iconfont icon-sousuo"></i></span></div>
</div>
<br />
<div class="page-header">
<div class="l"><span class="icon-sch abs-left"><i class="iconfont icon-bianji"></i></span></div>
<div class="c">默认分组 <i class="iconfont icon-down"></i></div>
<div class="r"><span class="icon-sch abs-right"><i class="iconfont icon-sousuo"></i></span></div>
</div>
<br />
<div class="page-header">
<div class="l"><span class="icon-sch abs-left"><i class="iconfont icon-bianji"></i></span></div>
<div class="c">
<h3>默认分组 <i class="iconfont icon-down"></i></h3>
<p>总算力: 20.87 PH/s</p>
</div>
<div class="r"><span class="icon-sch abs-right"><i class="iconfont icon-sousuo"></i></span></div>
</div>
<br />
<div class="page-header">
<div class="l"><span class="icon-side abs-left"><i class="iconfont icon-mulu"></i></span></div>
<div class="c">YZCF - 南方电信 <i class="iconfont icon-down"></i></div>
<div class="r"><span class="abs-right"><b class="bg-coin ltc "></b><i class="iconfont icon-down mr10"></i></span></div>
</div>
</div>
</div>
</div>
</template>
<style scoped>
h1 {
padding: 0 0.2rem
}
.box {
margin: 0.2rem;
padding: 0.2rem;
background: gray;
}
.icons i {
margin: 0.1rem;
font-size: 0.4rem;
color: #fff;
}
</style>
...@@ -48,7 +48,7 @@ axios.interceptors.request.use(config => { ...@@ -48,7 +48,7 @@ axios.interceptors.request.use(config => {
function checkToken() { function checkToken() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
resolve('eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IlEwTTBNRUl4UVRVME5qazJNa0ZFT0RCRk56WkJNVGc0TmtFd09UWkNOakZGTlRFMFEwVTJOdyJ9.eyJpc3MiOiJodHRwczovL2Jsb2NraW4uYXV0aDAuY29tLyIsInN1YiI6ImF1dGgwfDVhMzM4MWE2ZjczMzNjNjdkMzMxOWZiYyIsImF1ZCI6WyJodHRwczovL3d3dy5wb29saW4uY29tL2FwaSIsImh0dHBzOi8vYmxvY2tpbi5hdXRoMC5jb20vdXNlcmluZm8iXSwiaWF0IjoxNTE3Mzg3NjY0LCJleHAiOjE1MTczOTQ4NjQsImF6cCI6IkZhczI5dWJNNW52NElFMlZUQ3ZEWU5iaWtIeTF0bDBkIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSByZWFkIHdyaXRlIn0.CAjxVLkrBa09VoEhZ_DN_NmTvLK5WqIQEgeTeAl8Rv1CtOi5d5-WuUybTJWIQEfvUpMdmE63p80PLYICsoqQSq3VMpM39eITR2wFlySfDKihXskBuYg0NbTuQkHXbYt2AAfe9DzfFb7eJ0F9YOjP93BOqYMugsSwj8T5tWkpuiHa9OExqlJw0d4M-bpoNtyhQI3nDtPfdg_Q3g0lBp9zC1nbVlBy0lVvV7-1NzBFOvPHaAIg232ggpecOr0escVpwDnOX1otfUl-JoEckw-K4mKC8_CKBaZyF1uPxbNuyv5Q4FfVBKg3CDqXQjudy-FviRLzZFLZsg1IUsabc2u-Sg'); resolve('eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IlEwTTBNRUl4UVRVME5qazJNa0ZFT0RCRk56WkJNVGc0TmtFd09UWkNOakZGTlRFMFEwVTJOdyJ9.eyJpc3MiOiJodHRwczovL2Jsb2NraW4uYXV0aDAuY29tLyIsInN1YiI6ImF1dGgwfDU5ZjE3OTc5ZDljMGM1MzZiZjRhMzVjMSIsImF1ZCI6WyJodHRwczovL3d3dy5wb29saW4uY29tL2FwaSIsImh0dHBzOi8vYmxvY2tpbi5hdXRoMC5jb20vdXNlcmluZm8iXSwiaWF0IjoxNTE3NTM2NjU4LCJleHAiOjE1MTc1NDM4NTgsImF6cCI6IkZhczI5dWJNNW52NElFMlZUQ3ZEWU5iaWtIeTF0bDBkIiwic2NvcGUiOiJvcGVuaWQgcHJvZmlsZSByZWFkIHdyaXRlIn0.tE5v7bvMZSQnW8VvECKXkV1NVIwFpbVDW8iPEr5VO3TmsQnUVCWXz_2yK_jyA8EdK25Cw-Awidhr3kFnMLrz88SYZ_cuzhn8ooISkDDT89_y5kCWa59Ntxw5-_r6NHk90mjX7Bve7sjedvq2FxhPMatXrcEApn_yxaOd6S7JX6Z2jpNc3IzCOr40cryqJDKQckKXiUcDL726h4IWxovUzwjRTQv1QxYld6bN7OV19NvfPjUccf78EZpEMaDSGSDzQo2wam3R4LDo0PYnO1JLi9nq2dieEuihav9L1B9QehDMYLmtk8cE18DTIo9ZPDcP2QfQlyKK5NUCKwEMOC6jgQ');
}) })
} }
......
...@@ -152,6 +152,13 @@ const router = new Router({ ...@@ -152,6 +152,13 @@ const router = new Router({
meta: { meta: {
title: 'NoticeShow.vue' title: 'NoticeShow.vue'
} }
}, {
path: '/moban',
name: 'moban',
component: resolve => require(['@/components/moban'], resolve),
meta: {
title: 'moban.vue'
}
} }
] ]
}) })
......
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