Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy into master

pages/friend/personal.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="personal">
-			<u-modal v-model="show" :showConfirmButton="false" >
+			<u-modal v-model="show" :showConfirmButton="false" :mask-close-able="true"  >
 				<view class="praiseMain">
 				<view class="praiseMain-item">
 					<view class="praiseMain-tit">恭喜配对成功!</view>

pages/index/index.vue

@@ -175,10 +175,15 @@
 					title: "加载中",
 					mask: true,
 				})
+				var memberId=undefined;
+				if(this.carhelp.getPersonInfo()){
+					memberId=this.carhelp.getPersonInfo().id;
+				}
 				Api.homePage({
 					pageSize:8,
 					pageIndex:this.pageIndex,
-					type:this.current
+					type:this.current,
+					memberId:memberId
 				}).then((res) => {
 					this.list = [
 							...this.list,