diff --git a/api/api.js b/api/api.js
index 053dc52..cf7e006 100644
--- a/api/api.js
+++ b/api/api.js
@@ -256,6 +256,11 @@ const config = {
 		url: '/api/login/getPrivacyPolicy',
 		method: 'GET',
 	},
+	// 获取发布帖子发布需知
+	getPublishPostNotice: {
+		url: '/api/login/getPublishPostNotice',
+		method: 'GET',
+	},
 	// 获取用户协议
 	getUserAgreement: {
 		url: '/api/login/getUserAgreement',
@@ -302,13 +307,6 @@ const config = {
 	},
 	
 	
-	// 立即支付
-	payOrder: {
-		url: '/api/order/payOrder',
-		method: 'POST',
-		showLoading : true,
-	},
-	
 }
 
 export function api(key, data, callback, loadingTitle) {
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index 5b25223..45dcd7b 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -41,6 +41,9 @@
 	.configPopup {
 		.content{
 			padding: 30rpx 20rpx;
+			overflow-x: scroll;
+			height: 100%;
+			box-sizing: border-box;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/components/content/contentControls.vue b/components/content/contentControls.vue
index 6d5f383..2dcc150 100644
--- a/components/content/contentControls.vue
+++ b/components/content/contentControls.vue
@@ -14,10 +14,13 @@
 			<uv-icon v-else size="35rpx" name="thumb-up"></uv-icon>
 			点赞
 		</view>
-		<view class=""
-		@click="share">
-			<uv-icon size="35rpx" name="share"></uv-icon>
-			分享
+		<view class="">
+			<button
+			border="none"
+			open-type="share" class="share">
+				<uv-icon size="35rpx" name="share"></uv-icon>
+				分享
+			</button>
 		</view>
 		<view class=""
 		v-if="!isWork"
@@ -52,7 +55,6 @@
 			},
 			isWork : {
 				default : false,
-				
 			}
 		},
 		data() {
@@ -121,5 +123,13 @@
 		align-items: center;
 		margin-right: 40rpx;
 	}
+	.share{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.share::after{
+		border: none;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/config.js b/config.js
index 0c3a700..9a6313c 100644
--- a/config.js
+++ b/config.js
@@ -5,7 +5,7 @@ import utils from './utils/utils.js'
 
 
 // 当前环境
-const type = 'dev'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/pages.json b/pages.json
index fcafb4f..e0396d6 100644
--- a/pages.json
+++ b/pages.json
@@ -204,7 +204,8 @@
 		"navigationBarTitleText": "unapp模板",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		"navigationStyle": "custom"
+		"navigationStyle": "custom",
+		"onReachBottomDistance": 100
 	},
 	"uniIdRouter": {}
 }
\ No newline at end of file
diff --git a/pages/auth/login.vue b/pages/auth/login.vue
index 6b633a6..7c2321c 100644
--- a/pages/auth/login.vue
+++ b/pages/auth/login.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="login">
 		<view class="logo">
-			<image src="/static/image/login/logo.png" mode=""></image>
+			<image src="/static/image/login/logo.png" 
+			mode="aspectFill"></image>
 		</view>
 		<view class="title">
 			欢迎登录真视界
@@ -52,7 +53,7 @@
 		components : { configPopup },
 		data() {
 			return {
-				checkboxValue : []
+				checkboxValue : [],
 			}
 		},
 		methods: {
@@ -85,16 +86,13 @@
 	flex-direction: column;
 	position: relative;
 	.logo{
-		height: 80rpx;
-		width: 80rpx;
-		padding: 40rpx 30rpx;
-		background-color: #ddd;
-		border-radius: 70rpx;
 		image{
-			width: 80rpx;
-			height: 80rpx;
+			width: 160rpx;
+			height: 160rpx;
+			border-radius: 80rpx;
+			box-shadow: 0 0 10rpx 10rpx #00000012;
 		}
-		margin-bottom: 20rpx;
+		margin-bottom: 40rpx;
 	}
 	.title{
 		position: relative;
@@ -139,9 +137,9 @@
 	.config{
 		position: absolute;
 		bottom: 0;
-		font-size: 22rpx;
+		font-size: 28rpx;
 		text-align: center;
-		line-height: 40rpx;
+		line-height: 50rpx;
 		text{
 			color: #3c69f1;
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c31bbaa..f397921 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -57,6 +57,7 @@
 				:autoplay="true" 
 				:duration="500">
 					<swiper-item v-for="(item, index) in actorList" 
+					style="background-color: #fff;"
 					:key="index">
 						<view class="swiper-item">
 							<image
@@ -141,7 +142,7 @@
 			console.log("======首页滑动到底部触发====")
 			let total = this.queryParams.pageNo * this.queryParams.pageSize
 			if(total < this.total){
-				this.queryParams.pageSize += 10
+				this.queryParams.pageNo += 1
 				this.indexGetTrendsPage(res => {
 					this.trends.push(...res.result.records)
 				})
@@ -179,8 +180,8 @@
 				this.queryParams, res => {
 					uni.stopPullDownRefresh()
 					if(res.code == 200){
-						// fn && fn(res)
-						this.trends = res.result.records
+						fn && fn(res)
+						// this.trends = res.result.records
 						this.total = res.result.total
 					}
 				})
diff --git a/pages/publish/actorDetail.vue b/pages/publish/actorDetail.vue
index 262aba7..b7030e1 100644
--- a/pages/publish/actorDetail.vue
+++ b/pages/publish/actorDetail.vue
@@ -7,7 +7,7 @@
 			:list="item.details.image &&
 			item.details.image.split(',')" 
 			indicator 
-			height="820rpx"></uv-swiper>
+			height="420rpx"></uv-swiper>
 		</view>
 
 		<view class="box">
@@ -100,6 +100,13 @@
 			console.log(options)
 			this.id = options.id
 		},
+		onShareAppMessage(res) {
+		    return {
+		      title: this.item.details.title,
+		      desc: this.item.details.content && this.item.details.content.slice(0, 30),
+		      path: '/pages/publish/postDetail?id=' + this.id
+		    }
+		},
 		onShow() {
 			this.getData()
 		},
diff --git a/pages/publish/postDetail.vue b/pages/publish/postDetail.vue
index 73c3349..9297529 100644
--- a/pages/publish/postDetail.vue
+++ b/pages/publish/postDetail.vue
@@ -4,7 +4,7 @@
 
 		<view class="swipe">
 			<uv-swiper :list="item.image &&
-			item.image.split(',')" indicator height="820rpx"></uv-swiper>
+			item.image.split(',')" indicator height="420rpx"></uv-swiper>
 		</view>
 
 		<view class="box">
@@ -68,6 +68,16 @@
 		onShow() {
 			this.getData()
 		},
+		onShareAppMessage(res) {
+		    // if (res.from === 'button') {// 来自页面内分享按钮
+		    //   console.log(res.target)
+		    // }
+		    return {
+		      title: this.item.title,
+		      desc: this.item.content && this.item.content.slice(0, 30),
+		      path: '/pages/publish/postDetail?id=' + this.id
+		    }
+		},
 		methods: {
 			getData() {
 				this.$api('indexGetTrendsDetail', {
diff --git a/pages/publish/publishPost.vue b/pages/publish/publishPost.vue
index ed19cb7..4c4c6c4 100644
--- a/pages/publish/publishPost.vue
+++ b/pages/publish/publishPost.vue
@@ -70,7 +70,7 @@
 		</view>
 		
 		<view class="configBtn"
-		@click="$refs.configPopup.open()">
+		@click="$refs.configPopup.open('getPublishPostNotice')">
 			《发布须知》
 		</view>
 		
diff --git a/pages_mine/publish/competition.vue b/pages_mine/publish/competition.vue
index c9cc0dd..a420d08 100644
--- a/pages_mine/publish/competition.vue
+++ b/pages_mine/publish/competition.vue
@@ -62,10 +62,10 @@
 							</view>
 							<view class="actor">
 								<view class="headImage">
-									<image src="" mode=""></image>
+									<image :src="item.userImage" mode=""></image>
 								</view>
-								<view class="username">
-									发布人：{{ item.createBy }}
+								<view class="username text-ellipsis">
+									发布人：{{ item.userId }}
 								</view>
 							</view>
 							<view class="createTime">
@@ -112,6 +112,8 @@
 		},
 		onLoad() {
 			// this.$route.query的参数
+		},
+		onShow() {
 			this.getList(res => {
 				this.list = res.result.records
 			})
@@ -127,7 +129,9 @@
 			}
 		},
 		onPullDownRefresh(){
-			this.getList()
+			this.getList(res => {
+				this.list = res.result.records
+			})
 		},
 		methods: {
 			// 点赞
@@ -225,6 +229,7 @@
 		}
 		
 		.list{
+			padding-bottom: 180rpx;
 			.item{
 				font-size: 20rpx;
 				&:nth-child(1){
diff --git a/pages_mine/publish/worksDetail.vue b/pages_mine/publish/worksDetail.vue
index f1f40c8..8a4b2d2 100644
--- a/pages_mine/publish/worksDetail.vue
+++ b/pages_mine/publish/worksDetail.vue
@@ -7,7 +7,7 @@
 			:list="item.image &&
 			item.image.split(',')" 
 			indicator 
-			height="320rpx"></uv-swiper>
+			height="420rpx"></uv-swiper>
 		</view>
 
 		<view class="box">
@@ -97,6 +97,13 @@
 		onShow() {
 			this.getData()
 		},
+		onShareAppMessage(res) {
+		    return {
+				title: this.item.title,
+				desc: this.item.content && this.item.content.slice(0, 30),
+				path: '/pages_mine/publish/worksDetail?id=' + this.id
+		    }
+		},
 		methods: {
 			leftClick(){
 				uni.navigateBack(-1)
diff --git a/static/image/login/logo.png b/static/image/login/logo.png
index e91cb9f..b2cc6e2 100644
Binary files a/static/image/login/logo.png and b/static/image/login/logo.png differ
diff --git a/store/store.js b/store/store.js
index 2af295d..91c2f37 100644
--- a/store/store.js
+++ b/store/store.js
@@ -27,7 +27,7 @@ const store = new Vuex.Store({
 			// 		state.configList = res.result
 			// 	}
 			// })
-			let config = ['getPrivacyPolicy', 'getUserAgreement']
+			let config = ['getPrivacyPolicy', 'getUserAgreement', 'getPublishPostNotice']
 			config.forEach(k => {
 				api(k, res => {
 					if (res.code == 200) {