diff --git a/App.vue b/App.vue
index b9324b8..c034e84 100644
--- a/App.vue
+++ b/App.vue
@@ -32,4 +32,9 @@
 		font-weight: bold;
 		padding-left:24upx;
 	}
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background-color:#ffffff;
+	}
 </style>
diff --git a/components/wyb-drop-down/wyb-drop-down.vue b/components/wyb-drop-down/wyb-drop-down.vue
index 258e66a..19d8e48 100644
--- a/components/wyb-drop-down/wyb-drop-down.vue
+++ b/components/wyb-drop-down/wyb-drop-down.vue
@@ -4,12 +4,12 @@
 	 :style="{
 		 '--duration': duration + 'ms',
 		 '--autoContentTop': autoContentTop}">
-		
 		<view class="wyb-drop-down-container" @tap.stop.prevent @touchmove.stop.prevent>
 			<view 
 			 class="wyb-drop-down-header"
 			 :style="{
 				 zIndex: zIndex,
+				 top:statusBar+50+'px',
 				 backgroundColor: bgColor.header}">
 				 <view class="headercontainer">
 					<view 
@@ -59,6 +59,7 @@
 					 :scroll-anchoring="true"
 					 :style="{
 						 zIndex: zIndex - 1,
+						 top:statusBar*2+200+'rpx',
 						 fontSize: fontSize.content + 'rpx',
 						 backgroundColor: bgColor.content,
 						 borderBottomLeftRadius: radius + 'px',
@@ -116,7 +117,8 @@
 				headerActiveIndex: 0,
 				contentActiveIndexList: [],
 				disabled:true,
-				catagoryName:''
+				catagoryName:'',
+				statusBar:0
 			}
 		},
 		computed: {
@@ -215,6 +217,19 @@
 			}
 		},
 		mounted() {
+			uni.getSystemInfo({
+				success: (e) => {
+				 // #ifdef APP-PLUS
+				  console.log('app-plus', e)
+				  this.statusBar = e.statusBarHeight
+				  // #endif
+			 
+			 
+				  // #ifdef H5
+				  this.statusBar = 0
+				  // #endif
+				}
+			})
 			if (this.defaultIndexList.length === 0) {
 				this.options.forEach((item, index) => {
 					if (!item.custom) {
@@ -237,8 +252,8 @@
 		},
 		methods: {
 			searchHandle(){
-				console.log(this.catagoryName,"uuu")
 				this.$emit('getContent',this.catagoryName)
+				this.close()
 			},
 			clickHandle(){
 				this.disabled = false;
diff --git a/manifest.json b/manifest.json
index ff44303..9e00b39 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,32 +17,34 @@
             "delay" : 0
         },
         "statusbar" : {
-            "immersed" : false
+            "immersed" : true
         },
         /* 模块配置 */
         "modules" : {
             "OAuth" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Share" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -63,7 +65,13 @@
                         "UniversalLinks" : "https://lxwx.njrenzhou.cn/"
                     }
                 },
-                "ad" : {}
+                "ad" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx4ef4d1bae93a66ab",
+                        "UniversalLinks" : "https://lxwx.njrenzhou.cn/"
+                    }
+                }
             },
             "icons" : {
                 "android" : {
diff --git a/pages.json b/pages.json
index ee6d7a8..eea6b60 100644
--- a/pages.json
+++ b/pages.json
@@ -36,10 +36,11 @@
 		    
 		},{
 		    "path" : "pages/my/my",
-		    "style" :                                                                                    
-		    {
+		    "style":{
 		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false
+		        "enablePullDownRefresh": false,
+				"navigationStyle": "custom",
+				"navigationBarBackgroundColor": "#000000"
 		    }
 		    
 		},{
@@ -111,7 +112,7 @@
 		"navigationStyle": "custom",
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F3F5F7",
+		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F3F5F7"
 	},
 	"uniIdRouter": {},
diff --git a/pages/detail/detail.vue b/pages/detail/detail.vue
index b4f6112..48a884c 100644
--- a/pages/detail/detail.vue
+++ b/pages/detail/detail.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="details">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<u-navbar height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
@@ -148,7 +149,7 @@
 				})
 			},
 			getFormatDate(time) {
-			    let d = new Date(time);
+			    let d = new Date(time*1000);
 			    let Y = d.getFullYear();
 			    let M = d.getMonth() + 1; // 月份获取是0-11，所以+1
 			    let D = d.getDate();
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3a0c473..ae0a3c1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,10 @@
 <template>
 <view class="index">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<view class="contentContainer">
-		<!-- <view class="title">
+		<view class="title">
 			首页
-		</view> -->
+		</view>
 		<u-swiper radius="0" :list="bannerList" :circular="true" height="190"></u-swiper>
 		<view class="gridContent">
 			<u-grid
@@ -43,7 +44,7 @@
 								留学政策
 							</view>
 							<view class="time">
-								{{getFormatDate(item.updatetime)}}
+								{{getFormatDate(item.createtime)}}
 							</view>
 						</view>
 					</view>
@@ -75,7 +76,7 @@
 		methods: {
 			click(name) {
 				uni.navigateTo({
-					url:'/pages/index/searchPage?id='+name.id
+					url:'/pages/index/searchPage?id='+name.id+'&typedata='+name.typedata
 				})
 			},
 			getarticalList(){
@@ -89,7 +90,7 @@
 				})
 			},
 			getFormatDate(time) {
-			    let d = new Date(time);
+			    let d = new Date(time*1000);
 			    let Y = d.getFullYear();
 			    let M = d.getMonth() + 1; // 月份获取是0-11，所以+1
 			    let D = d.getDate();
diff --git a/pages/index/searchPage.vue b/pages/index/searchPage.vue
index 9cc1563..713c3d2 100644
--- a/pages/index/searchPage.vue
+++ b/pages/index/searchPage.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="searchBox">
+		<view class="status_bar"></view>
 		<u-navbar @leftClick="leftClick" height="50" :autoBack="true">
 			<view
 				class="u-nav-slot"
@@ -87,17 +88,20 @@ export default{
 				custom: true // 该栏目开启自定义模式
 			}],
 			tagList:[],
-			active:0,
+			active:-1,
 			disabled:true,
 			noSearch:true,
-			contentList:[]
+			contentList:[],
+			typedata:null
 		}
 	},
 	components: {
 		 wybDropDown
 	},
 	onLoad(option) {
+		console.log(option,"uuu")
 		this.catagoryId = option.id
+		this.typedata = option.typedata
 		this.getListData(option.id)
 	},
 	methods:{
@@ -111,7 +115,7 @@ export default{
 		getListData(id){
 			let params={
 				wx_menu_id:id,
-				typedata:0,
+				typedata:this.typedata,
 				name:this.catagoryName
 			}
 			listData(params).then(res=>{
@@ -121,15 +125,25 @@ export default{
 				}else{
 					this.tagList = res.searchList
 					this.noSearch = false;
-					this.contentList = res.rows
+					this.contentList = res.rows;
+					this.contentList.forEach(item=>{
+						let subobj = res.searchList.filter(i=>{
+							return item.wx_category_id==i.id
+						})
+						this.$set(item,'subName',subobj[0].name)
+					})
 				}
 			})
 		},
 		clickSearchItem(item,index){
+			console.log(item,index,"--==")
+			this.options[0].header = item.name;
+			
 			this.active=index;
 			this.contentList.filter(i=>{
 				return i.wx_category_id == item.id
 			})
+			this.$refs.dropDown.close()
 		},
 		clickHandle(){
 			this.disabled = false;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f97cf27..7f55ba6 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="login">
-		<!-- <view class="title">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="title">
 			登录
-		</view> -->
+		</view>
 		<view class="toptitle">
 			留学万象
 		</view>
@@ -110,7 +111,7 @@
 		font-weight: bold;
 		color: #0076F6;
 		text-align: center;
-		padding-top: 16%;
+		padding-top: 28%;
 	}
 	.contentForm{
 		margin-top:13%;
diff --git a/pages/my/collection.vue b/pages/my/collection.vue
index f8c6577..fbcc819 100644
--- a/pages/my/collection.vue
+++ b/pages/my/collection.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="editInfo">
+	<view class="status_bar"><!-- ������״̬�� --></view>
 	<u-navbar height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/my/editInfo.vue b/pages/my/editInfo.vue
index cf2a205..4736b3b 100644
--- a/pages/my/editInfo.vue
+++ b/pages/my/editInfo.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="editInfo">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
 		<view class="a" v-if="uploadPic == false">
 			<u-navbar @leftClick="leftClick" height="50" :autoBack="true">
 				<view
diff --git a/pages/my/editInfo1.vue b/pages/my/editInfo1.vue
index 3980b22..f0451e7 100644
--- a/pages/my/editInfo1.vue
+++ b/pages/my/editInfo1.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="editInfo">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
 		<view class="a" v-if="uploadPic == false">
 			<u-navbar @leftClick="leftClick" height="50" :autoBack="true">
 				<view
diff --git a/pages/my/feedBack.vue b/pages/my/feedBack.vue
index 159a8e4..9f25823 100644
--- a/pages/my/feedBack.vue
+++ b/pages/my/feedBack.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="editInfo">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<u-navbar @leftClick="leftClick" height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/my/look.vue b/pages/my/look.vue
index 0af56ae..17e64b4 100644
--- a/pages/my/look.vue
+++ b/pages/my/look.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="editInfo">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<u-navbar  height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 8c12128..8c08e41 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="my">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<view class="contentContainer">
 		<image src="../../static/mybg.png" mode="widthFix" class="mybg"></image>
-		<!-- <view class="title">
+		<view class="title">
 			我的
-		</view> -->
+		</view>
 		<view class="mycontent">
 			<view class="info" @click="goEditInfo">
 				<view class="avatar">
@@ -40,7 +41,7 @@
 				</view>
 			</view>
 		</view>
-		<u-button text="退出登录" @click.native.stop="layoutHandle" style="width:80%;margin:50upx auto;border-radius:40upx;" color="#0076F6" v-if="isLogin"></u-button>
+		<view class="codeBtn" @click="layoutHandle" color="#0076F6" v-if="isLogin">退出登录</view>
 	</view>
 </view>
 </template>
@@ -212,5 +213,21 @@
 			}
 		}
 	}
+	.codeBtn{
+		width:80%;
+		margin:50upx auto 0 auto;
+		background: #0076F6;
+		border-radius: 50upx;
+		font-size: 30upx;
+		font-weight: 500;
+		color: #FFFFFF;
+		padding:34upx 0;
+		text-align: center;
+	}
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background-color:transparent !important;
+	}
 }
 </style>
diff --git a/pages/my/richText.vue b/pages/my/richText.vue
index 934856f..fd9fcb9 100644
--- a/pages/my/richText.vue
+++ b/pages/my/richText.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="rich">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<u-navbar  height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/my/setting.vue b/pages/my/setting.vue
index 48f2d25..d245d17 100644
--- a/pages/my/setting.vue
+++ b/pages/my/setting.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="editInfo">
+	<view class="status_bar"><!-- 这里是状态栏 --></view>
 	<u-navbar @leftClick="leftClick" height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/my/share.vue b/pages/my/share.vue
index f361799..da1044e 100644
--- a/pages/my/share.vue
+++ b/pages/my/share.vue
@@ -1,5 +1,6 @@
 <template>
 <view class="editInfo">
+	<view class="status_bar"><!-- ������״̬�� --></view>
 	<u-navbar  height="50" :autoBack="true">
 		<view
 			class="u-nav-slot"
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 78b87de..0d82d0d 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -1,8 +1,9 @@
 <template>
-	<view class="register">
-		<!-- <view class="title">
+	<view class="register" :style="{height:height+'px'}">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="title">
 			注册
-		</view> -->
+		</view>
 		<view class="toptitle">
 			留学万象
 		</view>
@@ -53,9 +54,15 @@
 		data() {
 			return {
 				checked:[1],
-				mobileNum:''
+				mobileNum:'',
+				height:0
 			};
 		},
+		onShow() {
+			const res = uni.getSystemInfoSync()
+			console.log(res,"hhh")
+			this.height = res.screenHeight
+		},
 		methods:{
 			goRichtext(ids){
 				uni.navigateTo({
@@ -152,7 +159,9 @@
 <style lang="scss" scoped>
 .register{
 	height:calc(100vh);
+	// border:2px solid yellow;
 	background-color: #FFFFFF;
+	position:relative;
 	.title{
 		font-size: 36upx;
 		font-weight: bold;
@@ -166,7 +175,7 @@
 		font-weight: bold;
 		color: #0076F6;
 		text-align: center;
-		padding-top: 16%;
+		padding-top: 10%;
 	}
 	.contentForm{
 		margin-top:13%;
diff --git a/pages/register/register1.vue b/pages/register/register1.vue
index b170f90..8efcb31 100644
--- a/pages/register/register1.vue
+++ b/pages/register/register1.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="register">
-		<!-- <view class="title">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="title">
 			注册
-		</view> -->
+		</view>
 		<view class="toptitle">
 			留学万象
 		</view>