From bb04d82473b44a79e9b823ab2054ee79814098a2 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Feb 2022 11:38:31 +0800
Subject: [PATCH] +整体任务实行流程完善

---
 store/state.js |   66 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/store/state.js b/store/state.js
index 635fb38..1025ada 100644
--- a/store/state.js
+++ b/store/state.js
@@ -1,3 +1,5 @@
+import websocket from "./websocket.js"
+import positions from "./positions.js"
 const state = {
 	loging: false,
 	message: {
@@ -12,38 +14,40 @@
 	avatar: "../../static/logo.png",
 	UserData: {},
 	tabbar: [{
-		pagePath: "/pages/home/home",
-		text: "首页",
-		iconPath: "/static/tabbar/index01.png",
-		selectedIconPath: "/static/tabbar/index02.png"
-	},
-	{
-		pagePath: "/pages/article/article",
-		text: "资讯",
-		iconPath: "/static/tabbar/article.png",
-		selectedIconPath: "/static/tabbar/articleH.png"
-	},
-	{
-		pagePath: "/pages/issue/issue",
-		iconPath: "/static/tabbar/addIcon.png",
-		selectedIconPath: "/static/tabbar/addSelectedIcon.png",
-		text: "发布",
-		midButton: true,
-	},
-	{
-		pagePath: "/pages/business/business",
-		text: "工作台",
-		iconPath: "/static/tabbar/workbench.png",
-		selectedIconPath: "/static/tabbar/workbenchH.png"
-	},
-	{
-		pagePath: "/pages/myself/myself",
-		text: "我的",
-		iconPath: "/static/tabbar/my.png",
-		selectedIconPath: "/static/tabbar/my-blue.png"
-	}
+			pagePath: "/pages/home/home",
+			text: "首页",
+			iconPath: "/static/tabbar/index01.png",
+			selectedIconPath: "/static/tabbar/index02.png"
+		},
+		{
+			pagePath: "/pages/article/article",
+			text: "资讯",
+			iconPath: "/static/tabbar/article.png",
+			selectedIconPath: "/static/tabbar/articleH.png"
+		},
+		{
+			pagePath: "/pages/issue/issue",
+			iconPath: "/static/tabbar/addIcon.png",
+			selectedIconPath: "/static/tabbar/addSelectedIcon.png",
+			text: "发布",
+			midButton: true,
+		},
+		{
+			pagePath: "/pages/business/business",
+			text: "工作台",
+			iconPath: "/static/tabbar/workbench.png",
+			selectedIconPath: "/static/tabbar/workbenchH.png"
+		},
+		{
+			pagePath: "/pages/myself/myself",
+			text: "我的",
+			iconPath: "/static/tabbar/my.png",
+			selectedIconPath: "/static/tabbar/my-blue.png"
+		}
 	],
-	gotuGrabOrders: false
+	gotuGrabOrders: false,
+	...websocket.state,
+	...positions.state
 }
 
 export default state

--
Gitblit v1.9.3