Kaynağa Gözat

fix(login):登录携带@yg获取不到session

HMY 1 yıl önce
ebeveyn
işleme
bcf574d541
4 değiştirilmiş dosya ile 13 ekleme ve 20 silme
  1. 1 13
      pages/mine/avatar/avatar.vue
  2. 7 4
      store/user.js
  3. 3 1
      utils/errorCode.js
  4. 2 2
      utils/request.js

+ 1 - 13
pages/mine/avatar/avatar.vue

@@ -3,10 +3,7 @@
 		<tt-cropper mode="ratio" :imageUrl="avatarModel.imageUrl" :width="500" :height="500" :radius="90" :delay="300"
 			@cancel="onCancel" @confirm="onConfirm">
 		</tt-cropper>
-		<!-- <view class="preview">
-			<image class="avatar-image" :src="avatarModel.avatarPath" mode="aspectFill" @click="previewImage(avatarModel.avatarPath)"></image>
-		</view> -->
-		
+	
 		<view class="preview">
 		  <image class="avatar-image" :src="avatarModel.avatarPath" mode="aspectFill" @click="previewImage(avatarModel.avatarPath)"></image>
 		  <image class="blur-image" :src="avatarModel.avatarPath" mode="aspectFill"></image>
@@ -129,15 +126,6 @@
 <style lang="scss" scoped>
 	
 	.container{
-		// .preview {
-		// 	padding: 1rem;
-		// 	text-align: center;
-		// 	margin: 3rem auto;
-		// 	image {
-		// 		width: 15.625rem;
-		// 		height: 15.625rem;
-		// 	}
-		// }
 		
 		button {
 			margin-top: 10px;

+ 7 - 4
store/user.js

@@ -35,21 +35,24 @@ export const useUserStore = defineStore('user', () => {
 	}
 	// 登录方法
 	function Login(userInfo) {
-		const username = userInfo.username
+		let username = userInfo.username
 		const password = userInfo.password
 		const loginInfo = {
 			username,
 			password
 		}
 		return new Promise((resolve, reject) => {
-			login(username.trim(), password)
+			username = username.trim()
+			login(username, password)
 				.then(res => {
 					useId.value = res.returnParams.useId // 设置staffId
 					user.value = res.returnParams
 					//保存账号密码
 					uni.setStorageSync('loginInfo', loginInfo)
-					// setSession(res.session)
-					reLogin(username.trim(), password).then((res) => {
+					if(username.includes('@')){
+						username = username.split('@')[0]
+					}
+					reLogin(username, password).then((res) => {
 						if ("ok" === res.data) {
 							setSession(res.cookies[0].split("=")[1].split(";")[0]);
 							timer.value = true

+ 3 - 1
utils/errorCode.js

@@ -2,5 +2,7 @@ export default {
   '401': '认证失败,无法访问系统资源',
   '403': '当前操作没有权限',
   '404': '访问资源不存在',
-  'default': '系统未知错误,请反馈给管理员'
+  'default': '系统未知错误,请反馈给管理员',
+	'-201': '',
+	'-99': '用户异常',
 }

+ 2 - 2
utils/request.js

@@ -58,8 +58,8 @@ const request = config => {
       const { statusCode, data } = response
       const returnCode = data.returnCode
       const code = statusCode || 200
-      const msg = errorCode[code] || data.returnMsg || errorCode['default']
-      if (returnCode == -201) {
+      const msg = data.returnMsg || errorCode['default']
+      if (errorCode[returnCode] != undefined) {
         toast(msg)
         reject(returnCode)
         return