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/actions.js | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/store/actions.js b/store/actions.js
index 1c5a8aa..47c7c4c 100644
--- a/store/actions.js
+++ b/store/actions.js
@@ -1,5 +1,8 @@
import md5 from 'js-md5'
import axios from 'axios'
+
+import websocket from "./websocket.js"
+import positions from "./positions.js"
const actions = {
loging(store, data) {
var user = [{
@@ -44,16 +47,16 @@
// // dataType: 'JSON',
success: (res) => {
if (res.statusCode == 200) {
- if(res.data.error_code == "400"){
+ if (res.data.error_code == "400") {
uni.hideNavigationBarLoading();
uni.showToast({
title: '密码错误，请重试',
- icon:'none',
+ icon: 'none',
duration: 2000
});
return;
}
- store.commit('getUserData',res.data)
+ store.commit('getUserData', res.data)
// console.log(res.data,123542);
data.isit = true;
data.userName = res.data.nick_name; //警袁姓名
@@ -63,8 +66,8 @@
data.pass = data.pass;
// data.userPhon = res.user_id;
store.commit('login', data);
-
- }
+
+ }
},
fail: (res) => {
console.log('失去连接 请稍等');
@@ -86,7 +89,9 @@
// store.commit('login', data);
// }, 2000)
- }
+ },
+ ...websocket.actions,
+ ...positions.actions
}
export default actions
--
Gitblit v1.9.3