jinyuan 2 years ago
parent
commit
0fb29b4926
5 changed files with 38 additions and 24 deletions
  1. 6 1
      api/api.js
  2. 9 13
      common/service/service.js
  3. 3 3
      manifest.json
  4. 11 3
      pages/login/login.vue
  5. 9 4
      store/index.js

+ 6 - 1
api/api.js

@@ -6,8 +6,13 @@ const apiService = {
 	  * 登录
 	  * 登录
 	  */
 	  */
 	login(params) {
 	login(params) {
-		return http.post('/ibps/business/v3/mobile/sys/mLogin',params)	
+		return http.post('/ibps/oauth2/v3/user/login/apply',params)	
 	},
 	},
+	
+	context(url, params) {
+		return http.post(url,params)	
+	},
+	
 	sign(params){
 	sign(params){
 		return http.post('/ibps/business/v3/mobile/sys/sign',params)
 		return http.post('/ibps/business/v3/mobile/sys/sign',params)
 	},
 	},

+ 9 - 13
common/service/service.js

@@ -40,13 +40,9 @@ http.validateStatus = (statusCode) => {
 
 
 http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
 http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
   //判断是否请求白名单,设置带不带token
   //判断是否请求白名单,设置带不带token
-/*  let url= config.url;
-
-  if(url!="/ibps/business/v3/mobile/sys/mLogin"
-  ||url!="ibps/oauth2/v3/authorize/apply"
-  ||url!="ibps/oauth2/v3/authentication/apply"
-
-  if(url=="/ibps/business/v3/mobile/sys/mLogin"
+  let url= config.url;
+  console.log(url)
+/*  if(url=="/ibps/oauth2/v3/user/login/apply"
   ||url=="ibps/oauth2/v3/authorize/apply"
   ||url=="ibps/oauth2/v3/authorize/apply"
   ||url=="ibps/oauth2/v3/authentication/apply"
   ||url=="ibps/oauth2/v3/authentication/apply"
   ){
   ){
@@ -54,15 +50,15 @@ http.interceptor.request((config, cancel) => { /* 请求之前拦截器 */
 	  return config;
 	  return config;
   }  */
   }  */
   
   
-/*  config.header = {
+  config.header = {
     ...config.header,
     ...config.header,
      'X-Authorization-access_token':getTokenStorage()
      'X-Authorization-access_token':getTokenStorage()
-  } */
-  /*
-  if (!token) { // 如果token不存在,调用cancel 会取消本次请求,但是该函数的catch() 仍会执行
+  } 
+
+/*  if (!token) { // 如果token不存在,调用cancel 会取消本次请求,但是该函数的catch() 仍会执行
     cancel('token 不存在') // 接收一个参数,会传给catch((err) => {}) err.errMsg === 'token 不存在'
     cancel('token 不存在') // 接收一个参数,会传给catch((err) => {}) err.errMsg === 'token 不存在'
-  }
-  */
+  } */
+  
   return config
   return config
 })
 })
 
 

+ 3 - 3
manifest.json

@@ -1,6 +1,6 @@
 {
 {
-    "name" : "金通实验室",
-    "appid" : "__UNI__533548F",
+    "name" : "明鉴细胞",
+    "appid" : "__UNI__1EEF022",
     "description" : "",
     "description" : "",
     "versionName" : "2.2.22",
     "versionName" : "2.2.22",
     "versionCode" : 233,
     "versionCode" : 233,
@@ -92,7 +92,7 @@
             }
             }
         },
         },
         "router" : {
         "router" : {
-            "base" : "/h5/"
+            "base" : "/mj/"
         },
         },
         "devServer" : {
         "devServer" : {
             "https" : false
             "https" : false

+ 11 - 3
pages/login/login.vue

@@ -83,8 +83,8 @@
             return {
             return {
 				shape:'',//round 圆形
 				shape:'',//round 圆形
 				loading: false,
 				loading: false,
-				userName: '邓进源',
-				password: '123456',
+				userName: 'jinyuan',
+				password: 'szjbd168',
 				phoneNo: '',
 				phoneNo: '',
 				smsCode: '',
 				smsCode: '',
 				showPassword: false, //是否显示明文
 				showPassword: false, //是否显示明文
@@ -176,7 +176,7 @@
 					
 					
 					//return
 					//return
 					
 					
-					
+					let that=this;
 			        this.mLogin(loginParams).then((res) => {
 			        this.mLogin(loginParams).then((res) => {
 					  this.loading=false;
 					  this.loading=false;
 					 // console.log(res)
 					 // console.log(res)
@@ -186,6 +186,14 @@
 						 // #endif
 						 // #endif
 						 // #ifndef APP-PLUS
 						 // #ifndef APP-PLUS
 						//  console.log(this.$store)
 						//  console.log(this.$store)
+						console.log(loginParams)
+						let url="ibps/oauth2/v3/user/context?username="+loginParams.username
+						//获取用户信息
+						let userpara={username:loginParams.username};						
+						that.$http.post(url,userpara).then(res=>{
+	                         console.log(res)
+						})
+						
 						  this.$tip.success('登录成功!')
 						  this.$tip.success('登录成功!')
 						  this.$Router.replaceAll({name:'index'})
 						  this.$Router.replaceAll({name:'index'})
 						 // #endif
 						 // #endif

+ 9 - 4
store/index.js

@@ -52,17 +52,17 @@ export default new Vuex.Store({
 		   
 		   
 		  if(response.data.state ==200){ 
 		  if(response.data.state ==200){ 
 	        const result = response.data
 	        const result = response.data
-	        const userInfo = response.data.data
+	      //  const userInfo = response.data.data
 
 
-			uni.setStorageSync(USER_INFO,userInfo);
+			//uni.setStorageSync(USER_INFO,userInfo);
 			
 			
             commit('SET_TOKEN', "")
             commit('SET_TOKEN', "")
             commit('SET_AVATAR', null)
             commit('SET_AVATAR', null)
-            commit('SET_NAME', userInfo.username)
+            //commit('SET_NAME', userInfo.username)
 
 
 			let params = {};
 			let params = {};
 			console.log("data:",userInfo)
 			console.log("data:",userInfo)
-			params.login_state=userInfo.data;
+			params.login_state=result.data;
 			params.client_id="ibps";   
 			params.client_id="ibps";   
 			//授权第二步
 			//授权第二步
 			api.authorize(params).then(response2 =>{				
 			api.authorize(params).then(response2 =>{				
@@ -83,6 +83,11 @@ export default new Vuex.Store({
 							 uni.setStorageSync(ACCESS_TOKEN,res.data.data.access_token);
 							 uni.setStorageSync(ACCESS_TOKEN,res.data.data.access_token);
 							 uni.setStorageSync("refresh_token",res.data.data.refresh_token);
 							 uni.setStorageSync("refresh_token",res.data.data.refresh_token);
 							 
 							 
+							 
+
+							 
+							 
+							 
 						     resolve(res)
 						     resolve(res)
 							 }
 							 }
 							 else{
 							 else{