Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-02-21 e3dcaeb0180a4e37347ac9ceb44c8a59ae7af37f

 store/state.js

@@ -1,49 +1,55 @@
import websocket from "./websocket.js"
import positions from "./positions.js"
import apis from "./apiConfig.js"
const state = {
   loging: false,
   message: {
      useName: '过客',
   },
   logPath: '',
   piAPI: 'http://223.82.109.183:2082/api/',
   //piAPI: 'http://192.168.0.110:83/',
   piAPI: apis.api,
   // piAPI: 'http://223.82.109.183:2082/api/',
   // piAPI: 'http://192.168.0.108:83/',
   puserName: '',
   puserID: '',
   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"
   }
         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