diff --git a/apis/interfaces/chain.js b/apis/interfaces/chain.js
index cd75ebe..ddb188c 100644
--- a/apis/interfaces/chain.js
+++ b/apis/interfaces/chain.js
@@ -8,37 +8,31 @@
import { request } from '../index'
-// 最新区块列表
+// 最新统计
const chain = () => {
return request({
- url: 'chain'
+ url: 'chain/tasks'
})
}
-// 发行量概况
-const situation = () => {
+// 水晶原石
+const crystals = () => {
return request({
- url: 'nodes'
+ url: 'user/account/crystals'
})
}
-// 区块详情
-const hash = (hash) => {
+// 领取水晶
+const thawlog = (data) => {
return request({
- url: 'chain/block/' + hash
- })
-}
-
-// 区块链首页
-const occ = () => {
- return request({
- url: 'occ/index'
+ url: 'user/account/thawlog',
+ method: 'POST',
+ data
})
}
export {
chain,
- situation,
- hash,
- occ
+ crystals,
+ thawlog
}
diff --git a/apis/interfaces/crystal.js b/apis/interfaces/crystal.js
index 96f97f6..8c17efa 100644
--- a/apis/interfaces/crystal.js
+++ b/apis/interfaces/crystal.js
@@ -8,21 +8,6 @@
import { request } from '../index'
-// 水晶原石
-const crystals = () => {
- return request({
- url: 'user/account/crystals'
- })
-}
-
-// 领取水晶
-const thawlog = (data) => {
- return request({
- url: 'user/account/thawlog',
- method: 'POST',
- data
- })
-}
// 水晶分类
const category = () => {
@@ -34,7 +19,7 @@ const category = () => {
// 水晶任务
const task = () => {
return request({
- url: 'crystal/task'
+ url: 'tasks'
})
}
@@ -54,8 +39,6 @@ const operateSign = () => {
}
export{
- crystals,
- thawlog,
category,
task,
sign,
diff --git a/pages/found/index.vue b/pages/found/index.vue
index 706aafc..ec3b473 100644
--- a/pages/found/index.vue
+++ b/pages/found/index.vue
@@ -1,141 +1,106 @@
-
-
-
-
-
-
-
-
-
-
- 原石 {{ account.coin }}
- 水晶 {{ account.crystal }}
-
-
-
-
-
-
-
-
- 水晶{{ item.amount || '-'}}
-
-
-
-
- 购物
-
-
-
-
-
-
-
- {{ item.remark }}
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
- 每日签到
-
- 累计天数越多。水晶奖励越多
-
-
-
- 立即签到
-
+
+
+
+
+
+
+ 签到成功
-
-
-
-
-
-
- +{{ item.crystal }}
- {{ item.text }}
-
-
- 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个水晶奖励
-
-
-
-
-
- 水晶任务
+
+ 能量碎片+{{sign.signSuccess}}
-
-
-
- {{item.title || '-'}}
- {{item.remark || '-'}}
- {{item.tips || '-'}}
-
-
-
+
+
+
+
+
+ 每日签到，能量碎片多多
+
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+ 再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片
+
+
+
+
+ 签到领取能量碎片
+
+
+ 能量碎片记录
+
+
+
+
+
+
+ 能量碎片任务
+
+
+
+ {{item.title}}
+ {{item.remark}}
+ {{item.tips}}
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0d35411..e3f0ca3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,8 +2,8 @@
- 能量球 99
- 能量碎片 11
+ {{isAuth ? '能量球' + account.coin : '查看能量球'}}
+ {{isAuth ? '能量碎片' + account.crystal : '查看能量碎片'}}
@@ -11,123 +11,114 @@
-
-
-
-
- 能量碎片{{ item.amount || '-'}}
-
+
+
+
+
+
+
+
+ {{ item.amount || '-'}}
+
+
+
+
+
+
+ 发权证
+
-
-
- 购物
-
-
+
+
+
+
+
+
+
+ 登录后领取
+
+
+
-
+
- {{ item.remark }}
+ {{item.sub_title}}
- {{ item.title }}
+ {{item.title}}
+ 能量碎片{{item.tips}}
-
-
-
- 轻节点
- {{occs.light || '-'}}
-
-
- 合作节点
- {{occs.cooperation || '-'}}
-
-
- 主节点
- {{occs.main || '-'}}
-
-
- 超级节点
- {{occs.super || '-'}}
-
-
- 运营节点
- {{occs.operating || '-'}}
-
-
- 技术节点
- {{occs.technology || '-'}}
-
-
-
+
- 平台累计营业额和原石价值走势图
+ 累计盈利和能量球价值走势图
+
+
@@ -349,7 +367,7 @@
}
50% {
- margin-top: 15rpx;
+ margin-top: 10rpx;
}
100% {
@@ -374,20 +392,22 @@
.header{
display: flex;
flex-wrap: wrap;
- margin-bottom: $margin*2;
+ padding-bottom: $padding;
.number{
color: white;
font-size: $title-size;
- padding-top: $padding/2;
font-weight: bold;
+ line-height: 70rpx;
}
.title{
color: rgba($color: white, $alpha: .4);
font-size: $title-size-sm;
+ line-height: 40rpx;
}
.header-item{
width: 50%;
padding: $padding / 2;
+ padding-bottom: $padding;
box-sizing: border-box;
&:first-child{
width: 100%;
@@ -397,40 +417,16 @@
}
}
}
- // 节点信息
- .node-info{
- display: flex;
- flex-wrap: wrap;
- margin: 0 -$margin / 2;
- .node-item{
- background: rgba($color: $block-color, $alpha: .8);
- width: calc(50% - #{$margin});
- margin: $margin / 2;
- padding: $padding;
- box-sizing: border-box;
- border-radius: $radius/2;
- }
- .number{
- font-size: $title-size + 4;
- font-weight: bold;
- color: white;
- }
- .title{
- font-size: $title-size-sm;
- color: white;
- }
- }
// 图表
.chart{
background: rgba($color: $block-color, $alpha: .8);
- padding: $padding;
+ padding: $padding/2;
border-radius: $radius/2;
- margin-top: $margin;
.title{
text-align: center;
line-height: 80rpx;
- color: white;
- font-size: $title-size-m;
+ color: rgba($color: #FFFFFF, $alpha: .4);
+ font-size: $title-size-sm;
}
.chart-f2{
height: 200px;
@@ -473,7 +469,6 @@
}
// 求助icon
.help-icon{
- vertical-align: middle;
margin-left: $margin/3;
opacity: .7;
}
@@ -487,70 +482,77 @@
top: 0;
left: 0;
}
- .ore-lists {
+ .ore-lists {
position: absolute;
top: 0;
left: 0;
height: 100%;
- width: 100%;
+ width: 100%;
+ z-index: 1;
.oct-float-item{
position: absolute;
- text-align: center;
+ text-align: center;
.text {
- margin-top: $margin / 2;
color: white;
- font-size: $title-size-sm;
+ font-size: $title-size-sm - 4;
line-height: 40rpx;
text-shadow: 0 3rpx 3rpx rgba($color: #000000, $alpha: .2);
- }
- .icon {
- width: 58rpx;
- vertical-align: top;
- }
+ }
+ .oct-icon{
+ display: inline-block;
+ width: 58rpx;
+ height: 58rpx;
+ line-height: 58rpx;
+ background: radial-gradient(circle at 50% 50%, rgba(255, 255, 255, .0) 40%, #ca66e0);
+ border-radius: 50%;
+ box-shadow: 0 0 5rpx 5rpx rgba($color: #ca66e0, $alpha: .5);
+ .icon {
+ margin-top: 10rpx;
+ height: 38rpx;
+ width: 38rpx;
+ }
+ }
}
.ore-item-nav{
@extend .oct-float-item;
- right: $margin * 3;
+ right: $margin;
top: 12%;
}
- .ore-item {
- @extend .oct-float-item;
- &:nth-child(1) { top: 16%; left: 13%; }
- &:nth-child(2) { top: 50%; right: 10%; }
- &:nth-child(3) { top: 23%; right: 20%; }
- &:nth-child(4) { top: 70%; left: 33%;}
- &:nth-child(5) { top: 40%; left: 20%; }
- &:nth-child(6) { top: 58%; left: 10%;}
- &:nth-child(7) { top: 10%; right: 43%;}
- &:nth-child(8) { top: 46%; right: 29%;}
+ .ore-item {
+ @extend .oct-float-item;
+ }
+ .oct-login{
+ @extend .oct-float-item;
+ left: 42%;
+ top: 45%;
}
}
}
// 任务
.task-block {
white-space: nowrap;
+ margin-bottom: $margin;
.item {
- background: rgba($color: $mian-color, $alpha: .2);
+ background: $block-color;
display: inline-block;
margin-left: $margin;
- width: 210rpx;
- padding: $padding * 2 $padding;
+ width: 260rpx;
border-radius: $radius;
- box-sizing: 0 0 4rpx 4rpx rgba($color: #000000, $alpha: .06);
text-align: center;
+ padding: ($padding - 10) $padding/2;
&:first-child {
- margin-left: $margin + $margin/2;
+ margin-left: $margin;
}
&:last-child {
- margin-right: $margin + $margin/2;
+ margin-right: $margin;
}
.icon {
display: inline-block;
- margin: $margin 0;
+ margin: ($margin/2) 0;
width: 98rpx;
height: 98rpx;
line-height: 98rpx;
- background: $mian-color-deep;
+ background: #1f183d;
border-radius: 50%;
text-align: center;
image {
@@ -560,13 +562,20 @@
}
}
.text {
- font-size: $title-size-m;
- color: $mian-color;
+ font-size: $title-size-sm;
+ color: rgba($color: white, $alpha: .4);
+ line-height: 40rpx;
}
.title {
- font-size: $title-size;
+ font-size: $title-size-lg;
color: white;
font-weight: bold;
+ line-height: 50rpx;
+ }
+ .submit-title{
+ font-size: $title-size-sm - 4;
+ color: rgba($color: white, $alpha: .4);
+ line-height: 40rpx;
}
}
}
diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue
index 48c53b6..946a64f 100644
--- a/pages/instrument/Spread.vue
+++ b/pages/instrument/Spread.vue
@@ -1,7 +1,7 @@
-
+
@@ -146,7 +146,7 @@