From 4a7b322bd421f4c4e99d5c29f04cc62d63ed7774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Sun, 26 Sep 2021 17:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9D=97=E9=93=BE=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/chain.js | 28 ++----------------
 pages/index/index.vue    | 62 ++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 63 deletions(-)

diff --git a/apis/interfaces/chain.js b/apis/interfaces/chain.js
index 3956fad..ddb188c 100644
--- a/apis/interfaces/chain.js
+++ b/apis/interfaces/chain.js
@@ -8,31 +8,10 @@
 
 import { request } from '../index'
 
-// 最新区块列表
+// 最新统计
 const chain = () => {
 	return request({
-		url: 'chain'
-	})
-}
-
-// 发行量概况
-const situation = () => {
-	return request({
-		url: 'nodes'
-	})
-}
-
-// 区块详情
-const hash = (hash) => {
-	return request({
-		url: 'chain/block/' + hash
-	})
-}
-
-// 区块链首页
-const occ = () => {
-	return request({
-		url: 'occ/index'
+		url: 'chain/tasks'
 	})
 }
 
@@ -54,9 +33,6 @@ const thawlog = (data) => {
 
 export {
 	chain,
-	situation,
-	hash,
-	occ,
 	crystals,
 	thawlog
 }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9a55ac9..cb817ed 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,14 +42,13 @@
 		</view>
 		<!-- 任务推荐 -->
 		<scroll-view class="task-block" scroll-x="true">
-			<!-- categoryArr -->
-		     <view class="item" v-for="(item, index) in 10" :key="index" @click="JumpUrl(item.url, item.title)">
-		     	<view class="text nowrap">slogan</view>
+		     <view class="item" v-for="(item, index) in categoryArr" :key="index" @click="JumpUrl(item.url, item.title)">
+		     	<view class="text nowrap">{{item.remark}}</view>
 		     	<view class="icon">
-		     		<!-- <image :src="item.cover" /> -->
+		     		<image :src="item.ico" />
 		     	</view>
-		     	<view class="title nowrap">任务标题</view>
-		     	<view class="submit-title nowrap">能量碎片+10</view>
+		     	<view class="title nowrap">{{item.title}}</view>
+		     	<view class="submit-title nowrap">能量碎片{{item.tips}}</view>
 		     </view>
 		</scroll-view>
 		<!-- 平台概况 -->
@@ -57,23 +56,23 @@
 			<view class="header">
 				<view class="header-item">
 					<view class="title">平台能量球余量<uni-icons class="help-icon" @click="showHelp('occBalance')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
-					<view class="number nowrap">0</view>
+					<view class="number nowrap">{{chains.balance}}</view>
 				</view>
 				<view class="header-item">
 					<view class="title">上期能量球价值<uni-icons class="help-icon" @click="showHelp('yesterdayCrystal')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
-					<view class="number nowrap">0</view>
+					<view class="number nowrap">{{chains.up}}</view>
 				</view>
 				<view class="header-item">
 					<view class="title">昨日瓜分能量碎片<uni-icons class="help-icon" @click="showHelp('yesterdayCrystal')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
-					<view class="number nowrap">0</view>
+					<view class="number nowrap">{{chains.score}}</view>
 				</view>
 				<view class="header-item">
 					<view class="title">区块链高度<uni-icons class="help-icon" @click="showHelp('blockHeight')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
-					<view class="number nowrap">0</view>
+					<view class="number nowrap">{{chains.height}}</view>
 				</view>
 				<view class="header-item">
 					<view class="title">已开通节点数<uni-icons class="help-icon" @click="showHelp('nodeNumber')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
-					<view class="number nowrap">0</view>
+					<view class="number nowrap">{{chains.number}}</view>
 				</view>
 			</view>
 			<!-- 平台累计盈利，能量球 -->
@@ -90,7 +89,7 @@
 </template>
 
 <script>
-	import { occ, crystals, thawlog } from '@/apis/interfaces/chain'
+	import { chain, crystals, thawlog } from '@/apis/interfaces/chain'
 	import { certified, security } from '@/apis/interfaces/index'
 	import F2 from '@/uni_modules/lime-f2/components/lime-f2/f2.min.js'
 	import lF2 from '@/uni_modules/lime-f2/components/lime-f2/'
@@ -100,27 +99,13 @@
 		},
 		data() {
 			return {
-				// occs		: {},
-				// blockHeight	: 0,
-				// occBalance	: 0,
-				// occ			: 0,
-				// yesterdayCrystal: 0,
-				// gain: 0,
-				// nodeNumber: 0,
-				// notice: [],
-				// isAuth: false,
-				
-				// helpToast: {
-				// 	occ: '恒量发行原石量',
-				// 	occBalance: '平台原石量',
-				// 	yesterdayCrystal: '昨日瓜分水晶',
-				// 	blockHeight: '区块链高度',
-				// 	gain: '平台累计盈利额',
-				// 	nodeNumber: '已开通节点数'
-				// },
 				isAuth		: false,
-				chains		: {
-					
+				chains		: {		// 区块链统计
+					balance	: 0,
+					height	: 0,
+					number	: 0,
+					score	: 0,
+					up		: 0
 				},
 				account		:  {	// 账户
 					coin	: 0,
@@ -182,11 +167,12 @@
 			},
 			// occ信息
 			getIndex(){
-				// , occ()
-				Promise.all([crystals()]).then(res=>{
-					let crystalsData = res[0]
-						// occData		 = res[1]
-					if(crystalsData.needLogin){
+				Promise.all([crystals(), chain()]).then(res=>{
+					let crystalsData = res[0],
+						occData		 = res[1]
+						
+						console.log(occData)
+					if(!crystalsData.needLogin){
 						this.account = {
 							coin	: crystalsData.coin,
 							crystal	: crystalsData.crystal
@@ -194,6 +180,8 @@
 						this.crystalArr = crystalsData.crystal_array
 						this.allIds		= crystalsData.all_ids
 					}
+					this.chains 	 = occData.data
+					this.categoryArr = occData.tasks
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,