From e3dcaeb0180a4e37347ac9ceb44c8a59ae7af37f Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Feb 2022 19:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

---
 store/state.js |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/store/state.js b/store/state.js
index 067fd27..ed952de 100644
--- a/store/state.js
+++ b/store/state.js
@@ -1,15 +1,55 @@
+import websocket from "./websocket.js"
+import positions from "./positions.js"
+import apis from "./apiConfig.js"
 const state = {
 	loging: false,
 	message: {
-		useName: '过客 ',
+		useName: '过客',
 	},
 	logPath: '',
-	piAPI: 'http://s16s652780.51mypc.cn/api/',
+	piAPI: apis.api,
+	// piAPI: 'http://223.82.109.183:2082/api/',
+	// piAPI: 'http://192.168.0.108:83/',
 	puserName: '',
 	puserID: '',
-	puserIphone:'',
-	avatar:"",
+	puserIphone: '',
+	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"
+		}
+	],
+	gotuGrabOrders: false,
+	...websocket.state,
+	...positions.state
 }
 
 export default state

--
Gitblit v1.9.3