diff --git a/pages/amusement/amusementdetail/amusementdetail.vue b/pages/amusement/amusementdetail/amusementdetail.vue
index 3964f26..104998a 100644
--- a/pages/amusement/amusementdetail/amusementdetail.vue
+++ b/pages/amusement/amusementdetail/amusementdetail.vue
@@ -50,9 +50,9 @@
 			<!-- </view> -->
 
 		</view>
-		
+
 		<view class="mode_com">
-			
+
 			<!-- <view class="secdt_tips">
 				<view  bindtap="callPhone" class="secdt_adr dly_flex_c" :data-mobile="info.hphone" >
 					<image class="adr_pic" src="../../../static/images/icon_phe.png"></image>
@@ -60,11 +60,11 @@
 					<text class="cot_adr2" @click="callPhone(info.phone)">{{info.phone}}</text>
 
 				</view>
-				
+
 
 			</view> -->
 		</view>
-		
+
 
 
 
@@ -85,9 +85,9 @@
 
 
 		</view>
-		
+
 		<!-- 评论 -->
-		
+
 		<!-- <view class="mode_com mt_1">
 			<text class="tit_com">住客评价</text>
 			<view class="inx_ht_warp">
@@ -218,7 +218,7 @@
 			},
 			daohang:function(){
 				// #ifdef H5
-				
+
 				if (this.$wechat.isWechat()) {
 					var mapParam = {
 						latitude: this.info.lat,
@@ -282,7 +282,7 @@
 				};
 				this.$Request.post(this.$config.hoteltotalnumAndPj, data).then(res => {
 					if(res.data.length > 0){
-						this.peoplesnum = res.data[0];	
+						this.peoplesnum = res.data[0];
 					}
 				});
 			}, */
diff --git a/pages/amusement/shoplist/amusementlist.vue b/pages/amusement/shoplist/amusementlist.vue
index 549c04e..0668e7d 100644
--- a/pages/amusement/shoplist/amusementlist.vue
+++ b/pages/amusement/shoplist/amusementlist.vue
@@ -17,7 +17,7 @@
 					<view class="an_sch_img" @click="search()"><image src="../../../static/animg/icon-search.png" class="ac_size_1"></image></view>
 				</view>
 
-				
+
 			</view>
 		</view>
 		<scroll-view @scroll="onReachScroll" @bindscrolltolower="lower" class="scroll-view" :scroll-top="topNum" scrollY="true">
@@ -238,7 +238,7 @@ export default {
 			)
 			if(!that.netType){
 				return;
-			}		
+			}
 			this.$util.hideLoadingByTime();
 		uni.showLoading({
 			title: '加载中',
@@ -313,7 +313,7 @@ export default {
 					that.chaType = "";
 				} else {
 					that.get_data();
-				} 
+				}
 			})
 		},
 		initData: function() {
@@ -542,7 +542,7 @@ export default {
 		},
 		goToAntDetail: function(guid, region) {
 			uni.navigateTo({
-				url: '/pages/amusement/amusementdetail/amusementdetail?guid=' + guid 
+				url: '/pages/amusement/amusementdetail/amusementdetail?guid=' + guid
 			});
 		}
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d3764f3..797b33f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -133,7 +133,7 @@
 				<view class="an_box_2">
 					<view class="an_t" @click="goToPages('video')">
 						<view class="an_t_1">历史影像</view>
-						<view class="an_t_2">珍贵的历史见证</view>
+						<view class="an_t_2">酿造美好生活</view>
 					</view>
 				</view>
 				<view class="aml_30">
@@ -316,6 +316,7 @@ export default {
 
 					//轮播图
 					var lbtList = initData.lbtList;
+					if(lbtList&&lbtList.length){
 					for (let i = 0; i < lbtList.length; i++) {
 						lbtList[i].logo = this.$config.ROOTPATH + lbtList[i].logo;
 						this.images[i] = lbtList[i].logo;
@@ -323,48 +324,59 @@ export default {
 					this.image = this.images[0];
 					this.image2 = this.images[1];
 					this.image3 = this.images[0];
+					}
 					//景点
 					var scenicList = initData.entertainmentList;
-					var scLength = scenicList.length > 4 ? 4 : scenicList.length;
-					var scdata = [];
-					for (let i = 0; i < scLength; i++) {
-						scenicList[i].logo = this.$config.ROOTPATH + scenicList[i].logo;
-						scdata.push(scenicList[i]);
+					if(scenicList&&scenicList.length){
+						var scLength = scenicList.length > 4 ? 4 : scenicList.length;
+						var scdata = [];
+						for (let i = 0; i < scLength; i++) {
+							scenicList[i].logo = this.$config.ROOTPATH + scenicList[i].logo;
+							scdata.push(scenicList[i]);
+						}
+						this.scenicList = scdata;
 					}
-					this.scenicList = scdata;
 					//视频
 					var videoList = initData.videoList;
-					var viLength = videoList.length > 4 ? 4 : videoList.length;
-					for (var i = 0; i < viLength; i++) {
-						var item = {
-							imgurl: videoList[i].logo == '' ? '' : this.$config.ROOTPATH + videoList[i].logo,
-							videourl: this.$config.ROOTPATH + videoList[i].videopath,
-							guid: videoList[i].guid,
-							title: videoList[i].title,
-							time: videoList[i].subtitle
-						};
-						this.videoList.push(item);
+					if(videoList&&videoList.length){
+						var viLength = videoList.length > 4 ? 4 : videoList.length;
+						for (var i = 0; i < viLength; i++) {
+							var item = {
+								imgurl: videoList[i].logo == '' ? '' : this.$config.ROOTPATH + videoList[i].logo,
+								videourl: this.$config.ROOTPATH + videoList[i].videopath,
+								guid: videoList[i].guid,
+								title: videoList[i].title,
+								time: videoList[i].subtitle
+							};
+							this.videoList.push(item);
+						}
 					}
 					console.log(this.videoList,'90090000')
 					this.indexNum = viLength;
 					// 非遗
 					var feiyiList = initData.feiyiList;
-					var wcLength = feiyiList.length > 4 ? 4 : feiyiList.length;
-					for (var i = 0; i < wcLength; i++) {
-						var item = {
-							logo: this.$config.ROOTPATH + feiyiList[i].logo,
-							guid: feiyiList[i].guid
-						};
-						this.feiyiList.push(item);
+					if(feiyiList&&feiyiList.length){
+						var wcLength = feiyiList.length > 4 ? 4 : feiyiList.length;
+						for (var i = 0; i < wcLength; i++) {
+							var item = {
+								logo: this.$config.ROOTPATH + feiyiList[i].logo,
+								guid: feiyiList[i].guid
+							};
+							this.feiyiList.push(item);
+						}
+						
 					}
-
+					
 					//活动
 					var hoteventList = initData.hoteventList;
-					for (var i = 0; i < hoteventList.length; i++) {
-						hoteventList[i].logo = this.$config.ROOTPATH + hoteventList[i].logo;
+					if(hoteventList&&hoteventList.length){
+						for (var i = 0; i < hoteventList.length; i++) {
+							hoteventList[i].logo = this.$config.ROOTPATH + hoteventList[i].logo;
+						}
+						this.lineOneList = hoteventList[0];
+						this.hoteventList = hoteventList.splice(1, hoteventList.length - 1);
 					}
-					this.lineOneList = hoteventList[0];
-					this.hoteventList = hoteventList.splice(1, hoteventList.length - 1);
+					
 					//多彩邯郸
 					this.SJZObject = initData.duoCaiList[0];
 				} else {
diff --git a/pages/personcenter/personcenter.vue b/pages/personcenter/personcenter.vue
index 0fc8c51..4fe914a 100644
--- a/pages/personcenter/personcenter.vue
+++ b/pages/personcenter/personcenter.vue
@@ -21,7 +21,7 @@
 							<!-- <text class="t_nic">{{nickname}}阳光夏~小葵</text> -- 已登录状态 显示用户昵称      -->
 							<text class="t_nic">{{ nickname }}</text>
 							<!--登录后 退出按钮-->
-							<text v-if="isLogin" class="pes_img_tc" @tap="jump('logoutWechat')">退出</text>
+							<!-- <text v-if="isLogin" class="pes_img_tc" @tap="jump('logoutWechat')">退出</text> -->
 						</view>
 					</view>
 					<!-- 头像 -->
@@ -288,21 +288,26 @@ export default {
 							wx.login({
 								success: (res) => {
 									console.log(res, '登录获取的code');
-									this.code = res.code;
-									wx.request({
-										url:
-											'https://api.weixin.qq.com/sns/jscode2session?appid=wx111bbea67d1b06d5&secret=5d5a1ac827c9eab437a90927ebb8a47d&js_code=' +
-											this.code +
-											'&grant_type=authorization_code',
-										success: function (res) {
-											console.log(res);
-											uni.setStorageSync('unionid', aes.aesMinEncrypt(res.data.openid));
-										},
-										fail: function (err) {
-											console.log(err); //App.json中默认超时时间为60秒
-										}
-									});
-									console.log(this.code, res);
+									var data = {
+										code: res.code
+									};
+									this_.$Request.post(this_.$config.getUserInformation, data).then(res => {
+										console.log(res)
+									})
+									// uni.request({
+									// 	url:
+									// 		'https://api.weixin.qq.com/sns/jscode2session?appid=wx111bbea67d1b06d5&secret=5d5a1ac827c9eab437a90927ebb8a47d&js_code=' +
+									// 		this.code +
+									// 		'&grant_type=authorization_code',
+									// 	success: function (res) {
+									// 		console.log(res);
+									// 		uni.setStorageSync('unionid', aes.aesMinEncrypt(res.data.openid));
+									// 	},
+									// 	fail: function (err) {
+									// 		console.log(err); //App.json中默认超时时间为60秒
+									// 	}
+									// });
+									// console.log( res);
 								},
 								fail: function (error) {
 									console.log('login failed ' + error);
@@ -315,7 +320,7 @@ export default {
 									uni.setStorageSync('nickname', aes.aesMinEncrypt(res.userInfo.nickName));
 									uni.setStorageSync('headimgurl', aes.aesMinEncrypt(res.userInfo.avatarUrl));
 									uni.setStorageSync('oauthTime', new Date().getTime());
-									this_.nickName = res.userInfo.nickName;
+									this_.nickName = '';
 									this_.headimgurl = res.userInfo.avatarUrl;
 								},
 								fail: function (error) {
diff --git a/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue
index 7f5ac69..e43f7da 100644
--- a/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue
+++ b/pages/sirendingzhi/sirendingzhilist/sirendingzhilist.vue
@@ -21,7 +21,7 @@
 			</view>
 			<view>
 				<scroll-view @scroll="onReachScroll" @bindscrolltolower="lower" class="" :scroll-top="topNum" scrollY="true" style="top:200rpx;height:100vh">
-					<view class="list-container" style="background: none;">
+					<view class="list-container" style="background: none;padding-bottom: 40rpx">
 						<view class="aml_30 amr_30">
 							<navigator
 								class="amt_30"
diff --git a/sunPackIndex/scenic/scenicdetial/scenicdetial.vue b/sunPackIndex/scenic/scenicdetial/scenicdetial.vue
index 5d4536e..0d06787 100644
--- a/sunPackIndex/scenic/scenicdetial/scenicdetial.vue
+++ b/sunPackIndex/scenic/scenicdetial/scenicdetial.vue
@@ -425,7 +425,6 @@ export default {
 				key: this.$param.userkey
 			};
 			this.$Request.post(this.$config.getScenicListByGuidss, data).then((res) => {
-				console.log(res);
 				this.scenicList = res.data;
 			});
 		},
@@ -693,8 +692,9 @@ export default {
 		},
 		goToScenicDetail: function (guid) {
 			//Android.gotoDetial("SCENIC", guid + "");
+			debugger
 			uni.navigateTo({
-				url: '/sunPackIndex/scenic/scenicdetial/scenicdetial?guid=' + guid
+				url: '/pages/amusement/amusementdetail/amusementdetail?guid=' + guid 
 			});
 		},
 		play: function (soundpath) {