gcz 4 anni fa
parent
commit
511264ec41

+ 1 - 1
common/apiurl.js

@@ -2,7 +2,7 @@ const apiurl = {
 	//反馈
 	feedbackAddUrl:'/articleFeedback/add',
 	// 获取微信用户信息
-	getuseinfourl:'/wechat/h5/user',
+	getuseinfourl:'/wechat/h5/user/get',
 	// 公众号支付
 	payurl:'/app/pay',
 	// 创建订单

+ 1 - 1
common/http.api.js

@@ -19,7 +19,7 @@ const install = (Vue, vm) => {
 	// 反馈提交
 	let feedbackAdd = (params = {}) => vm.$u.post(apiurl.feedbackAddUrl, params);
 	
-	let getuseinfo = (params = {}) => vm.$u.get(apiurl.getuseinfourl+'/'+params);
+	let getuseinfo = (params = {}) => vm.$u.get(apiurl.getuseinfourl);
 	
 	let createOrder = (params = {}) => vm.$u.post(apiurl.createOrderurl, params);
 	

+ 3 - 3
common/http.interceptor.js

@@ -15,9 +15,9 @@ const install = (Vue, vm) => {
 	// 请求拦截,配置Token等参数
 	Vue.prototype.$u.http.interceptor.request = (config) => {
 		// config.header.Token = 'xxxxxx';
-		
+		console.log();
 		// 方式一,存放在vuex的token,假设使用了uView封装的vuex方式,见:https://uviewui.com/components/globalVariable.html
-		config.header.token = vm.vuex_token;
+		config.header.Authorization = vm.vuex_token;
 		
 		// 方式二,如果没有使用uView封装的vuex方法,那么需要使用$store.state获取
 		// config.header.token = vm.$store.state.token;
@@ -41,7 +41,7 @@ const install = (Vue, vm) => {
 	Vue.prototype.$u.http.interceptor.response = (res) => {
 		// 如果把originalData设置为了true,这里得到将会是服务器返回的所有的原始数据
 		// 判断可能变成了res.statueCode,或者res.data.code之类的,请打印查看结果
-		// console.log('interceptor res',res);
+		console.log('interceptor res',res);
 		if(res.retHead.errCode == 0) {
 			// 如果把originalData设置为了true,这里return回什么,this.$u.post的then回调中就会得到什么
 			return res;  

+ 19 - 3
pages/example/components.vue

@@ -41,17 +41,33 @@
 			
 			let locationLocaturl = window.location.search;
 			let openId = getUrlParams(locationLocaturl,"openId");
-			if(!this.vuex_hasLogin&&!!openId){
-				this.$u.api.getuseinfo(openId).then(res => {
+			let token = getUrlParams(locationLocaturl,"token");
+			if(!!token){
+				this.$u.vuex('vuex_token', token);				
+			};
+			if(!this.vuex_hasLogin&&!!token){
+				this.$u.api.getuseinfo().then(res => {
 					console.log('getuseinfo',res.retBody);
 					this.$u.vuex('vuex_user', res.retBody);
 					this.$u.vuex('vuex_hasLogin', true);
-					this.$u.vuex('vuex_token', res.retBody.token);
 					if(!res.retBody.phone){
 						this.openPage('/pages/template/bindPhoneNumber/bindPhoneNumber')
 					}
 				})				
 			}
+			
+			// if(!this.vuex_hasLogin&&!!openId){
+			// 	this.$u.api.getuseinfo(openId).then(res => {
+			// 		console.log('getuseinfo',res.retBody);
+			// 		this.$u.vuex('vuex_user', res.retBody);
+			// 		this.$u.vuex('vuex_hasLogin', true);
+			// 		this.$u.vuex('vuex_token', res.retBody.token);
+			// 		if(!res.retBody.phone){
+			// 			this.openPage('/pages/template/bindPhoneNumber/bindPhoneNumber')
+			// 		}
+			// 	})				
+			// }
+			
 		},
 		created() {
 			

+ 3 - 3
pages/template/wxCenter/index.vue

@@ -9,11 +9,11 @@
 		</u-navbar>
 		<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30">
 			<view class="u-m-r-10" @click="login($store.state.vuex_hasLogin)">
-				<u-avatar :src="userInfo.headImgUrl||pic" size="140"></u-avatar>
+				<u-avatar :src="userInfo.avatar||pic" size="140"></u-avatar>
 			</view>
 			<view class="u-flex-1" @click="login($store.state.vuex_hasLogin)">
-				<view class="u-font-18 u-p-b-20">{{ userInfo.nickname || '请登录' }}</view>
-				<view class="u-font-14 u-tips-color">{{ userInfo.country || '未登录' }}</view>
+				<view class="u-font-18 u-p-b-20">{{ userInfo.nickName || '请登录' }}</view>
+				<view class="u-font-14 u-tips-color">手机号:{{ userInfo.phonenumber || '暂无' }}</view>
 			</view>
 			<view class="u-m-l-10 u-p-10">
 				<u-icon name="scan" color="#969799" size="28"></u-icon>