diff --git a/api/index.js b/api/index.js
index 95d7cfc..8fc538f 100644
--- a/api/index.js
+++ b/api/index.js
@@ -74,10 +74,11 @@ export function getNoticeDetails(id) {
 }
 
 // 查询公告列表
-export function getNoticeList() {
+export function getNoticeList(data) {
 	return request({
 		url: `${serviceTitle}${prefix}/getNoticeList`,
-		method: 'get'
+		method: 'post',
+		data
 	})
 }
 
diff --git a/api/userInfo.js b/api/userInfo.js
index f4f3da0..56cc03d 100644
--- a/api/userInfo.js
+++ b/api/userInfo.js
@@ -9,24 +9,26 @@ const prefix = '/img/mini/creator'
 // 查询公告详情
 export function getNoticeDetails(id) {
 	return request({
-		url: `${serviceTitle}${prefix}/listType/${id}`,
+		url: `${serviceTitle}${prefix}/getNoticeDetails/${id}`,
 		method: 'get'
 	})
 }
 
 // 查询公告列表
-export function getNoticeList() {
+export function getNoticeList(data) {
 	return request({
 		url: `${serviceTitle}${prefix}/getNoticeList`,
-		method: 'get'
+		method: 'post',
+		data
 	})
 }
 
 // 查询邀请记录
-export function getInviteLog(creatorId) {
+export function getInviteLog(data) {
 	return request({
-		url: `${serviceTitle}${prefix}/getInviteLog/${creatorId}`,
-		method: 'get'
+		url: `${serviceTitle}${prefix}/getInviteLog`,
+		method: 'post',
+		data
 	})
 }
 
@@ -38,11 +40,12 @@ export function getAccount(creatorId) {
 	})
 }
 
-// 查询指定艺术家提现记录列表
-export function getWithdrawList(creatorId) {
+// 查询指定艺术家提现记录分页
+export function getWithdrawList(data) {
 	return request({
-		url: `${serviceTitle}${prefix}/getWithdrawList/${creatorId}`,
-		method: 'get'
+		url: `${serviceTitle}${prefix}/getWithdrawList`,
+		method: 'post',
+		data
 	})
 }
 
diff --git a/pages-userInfo/inviteLog/inviteLog.vue b/pages-userInfo/inviteLog/inviteLog.vue
index ceac680..11cdbfd 100644
--- a/pages-userInfo/inviteLog/inviteLog.vue
+++ b/pages-userInfo/inviteLog/inviteLog.vue
@@ -1,106 +1,56 @@
 <template>
 	<view class="container">
-		我是邀请记录页面
+		<uni-list border-full v-for="(item,index) in inviteLogList" :key="index">
+			<uni-list-item :title="item.invitedScanCode"
+				:note="item.createTime" :thumb="item.img" thumb-size="lg"/>
+		</uni-list>
 	</view>
 </template>
 
 <script>
-	// export default {
-	// 	data() {
-	// 		return {
-	// 			hotCreatorList: [],
-	// 			isTarget: true,
-	// 			showChoiceness:false
-	// 		}
-	// 	},
-	// 	// 下拉刷新
-	// 	onPullDownRefresh() {
-	// 		this.showChoiceness = false
-	// 		uni.stopPullDownRefresh()
-	// 	},
-	// 	created() {
-	// 		const userInfo = uni.getStorageSync('userInfo')
-	// 		if (!userInfo) {
-	// 			console.log('havent userInfo')
-	// 			this.getUserInfo()
-	// 		} else {
-	// 			console.log('have userInfo')
-	// 		}
-	// 	},
-	// 	onPageScroll(e) {
-	// 		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-
-	// 		if (e.scrollTop > 160) {
-	// 			this.showChoiceness = true
-	// 			// uni.redirectTo({
-	// 			// 	url: '../index/choiceness'
-	// 			// })
-	// 		}
-	// 	},
-	// 	methods: {
-	// 		// 搜索
-	// 		search(res) {
-	// 			if (res.value) {
-	// 				console.log('search', res.value)
-	// 				this.goCreatorDetail(res.value)
-	// 			} else {
-	// 				uni.showToast({
-	// 					title: '请输入艺术家代号',
-	// 					icon: 'none'
-	// 				})
-	// 			}
-
-	// 		},
-	// 		// 获取用户信息
-	// 		getUserInfo() {
-	// 			wx.login({
-	// 				force: true,
-	// 				success: res => {
-	// 					wx.getUserInfo({
-	// 						withCredentials: true,
-	// 						success: userInfo => {
-	// 							const params = {
-	// 								code: res.code,
-	// 								encryptedData: userInfo.encryptedData,
-	// 								iv: userInfo.iv
-	// 							}
-	// 							// 用户授权登录
-	// 							console.log('params',params);
-	// 							loginWx(params).then(res => {
-	// 								if (res.data.code === 200) {
-	// 									uni.setStorage({
-	// 										key: 'userInfo',
-	// 										data: res.data.data.userInfo, 
-	// 									})
-	// 								} else {
-	// 									uni.showToast({
-	// 										title: res.data.msg,
-	// 										icon: 'none'
-	// 									})
-	// 								}
-	// 							}).catch(res => {})
-	// 							console.log(`getUserInfo 调用成功`, userInfo);
-	// 						},
-	// 						fail(userInfo) {
-	// 							console.log(`getUserInfo 调用失败`);
-	// 						},
-	// 					});
-	// 				},
-	// 				fail(res) {
-	// 					console.log(`login 调用失败`);
-	// 				},
-	// 			});
-
-	// 		},
-			
+	import {
+		getInviteLog
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				inviteLogList: [],
+				pageSize: 10,
+				pageNum: 1
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.showChoiceness = false
+			uni.stopPullDownRefresh()
+		},
+		created() {
+			const userInfo = uni.getStorageSync('userInfo')
+			const params = {
+				pageSize: this.pageSize,
+				pageNum: this.pageNum,
+				creatorId: userInfo.id
+			}
+			this.getInviteLog(params);
+		},
+		methods: {
 			
-	// 		// 滚动监听
-	// 		handleScroll() {
-	// 			let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-	// 			console.log(scrollTop)
-	// 		},
-	// 	},
-	// }
+			// 获取邀请记录
+			async getInviteLog(params) {
+				const res = await getInviteLog(params)
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.inviteLogList = res.data.rows
+					console.log('inviteLogList', this.inviteLogList) 
+				} else {
+					uni.showModal({
+						content: '邀请记录加载失败！',
+						showCancel: false
+					});
+				}
+			},
+		},
+	}
 </script>
 
 <style lang="less">
diff --git a/pages-userInfo/notice/notice.vue b/pages-userInfo/notice/notice.vue
index 2c88f17..a9f09a4 100644
--- a/pages-userInfo/notice/notice.vue
+++ b/pages-userInfo/notice/notice.vue
@@ -1,12 +1,63 @@
 <template>
 	<view class="container">
-		我是通知消息
+		<uni-list border-full v-for="(item,index) in noticeList" :key="index">
+			<uni-list-item showArrow clickable :title="item.title"
+				:note="item.createTime" :thumb="item.img" thumb-size="lg" @click="targetToDetail(item.id)"/>
+		</uni-list>
 	</view>
 </template>
 
 <script>
-	
-</style>
+	import {
+		getNoticeList
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				noticeList: [],
+				pageSize: 10,
+				pageNum: 1
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		},
+		created() {
+			const params = {
+				pageSize: this.pageSize,
+				pageNum: this.pageNum,
+			}
+			this.getNoticeList(params);
+		},
+		methods: {
+			
+			// 获取公告分页
+			async getNoticeList(params) {
+				const res = await getNoticeList(params)
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.noticeList = res.data.rows
+					console.log('noticeList', this.noticeList) 
+				} else {
+					uni.showModal({
+						content: '公告列表加载失败！',
+						showCancel: false
+					});
+				}
+			},
+			
+			targetToDetail(id) {
+				console.log('id', id)
+				if (id) {
+					uni.navigateTo({
+						url: 'noticeDetail?id=' + id
+					})
+				}
+			}
+		},
+	}
+</script>
 
 <style lang="scss">
 </style>
diff --git a/pages-userInfo/notice/noticeDetail.vue b/pages-userInfo/notice/noticeDetail.vue
new file mode 100644
index 0000000..f962a64
--- /dev/null
+++ b/pages-userInfo/notice/noticeDetail.vue
@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<view>id:{{noticeDetail.id}}</view>
+		<view>标题:{{noticeDetail.title}}</view>
+		<view>内容:{{noticeDetail.content}}</view>
+		<view>图片:{{noticeDetail.img}}</view>
+		<view>创建时间:{{noticeDetail.createTime}}</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNoticeDetails
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				noticeDetail:{}
+			}
+		},
+		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+			this.id = option.id
+			//console.log('this.id',this.id)
+			this.getNoticeDetails(option.id);
+		},
+		methods: {
+			
+			// 查询公告详情
+			async getNoticeDetails(id) {
+				const res = await getNoticeDetails(id)
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.noticeDetail = res.data.data
+				} else {
+					uni.showModal({
+						content: '公告详情数据加载失败！',
+						showCancel: false
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages-userInfo/withdraw/withdraw.vue b/pages-userInfo/withdraw/withdraw.vue
index 6358415..c93bda3 100644
--- a/pages-userInfo/withdraw/withdraw.vue
+++ b/pages-userInfo/withdraw/withdraw.vue
@@ -1,106 +1,59 @@
 <template>
 	<view class="container">
-		我是提现页面
+		<uni-list border-full v-for="(item,index) in withdrawList" :key="index">
+			<uni-list-item showArrow clickable :title="'订单号:'+item.orderId"
+				:note="item.createTime+'||'+item.channel+'||'+item.status" 
+				:rightText="'￥'+item.amt" @click="targetToDetail(item.orderId)"/> 
+		</uni-list>
 	</view>
 </template>
 
 <script>
-	// export default {
-	// 	data() {
-	// 		return {
-	// 			hotCreatorList: [],
-	// 			isTarget: true,
-	// 			showChoiceness:false
-	// 		}
-	// 	},
-	// 	// 下拉刷新
-	// 	onPullDownRefresh() {
-	// 		this.showChoiceness = false
-	// 		uni.stopPullDownRefresh()
-	// 	},
-	// 	created() {
-	// 		const userInfo = uni.getStorageSync('userInfo')
-	// 		if (!userInfo) {
-	// 			console.log('havent userInfo')
-	// 			this.getUserInfo()
-	// 		} else {
-	// 			console.log('have userInfo')
-	// 		}
-	// 	},
-	// 	onPageScroll(e) {
-	// 		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-
-	// 		if (e.scrollTop > 160) {
-	// 			this.showChoiceness = true
-	// 			// uni.redirectTo({
-	// 			// 	url: '../index/choiceness'
-	// 			// })
-	// 		}
-	// 	},
-	// 	methods: {
-	// 		// 搜索
-	// 		search(res) {
-	// 			if (res.value) {
-	// 				console.log('search', res.value)
-	// 				this.goCreatorDetail(res.value)
-	// 			} else {
-	// 				uni.showToast({
-	// 					title: '请输入艺术家代号',
-	// 					icon: 'none'
-	// 				})
-	// 			}
-
-	// 		},
-	// 		// 获取用户信息
-	// 		getUserInfo() {
-	// 			wx.login({
-	// 				force: true,
-	// 				success: res => {
-	// 					wx.getUserInfo({
-	// 						withCredentials: true,
-	// 						success: userInfo => {
-	// 							const params = {
-	// 								code: res.code,
-	// 								encryptedData: userInfo.encryptedData,
-	// 								iv: userInfo.iv
-	// 							}
-	// 							// 用户授权登录
-	// 							console.log('params',params);
-	// 							loginWx(params).then(res => {
-	// 								if (res.data.code === 200) {
-	// 									uni.setStorage({
-	// 										key: 'userInfo',
-	// 										data: res.data.data.userInfo, 
-	// 									})
-	// 								} else {
-	// 									uni.showToast({
-	// 										title: res.data.msg,
-	// 										icon: 'none'
-	// 									})
-	// 								}
-	// 							}).catch(res => {})
-	// 							console.log(`getUserInfo 调用成功`, userInfo);
-	// 						},
-	// 						fail(userInfo) {
-	// 							console.log(`getUserInfo 调用失败`);
-	// 						},
-	// 					});
-	// 				},
-	// 				fail(res) {
-	// 					console.log(`login 调用失败`);
-	// 				},
-	// 			});
-
-	// 		},
-			
+	import {
+		getWithdrawList
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				withdrawList:[],
+				pageSize: 10,
+				pageNum: 1
+			}
+		},
+		created(){
+			const userInfo = uni.getStorageSync('userInfo')
+			const params = {
+				pageSize: this.pageSize,
+				pageNum: this.pageNum,
+				creatorId: userInfo.id
+			}
+			this.getWithdrawList(params);
+		},
+		methods: {
+			// 查询提现记录列表
+			async getWithdrawList(param) {
+				const res = await getWithdrawList(param)
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.withdrawList = res.data.rows
+				} else {
+					uni.showModal({
+						content: '提现记录列表数据加载失败！',
+						showCancel: false
+					});
+				}
+			},
 			
-	// 		// 滚动监听
-	// 		handleScroll() {
-	// 			let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-	// 			console.log(scrollTop)
-	// 		},
-	// 	},
-	// }
+			targetToDetail(orderId) {
+				console.log('orderId', orderId)
+				if (orderId) {
+					uni.navigateTo({
+						url: 'withdrawDetail?orderId=' + orderId,
+					});
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="less">
diff --git a/pages-userInfo/withdraw/withdrawDetail.vue b/pages-userInfo/withdraw/withdrawDetail.vue
new file mode 100644
index 0000000..8edbec0
--- /dev/null
+++ b/pages-userInfo/withdraw/withdrawDetail.vue
@@ -0,0 +1,52 @@
+<template>
+	<view>
+		<view>订单号:{{withdrawDetailInfo.orderId}}</view>
+		<view>提现金额:{{withdrawDetailInfo.amt}}</view>
+		<view>手机号:{{withdrawDetailInfo.phone}}</view>
+		<view>银行卡:{{withdrawDetailInfo.bankNo}}</view>
+		<view>渠道:{{withdrawDetailInfo.channel}}</view>
+		<view>状态:{{withdrawDetailInfo.status}}</view>
+		<view>创建时间:{{withdrawDetailInfo.createTime}}</view>
+		<view>审核理由:{{withdrawDetailInfo.reason}}</view>
+		<view>到账时间:{{withdrawDetailInfo.achieveTime}}</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getWithdrawDetails
+	} from '@/api/userInfo.js'
+	export default {
+		data() {
+			return {
+				withdrawDetailInfo:{}
+			}
+		},
+		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
+			console.log(option)
+			const param = {
+				orderId: option.orderId
+			}
+			this.getWithdrawDetails(param);
+		},
+		methods: {
+			// 查询提现记录明细
+			async getWithdrawDetails(param) {
+				const res = await getWithdrawDetails(param)
+				console.log('res', res)
+				if (res.data.code === 200) {
+					this.withdrawDetailInfo = res.data.data
+				} else {
+					uni.showModal({
+						content: '提现记录详情数据加载失败！',
+						showCancel: false
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages.json b/pages.json
index c599d85..d377f73 100644
--- a/pages.json
+++ b/pages.json
@@ -155,7 +155,26 @@
 				"navigationBarTitleText": "提现记录",
 				"enablePullDownRefresh": false
 			}
-		}]
+		},{
+                    "path" : "notice/noticeDetail",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "公告详情",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                
+                ,{
+                    "path" : "withdraw/withdrawDetail",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "提现详情",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 	}],
 	
 	"globalStyle": {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8ccb62a..d66f4ab 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -105,7 +105,7 @@
 										key: 'userInfo',
 										data: response.data.data.userInfo
 									})
-									uni.redirectTo({
+									uni.switchTab({
 										url: '../index/index',
 										success() {
 											uni.showToast({