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

zengh

2021-06-24 f3eebd2f83cd6d12e3b714ac464f8717e0272e0f

 store/actions.js

@@ -47,7 +47,7 @@
               store.commit('getUserData',res.data)
               console.log(res.data,123542);
               data.isit = true;
               data.userName = res.data.real_name; //警袁姓名
               data.userName = res.data.nick_name; //警袁姓名
               data.userID = res.data.user_id; //警袁id
               data.avatar = res.data.avatar; //头像
               // data.userPhon = res.user_id;