wcni 5 years ago
parent
commit
71f5d489ef
5 changed files with 45 additions and 7 deletions
  1. 21 2
      App.vue
  2. 8 2
      pages/index/hoteldetail.vue
  3. 13 3
      pages/myCenter/index.vue
  4. 2 0
      pages/myCenter/logion.vue
  5. 1 0
      store/logion.js

+ 21 - 2
App.vue

@@ -7,6 +7,11 @@
 		methods: {
 		methods: {
 			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess','beginload'])
 			...mapMutations(['setOpenid','login','showDialog','setcode','islogionsuccess','beginload'])
 		},
 		},
+		data(){
+			return{
+				username: {}
+			}
+		},
 		computed:{
 		computed:{
 			...mapState([
 			...mapState([
 			  'hasLogin',  // 用户是否同意授权
 			  'hasLogin',  // 用户是否同意授权
@@ -18,18 +23,32 @@
 			]),
 			]),
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {
-			// 用户登录
+			// 用户登录  avatarUrl   nickName 
 			let that = this;
 			let that = this;
 			let sessionId =  uni.getStorageSync('sessionId');// 用户token
 			let sessionId =  uni.getStorageSync('sessionId');// 用户token
 			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
 			let userInfo = uni.getStorageSync('userInfo');// 用户头像信息
+			console.log(userInfo);
+			console.log("打印用户信息")
 			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
 			let getcode= uni.getStorageSync('getcode');// 用户code oppenid
 			console.log(userInfo)
 			console.log(userInfo)
 			if(sessionId != '') {
 			if(sessionId != '') {
 				uni.checkSession({
 				uni.checkSession({
 					   success(){  
 					   success(){  
 					     console.log("登录未过期")  
 					     console.log("登录未过期")  
+						 that.request({
+						 	url:'/v2/member/info',
+						 	method:'GET',
+						 	success: (res)=>{
+								console.log(res);
+								let { data } = res.data;
+						 		that.username.avatarUrl= data.member_avatar;
+								that.username.nickName = data.member_truename;
+								console.log(that.username)
+								console.log("dddd")
+								that.login(that.username);
+						 	}
+						 })
 						 that.setOpenid(sessionId);
 						 that.setOpenid(sessionId);
-						 that.login(userInfo);
 						 that.setcode(getcode);
 						 that.setcode(getcode);
 						 that.showDialog(true);
 						 that.showDialog(true);
 						 that.beginload(true);
 						 that.beginload(true);

+ 8 - 2
pages/index/hoteldetail.vue

@@ -45,13 +45,19 @@
 	      </view>
 	      </view>
 			
 			
 	  </view>
 	  </view>
-		  <view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="ishowpull">
+	     <view style="clear: both;
+			overflow: hidden;
+			position: fixed;
+			z-index: 99;
+			background: #fff;">
+			<view style="padding: 10upx  12upx;display: flex;flex-wrap: wrap;" v-if="ishowpull">
 			  <view  class="spacedance"
 			  <view  class="spacedance"
 			   v-for="(item, index) in category_list" :key="index"
 			   v-for="(item, index) in category_list" :key="index"
 				 @click.stop="confirm(item)" >
 				 @click.stop="confirm(item)" >
 				 {{item.gc_name}}
 				 {{item.gc_name}}
 			  </view> 
 			  </view> 
-		  </view>
+			</view>
+			</view>
 		  <scroll-view  class="floor-list"
 		  <scroll-view  class="floor-list"
 		   :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		   :scroll-top="scrollTop" scroll-y="true"  @scroll="scroll"  @scrolltoupper="upper" @scrolltolower="lower"
 		   refresher-enabled="true">
 		   refresher-enabled="true">

+ 13 - 3
pages/myCenter/index.vue

@@ -6,9 +6,14 @@
 			</view>
 			</view>
 			<view class="myNmae">
 			<view class="myNmae">
 				<view class="myNmaeLeft"> 
 				<view class="myNmaeLeft"> 
-					<view class="myNmaeImg">
+					<view class="myNmaeImg"  v-if="successlogion&&hasLogin || !successlogion && hasLogin">
 						<image :src="userInfo.avatarUrl"></image>
 						<image :src="userInfo.avatarUrl"></image>
 					</view>
 					</view>
+					
+					<view class="myNmaeImg" v-if="!successlogion && !hasLogin|| successlogion && !hasLogin">
+						<image src=""></image>
+					</view>
+					
                     <view v-if="successlogion&&hasLogin">
                     <view v-if="successlogion&&hasLogin">
 						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
 						<view  style="font-size: 34upx;margin-bottom: 32upx;">{{userInfo.nickName}}</view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{member_points}}></view>
 						<view style="font-size: 24upx"  @click="goAdress(3)" >圈币{{member_points}}></view>
@@ -148,11 +153,16 @@
 		computed:{
 		computed:{
 			...mapState([
 			...mapState([
 			  'hasLogin',
 			  'hasLogin',
-			  'userInfo',
-			  'successlogion'
+			  'successlogion',
+			  'getcode',
+			  'userInfo'
+			  
 			]),
 			]),
 		},
 		},
 		onLoad() {
 		onLoad() {
+			console.log(this.$store)
+			console.log(this.hasLogin)
+			console.log(this.userInfo)
 			if(this.successlogion && this.hasLogin) {
 			if(this.successlogion && this.hasLogin) {
 				this.getuserinfo();
 				this.getuserinfo();
 		  	}else {
 		  	}else {

+ 2 - 0
pages/myCenter/logion.vue

@@ -97,6 +97,7 @@
 							 }
 							 }
 					     },
 					     },
 					     fail(res) {
 					     fail(res) {
+						     console.log(res);
 							 that.showDialog(false);
 							 that.showDialog(false);
 							 that.$msg("授权失败")
 							 that.$msg("授权失败")
 					     }
 					     }
@@ -131,6 +132,7 @@
 													uni.navigateBack();
 													uni.navigateBack();
 												},
 												},
 												fail: (res) => {
 												fail: (res) => {
+													    console.log(res);
 														 this.islogionsuccess(false);
 														 this.islogionsuccess(false);
 														 this.setOpenid('');
 														 this.setOpenid('');
 														 this.$msg("获取失败")
 														 this.$msg("获取失败")

+ 1 - 0
store/logion.js

@@ -15,6 +15,7 @@ const store = new Vuex.Store({
 	},
 	},
 	mutations: {
 	mutations: {
 		login(state, provider) {
 		login(state, provider) {
+			console.log(provider);
 			state.userInfo = provider;
 			state.userInfo = provider;
 			uni.setStorage({//缓存用户登陆信息
 			uni.setStorage({//缓存用户登陆信息
 			    key: 'userInfo',  
 			    key: 'userInfo',