Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/blindDate

pages.json

@@ -17,12 +17,32 @@
 				"enablePullDownRefresh": true
 			}
 		},
+		{
+			"path": "pages/wallMember/getRed",
+			"style": {
+				"navigationBarTitleText": "获取红线",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/wallMember/contactedMember",
+			"style": {
+				"navigationBarTitleText": "联系过的人",
+				"enablePullDownRefresh": true
+			}
+		},
 		{
 			"path": "pages/register/basicInfo",
 			"style": {
 				"navigationBarTitleText": "会员注册-基本信息"
 			}
 		},
+		{
+			"path": "pages/payState/paystate",
+			"style": {
+				"navigationBarTitleText": "支付结果"
+			}
+		},
 		{
 			"path": "pages/register/perfectInfo",
 			"style": {

pages/messageCenter/index.vue

@@ -36,7 +36,7 @@
 					desc: '去看看哪些人联系过了',
 					icon: 'icon-contact-person',
 					bg_color: '#FE3EA5',
-					path: '',
+					path: '/pages/wallMember/contactedMember',
 					unread_count: 0
 				}, {
 					title: '系统消息',

pages/my/index.vue

@@ -60,7 +60,7 @@
 			</view>
 			<view class="adv-content">
 				<view class="lf-color-222 lf-font-32 lf-m-b-15">
-					专属服务定制
+					点击获取红线
 				</view>
 				<view class="lf-color-777">促成您和心仪对象线下见面 <u-icon class="lf-m-l-20" name="arrow-right"></u-icon></view>
 			</view>

pages/payState/paystate.vue

@@ -0,0 +1,49 @@
+<template>
+	<view>
+		<view v-if="ifpaySuccess==1" class="lf-flex lf-flex-column lf-row-round" style="margin-top: 100px;">
+			<view>
+				<image src="@/static/logo.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
+			</view>
+			<view class="lf-m-t-40 lf-font-bold lf-font-42 lf-color-primary">订单支付成功</view>
+		</view>
+		<view v-else class="lf-flex lf-flex-column lf-row-round" style="margin-top: 100px;">
+			<view>
+				<image src="@/static/logo.png" mode="widthFix" style="height: 100px;width: 100px;"></image>
+			</view>
+			<view class="lf-m-t-40 lf-font-bold lf-color-black lf-font-42 lf-color-333">订单支付失败</view>
+		</view>
+		<view class="margin-self flex flex-direction justify-around">
+			<view class="lf-p-r-32 lf-p-l-32 lf-m-t-40">
+				<button class="cu-btn lf-bg-white" style="border: 1px solid #E21196;" @tap="$url('/pages/index/index',{type: 'switch'})">
+					<text class="lf-font-32 lf-color-primary">返回首页</text>
+				</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				ifpaySuccess: -1
+			}
+		},
+		onLoad(e) {
+			this.ifpaySuccess = e.ifSuccess
+		}
+	}
+</script>
+
+<style scoped>
+	.margin-self {
+		margin-top: 100rpx;
+	}
+	.cu-btn {
+		border-radius: 10rpx;
+		background-color: #E21196;
+		height: 82rpx;
+		line-height: 82rpx;
+		text-align: center;
+	}
+</style>

pages/wallMember/contactedMember.vue

@@ -0,0 +1,95 @@
+<template>
+	<view>
+		<view class="lf-color-222 lf-font-32 authen-title lf-p-l-20 lf-m-l-30">联系过的人</view>
+		<view class="content">
+			<view class="card" v-for="item in 7" :key="item">
+				<lf-image class="cover" src="../../static/logo.png"></lf-image>
+				<view class="label">
+					<view class="lf-line-1">嘉宾xxx <text class="lf-iconfont icon-nan lf-m-l-10 lf-color-blue"></text></view>
+					<view class="lf-line-1">25岁·牛·180cm·本科·未婚</view>
+				</view>
+			</view>
+		</view>
+		<!-- 加载更多 -->
+		<view class="loading-more">
+			<text>没有更多数据啦~</text>
+		</view>
+		<!-- 回到顶部 -->
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	.authen-title {
+		position: relative;
+		font-size: 32rpx;
+		color: #131315;
+		font-weight: 500;
+	}
+	.authen-title::after {
+		content: '';
+		position: absolute;
+		left: 0;
+		top: 8rpx;
+		width: 8rpx;
+		height: 30rpx;
+		background: #E21196;
+		border-radius: 4rpx;
+	}
+	.content{
+		display: flex;
+		flex-wrap: wrap;
+		padding: 44rpx 32rpx;
+	}
+	.card{
+		width: 334rpx;
+		height: 360rpx;
+		border-radius: 10rpx;
+		position: relative;
+		overflow: hidden;
+		margin-right: 18rpx;
+		margin-bottom: 18rpx;
+		&:nth-child(2n){
+			margin-right: 0rpx;
+		}
+		.cover{
+			width: 100%;
+			height: 100%;
+			background-color: #EEEEEE;
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
+		.label{
+			position: absolute;
+			bottom: 0;
+			left: 0;
+			width: 100%;
+			height: 98rpx;
+			color: #FFFFFF;
+			background: rgba(0, 0, 0, 0.5);
+			display: flex;
+			justify-content: center;
+			padding: 0 20rpx;
+			flex-wrap: nowrap;
+			flex-direction: column;
+			font-size: 28rpx;
+		}
+	}
+</style>

pages/wallMember/getRed.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>