Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/blindDate/persondetails.vue

@@ -152,13 +152,26 @@
 		justify-content: center;
 	}
 	.bwytBtn{
-		
+		position: fixed;
+		right: 20rpx;
+		bottom: 140rpx;
+		z-index: 50;
+		font-size: 16rpx;
+		border-radius: 50%;
+		color: #FFFFFF;
+		width: 42px;
+		height: 42px;
+		text-align: center;
+		vertical-align: middle;
+		background-color: #40766E;
+		padding: 5rpx;
 	}
 </style>
 <template>
 	<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;position: relative;">
-		<button open-type="contact" :send-message-title="dataList.Name" :send-message-path="path" :send-message-img="dataList.Photo" :show-message-card="true" class="bwytBtn">帮我约TA</button>
 		<view class="persondetails" >
+			<button open-type="contact" send-message-title="dataList.Name" :send-message-path="path" :send-message-img="dataList.Photo" :show-message-card="true" class="bwytBtn">帮我<br/>约TA</button>
+			
 			<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
 				{
 				  zIndex: scrollTop < 10 ? 'unset' : 2,
@@ -442,10 +455,6 @@
 					url: '/pages/blindDate/basicdata' 
 				})
 			},
-			// 帮我约ta
-			yueta(){
-				
-			}
 		}
 	}
 </script>

pages/blindDate/postbar.vue

@@ -436,7 +436,7 @@
 		border-radius: 21px;
 		position: fixed;
 		right: 20rpx;
-		bottom: 170rpx;
+		bottom: 140rpx;
 		background: #40766E;
 		display: flex;
 		flex-direction: column;

pages/index/index.vue

@@ -18,7 +18,7 @@
 						<u-icon name="arrow-left" size="44"></u-icon>
 					</view>
 				</view>
-				<view @click='yj' style="width: 200px;height: 50px;">活动</view>
+				<!-- <view @click='yj' style="width: 200px;height: 50px;">活动</view> -->
 				<u-tabs v-if="myPageData.home_pages && myPageData.home_pages.navs.length > 1" name="name" :list="myPageData.home_pages.navs"
 				 :is-scroll="true" :active-color="mainColor" :current="active" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
 				<template v-for="(item, i) in myPageData.home_pages.navs">
@@ -725,7 +725,9 @@
 						    console.log(e)
 						}
 						uni.navigateTo({ url: "/pages/reserve/goodsDetails?GoodsId=" + that.GoodsId });
-					} 
+					} else if(that.JumpType == 11){
+						uni.navigateTo({ url: "/pages/blindDate/persondetails?UserId=" + that.GoodsId });
+					}
 				
 				}, 500);
 			},
@@ -1132,12 +1134,12 @@
 				this.$refs.city[0].getPickcar(Name)
 			},
 			
-			yj(){
-				uni.navigateTo({
-					url: '/pages/blindDate/userList' 
-					// url: '/pages/kotra/carrier/list' 
-				})
-			}
+			// yj(){
+			// 	uni.navigateTo({
+			// 		url: '/pages/blindDate/editData' 
+			// 		// url: '/pages/kotra/carrier/list' 
+			// 	})
+			// }
 		},
 	};
 </script>