diff --git a/hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java b/hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java index 2d688b125..80af8fc4a 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/component/MiniComponent.java @@ -111,7 +111,7 @@ public class MiniComponent { return sessionInfo; } - public AjaxResult registration(String openid, String mobile, String nickName, Long deptId) { + public AjaxResult registration(String openid, String mobile, String nickName, Long deptId, String avatar) { SysUser user = new SysUser(); String userName = MINI_USER_SYMBOL + openid + "-" + deptId; @@ -119,6 +119,7 @@ public class MiniComponent { user.setPhonenumber(mobile); user.setNickName(nickName); user.setDeptId(deptId); + user.setAvatar(avatar); user.setPassword(MINI_DEFUALT_PASSWORD); user.setRoleIds(new Long[]{MINI_DEFUALT_ROLEID}); user.setPostIds(new Long[]{MINI_DEFUALT_POSTID}); diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniUserController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniUserController.java index 03151ec49..07a15575b 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniUserController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/mini/MiniUserController.java @@ -8,8 +8,10 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.SysLoginService; +import com.ruoyi.system.service.ISysUserService; import com.ruoyi.winery.component.MiniComponent; import com.ruoyi.winery.domain.winery.WineryCompanyRecord; import com.ruoyi.winery.enums.IrrigationTypeEnum; @@ -44,7 +46,7 @@ public class MiniUserController { @Autowired - private SysLoginService loginService; + private ISysUserService userService; /** * 通过微信api授权获取手机号 @@ -83,7 +85,8 @@ public class MiniUserController { String mobile = json.getStr("mobile"); Long deptId = json.getLong("deptId"); String nickName = json.getJSONObject("userInfo").getStr("nickName"); - return miniComponent.registration(openid, mobile, nickName, deptId); + String avatar = json.getJSONObject("userInfo").getStr("avatarUrl"); + return miniComponent.registration(openid, mobile, nickName, deptId, avatar); } @@ -107,6 +110,16 @@ public class MiniUserController { // 生成令牌 String token = miniComponent.loginByMini(userAccount); ajax.put(Constants.TOKEN, token); + SysUser user = userService.selectUserByUserName(userAccount); + + JSONObject userInfo = new JSONObject(); + userInfo.set("nickName",user.getNickName()); + userInfo.set("avatarUrl" ,user.getAvatar()); + userInfo.set("mobile" ,user.getPhonenumber()); + + ajax.put("userInfo", userInfo); + + return ajax; } diff --git a/mini-app/src/appManager.js b/mini-app/src/appManager.js index 94ca4f0b8..a7922e85a 100644 --- a/mini-app/src/appManager.js +++ b/mini-app/src/appManager.js @@ -26,8 +26,11 @@ class AppManager { if (req2.token) { store.dispatch('setTokenAction', req2.token) self.setCacheInfo() + self.setRemoteUserInfo(req2.userInfo) } + + wx.hideLoading() if (callBack) { @@ -52,6 +55,11 @@ class AppManager { return wx.getStorageSync('openid') } + setRemoteUserInfo(userInfo) { + store.dispatch('setMobileAction', userInfo.mobile) + store.dispatch('setUserInfoAction', userInfo) + } + setCacheInfo() { const mobile = wx.getStorageSync('mobile') const openid = wx.getStorageSync('openid') diff --git a/mini-app/src/components/mall/tab/mall-my.wpy b/mini-app/src/components/mall/tab/mall-my.wpy index 2dc39a355..5f453bafa 100644 --- a/mini-app/src/components/mall/tab/mall-my.wpy +++ b/mini-app/src/components/mall/tab/mall-my.wpy @@ -67,7 +67,7 @@
- +