1

pages/blindDate/editData.vue

@@ -361,41 +361,26 @@
 					field:"OtherInfo",
 					placehloder:"写下你期待的未来生活是怎样的",
 					type:3
-				  },
-				  
-				  
-				  
-				  
-				  {
+				  }, {
 					name:"最喜欢的一本书及原因",
 					field:"LikeBook",
 					placehloder:"写下你喜欢的书的名称",
 					type:3
-				  },{
-					name:"喜欢的电影和电视剧",
+				  }, {
+					name:"最喜欢的电影及原因",
 					field:"LikeTV",
-					placehloder:"写下你喜欢的电影和电视剧的名称",
+					placehloder:"写下最喜欢的电影及原因",
 					type:3
-				  },{
-					name:"喜欢的一首情歌",
-					field:"LikeSong",
-					placehloder:"写下你喜欢的歌曲名称",
-					type:3
-				  },{
+				  },
+				  
+				  
+				  
+				  
+				{
 					name:"欣赏哪对名人的爱情，原因是什么",
 					field:"IdealLove",
 					placehloder:"快来说说吧",
 					type:3
-				  },{
-					name:"你听过最美的情话",
-					field:"LoveTalk",
-					placehloder:"曾经有一份爱情摆在我面前...",
-					type:3
-				  },{
-					name:"为什么单身",
-					field:"SingleReason",
-					placehloder:"写下自己单身的原因",
-					type:3
 				  },
 				
 				 

pages/blindDate/personal/peoplescreen.vue

@@ -34,7 +34,7 @@
 					:current="active" @change="changeHandler" :show-bar="true" height="100" font-size="28"></u-tabs>
 			</view>
 		</view> -->
-		<view style="height: calc(100vh - 100rpx)">
+		<view style="height: 100vh">
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
 				style="height: 100%; padding-bottom: 0px;">
 				<view style="width: 100%;height: 100vh;position: relative;">

pages/blindDate/persondetails.vue

@@ -242,8 +242,8 @@
 						<view class="box-jc-c-item-i">
 							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-fz.png" ></image>
 							<text>现居{{dataList.DWCName}}</text>
-							<text style="margin: 0 5px;">·</text>
-							<text>{{dataList.DWCName}}{{dataList.DWDName}}</text>
+							<text v-if="dataList.PName!=''" style="margin: 0 5px;">·</text>
+							<text v-if="dataList.PName!=''">{{dataList.PName}}{{dataList.CName}}人</text>
 						</view>
 						<view class="box-jc-c-item-i" v-if="dataList.Job">
 							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png" ></image>
@@ -499,7 +499,7 @@
 			}
 			let Up = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo").UserPageType:0;
 		  return {
-		    title:'相亲资料',
+		    title:'个人资料',
 		    path: "/pages/index/index?id=" + this.UserId + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId+ "&Up=" + Up+'&JumpType=13',
 		    imageUrl:'',
 		  };

pages/share/index/index.vue

@@ -20,7 +20,7 @@
 			</view>
 			<view class="shareadd" v-if=" sharestatus.Status==1">
 				<u-empty text=" " mode="data"></u-empty>
-				<Text style='margin: 10px 0;' v-if='IsOpenMiAi==0'>{{sharestatus.Msg}}</Text>
+				<Text style='margin: 10px 0;' >{{IsOpenMiAi==0?sharestatus.Msg:"未申请成为合作伙伴"}}</Text>
 				<view class="shareadd_b" :style="{background:mainColor}" @click="goaddurl">
 					<Text>{{sharestatus.ApplyForName}}</Text>
 				</view>
@@ -37,7 +37,7 @@
 				<image v-if="IsOpenMiAi==0" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/img-share-status.png" style="width: 100%;height: 165px;"></image>
 				<image v-if="IsOpenMiAi==1" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-bghz.png" mode="aspectFill" style="width: 100%;height: 165px;"></image>
 				<!-- <Text style='margin-top: 70px;' v-if='IsOpenMiAi==1'>未申请成为合作伙伴</Text> -->
-				<Text style='margin-top: 70px;' v-if='IsOpenMiAi==0'>{{sharestatus.Msg}}</Text>
+				<Text style='margin-top: 70px;' >{{sharestatus.Msg}}</Text>
 			</view>
 			<view style="width: 100%;height: 100%;background: #f3f4f6;" v-if="sharestatus.Status==3">
 				<view class="sharebox_top" >