From c7c49be8b15e6355dc19e8705dc7bc2de603e398 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 04 九月 2023 12:00:05 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
minipro_standard/pages/login/login.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/minipro_standard/pages/login/login.vue b/minipro_standard/pages/login/login.vue
index 8446015..46d088a 100644
--- a/minipro_standard/pages/login/login.vue
+++ b/minipro_standard/pages/login/login.vue
@@ -49,7 +49,7 @@
let info = await getUserInfo()
if (info.code === 200) {
await that.$store.commit('setEntrance', 'WX')
- await that.$store.commit('setUserInfo', info.data)
+ await that.$store.commit('SETUSERINFO', info.data)
await that.$store.dispatch('getMenuList', 2)
uni.switchTab({
url: '/pages/workbench/workbench'
@@ -71,6 +71,7 @@
if (!this.from.password) return uni.showToast({ title: '瀵嗙爜涓嶈兘涓虹┖', icon:"error", duration: 2000 });
let res = await wxAccountLogin(this.from)
if (res.code === 200) {
+ await this.$store.commit('SETSESSION', res.data)
let user = await getUserInfo({})
if (user.code === 200) {
await this.$store.commit('SETUSERINFO', user.data)
--
Gitblit v1.9.3