From 16ac09ee67d196fef8f4bff6189e7f7ff1011b4b Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 24 三月 2024 23:12:35 +0800
Subject: [PATCH] 1

---
 src/views/login/components/passwordForm.vue |   92 +++++++++++++++++----------------------------
 1 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index b0eb9cb..b07c340 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -49,6 +49,18 @@
 			//this.$HTTP.get('/api/blade-sync/outer-app-config/appStatus')
 		},
 		methods: {
+			// qsStringify(obj) {
+			//   return Object.keys(obj)
+			//     .map(key => {
+			//       if (Array.isArray(obj[key])) {
+			//         return obj[key]
+			//           .map(arrayValue => `${encodeURIComponent(key)}=${encodeURIComponent(arrayValue)}`)
+			//           .join('&');
+			//       }
+			//       return `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`;
+			//     })
+			//     .join('&');
+			// },
 			async login(){
 				var validate = await this.$refs.loginForm.validate().catch(()=>{})
 				if(!validate){ return false }
@@ -61,40 +73,7 @@
 					grant_type: "password",
 					scope: "all"
 				}
-				//鑾峰彇鑿滃崟
-				// var menu = null
-				// if(this.form.user == 'admin'){
-				// 	menu = await this.$API.system.menu.myMenus.get()
-				// }else{
-				// 	menu = await this.$API.demo.menu.get()
-				// }
-				// if(menu.code == 200){
-				// 	if(menu.data.menu.length==0){
-				// 		this.islogin = false
-				// 		this.$alert("褰撳墠鐢ㄦ埛鏃犱换浣曡彍鍗曟潈闄愶紝璇疯仈绯荤郴缁熺鐞嗗憳", "鏃犳潈闄愯闂�", {
-				// 			type: 'error',
-				// 			center: true
-				// 		})
-				// 		return false
-				// 	}
-				// 	this.$TOOL.data.set("MENU", menu.data.menu)
-				// 	this.$TOOL.data.set("PERMISSIONS", menu.data.permissions)
-				// 	this.$TOOL.data.set("DASHBOARDGRID", menu.data.dashboardGrid)
-				// }else{
-				// 	this.islogin = false
-				// 	this.$message.warning(menu.message)
-				// 	return false
-				// }
-
-				// this.$router.replace({
-				// 	path: '/'
-				// })
-				// this.$message.success("Login Success 鐧诲綍鎴愬姛")
-				// this.islogin = false
-
-
-
-				await this.$HTTP.postJ("/api/blade-auth/oauth/token",data).then(res=> {
+				await this.$HTTP.postJ("/api/blade-auth/oauth/token?" + this.$TOOL.qsStringify(data)).then(res=> {
 					if(res.user_id) {
 						//鑾峰彇token
 						this.$TOOL.cookie.set("TOKEN", res.access_token, {
@@ -105,11 +84,8 @@
 						res.dashboard = "0";
 						res.userId =  "1";
 						this.$TOOL.data.set("USER_INFO", res);
-						//鑾峰彇鑿滃崟
-						
-						
-					}else {
 						this.islogin = false;
+					}else {
 						this.$message({
 				          showClose: true,
 				          message: res.error_description,
@@ -117,27 +93,29 @@
 				        });
 					}
 				})
+				await this.$HTTP.postJ("/api/blade-system/menu/routes?" + this.$TOOL.qsStringify({"appCode": "CPS"})).then(res=> {
+					console.log(res,1111)
+				})
 				await this.$API.system.menu.myMenus.get().then(resp=> {
-							console.log('>>>>>>')
-							if(resp.data.menu.length==0){
-								this.islogin = false
-								this.$alert("褰撳墠鐢ㄦ埛鏃犱换浣曡彍鍗曟潈闄愶紝璇疯仈绯荤郴缁熺鐞嗗憳", "鏃犳潈闄愯闂�", {
-									type: 'error',
-									center: true
-								})
-								return false
-							}
-							this.$TOOL.data.set("MENU", resp.data.menu)
-							this.$TOOL.data.set("PERMISSIONS", resp.data.permissions)
-							this.$TOOL.data.set("DASHBOARDGRID", resp.data.dashboardGrid)
-
-						});
-						this.$router.replace({
-							path: '/'
-						})
-						this.$message.success("Login Success 鐧诲綍鎴愬姛")
+					if(resp.data.menu.length==0){
+						console.log(resp,2222)
 						this.islogin = false
-			},
+						this.$alert("褰撳墠鐢ㄦ埛鏃犱换浣曡彍鍗曟潈闄愶紝璇疯仈绯荤郴缁熺鐞嗗憳", "鏃犳潈闄愯闂�", {
+							type: 'error',
+							center: true
+						})
+						return false
+					}
+					this.$TOOL.data.set("MENU", resp.data.menu)
+					this.$TOOL.data.set("PERMISSIONS", resp.data.permissions)
+					this.$TOOL.data.set("DASHBOARDGRID", resp.data.dashboardGrid)
+				});
+				this.$router.replace({
+					path: '/'
+				})
+				this.$message.success("Login Success 鐧诲綍鎴愬姛")
+				this.islogin = false;
+			}
 		}
 	}
 </script>

--
Gitblit v1.9.3