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

# Conflicts:
#	pages.json

App.vue

@@ -119,6 +119,7 @@
 	@import "@/uview-ui/index.scss";
 	@import '@/common/styles/theme.css';
 	@import '@/common/styles/common.css';
+	@import '@/common/styles/iconfont.css';
 	
 	//底部按钮
 	.btn-bottom {

common/styles/iconfont.css

@@ -0,0 +1,90 @@
+@font-face {
+  font-family: "lf-iconfont"; /* Project id 2731103 */
+  src: url('//at.alicdn.com/t/font_2731103_jdpc6xie5ss.woff2?t=1629108236427') format('woff2'),
+       url('//at.alicdn.com/t/font_2731103_jdpc6xie5ss.woff?t=1629108236427') format('woff'),
+       url('//at.alicdn.com/t/font_2731103_jdpc6xie5ss.ttf?t=1629108236427') format('truetype');
+}
+
+.lf-iconfont {
+  font-family: "lf-iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-fenxiang:before {
+  content: "\e600";
+}
+
+.icon-weixin:before {
+  content: "\e61a";
+}
+
+.icon-weirenzheng:before {
+  content: "\e64e";
+}
+
+.icon-linedesign-12:before {
+  content: "\e671";
+}
+
+.icon-shenfenzhengbeimian:before {
+  content: "\e601";
+}
+
+.icon-shenfenzhengzhengmian:before {
+  content: "\e602";
+}
+
+.icon-hua:before {
+  content: "\e60e";
+}
+
+.icon-nv:before {
+  content: "\e60d";
+}
+
+.icon-jia:before {
+  content: "\e715";
+}
+
+.icon-iconfront-:before {
+  content: "\e61f";
+}
+
+.icon-zan:before {
+  content: "\e603";
+}
+
+.icon-xingxing:before {
+  content: "\e60f";
+}
+
+.icon-xiangyou:before {
+  content: "\e645";
+}
+
+.icon-tongzhi:before {
+  content: "\e737";
+}
+
+.icon-dingzhi:before {
+  content: "\e651";
+}
+
+.icon-pinglun:before {
+  content: "\e64c";
+}
+
+.icon-nan:before {
+  content: "\e67c";
+}
+
+.icon-contact-person:before {
+  content: "\e696";
+}
+
+.icon-xiaoxi_huaban1:before {
+  content: "\e612";
+}

pages.json

@@ -105,6 +105,31 @@
 			"style": {
 				"navigationBarTitleText": "VIP会员"
 			}
+		},
+		{
+			"path": "pages/userList/userList",
+			"style": {
+				"navigationBarTitleText": "VIP相亲交友"
+			}
+		},
+		{
+			"path": "pages/signIn/signIn",
+			"style": {
+				"navigationBarTitleText": "签到"
+			}
+		},
+		{
+			"path": "pages/find/find",
+			"style": {
+				"navigationBarTitleText": "发现",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/messageCenter/index",
+			"style": {
+				"navigationBarTitleText": "消息"
+			}
 		}
 	],
 	"globalStyle": {
@@ -124,10 +149,15 @@
 	        "selectedIconPath": "static/tabbar/home-active.png",
 	        "text": "首页" 
 	    },{
-	        "pagePath": "pages/login/index",
+	        "pagePath": "pages/find/find",
+	        "iconPath": "static/tabbar/find.png",
+	        "selectedIconPath": "static/tabbar/find-active.png",
+	        "text": "发现"
+	    },{
+	        "pagePath": "pages/messageCenter/index",
 	        "iconPath": "static/tabbar/find.png",
 	        "selectedIconPath": "static/tabbar/find-active.png",
-	        "text": "登录"
+	        "text": "消息"
 	    },{
 	        "pagePath": "pages/my/index",
 	        "iconPath": "static/tabbar/find.png",

pages/find/find.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	
+</style>

pages/index/index.vue

@@ -6,7 +6,7 @@
 				<u-icon name="search" class="lf-font-30 lf-m-l-20"></u-icon>
 				<view class="lf-m-l-10 lf-font-24">搜索</view>
 			</view>
-			<view class="botton">签到</view>
+			<view class="botton" @click="$url('/pages/signIn/signIn')">签到</view>
 		</view>
 		<!-- 上墙部分 -->
 		<view class="up-the-wall">
@@ -36,7 +36,7 @@
 		<view>
 			<view class="lf-row-between lf-p-30 lf-p-32 lf-p-b-20">
 				<view class="lf-font-32 lf-color-black">推荐单身</view>
-				<view class="lf-color-999">
+				<view class="lf-color-999" @click="$url('/pages/userList/userList')">
 					<text class="lf-font-28">最新</text>
 					<u-icon name="arrow-right"></u-icon>
 				</view>

pages/messageCenter/index.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	
+</style>

pages/signIn/signIn.vue

@@ -0,0 +1,135 @@
+<template>
+	<view>
+		<view class="head">
+			<view class="left">
+				<view>
+					<text class="lf-color-222">已连续签到</text>
+					<text class="lf-color-primary lf-p-l-10">{{ day }} 天</text>
+				</view>
+				<view>连续签到7天以上多获赠5桃花</view>
+			</view>
+			<view class="right">签到</view>
+		</view>
+		
+		<view class="content">
+			<view class="hua-item" :class="{'active-bg': item < day}" v-for="item in monthDate" :key="item">
+				<text class="lf-iconfont icon-hua lf-font-38" style="color: #FD898E;"></text>
+				<text>+5桃花</text>
+			</view>
+		</view>
+		
+		<view class="explain">
+			<view class="lf-font-32 lf-color-222 lf-font-bold">签到说明</view>
+			<view class="lf-m-t-20 lf-font-24 lf-color-777">
+				<view>1、每日签到：会员每天可签到一次，签到后获赠桃花。</view>
+				<view class="lf-m-t-10">2、连续签到：连续签到7天以上，以后继续签到将每天额外获赠5桃花。</view>
+				<view class="lf-m-t-10">
+					<text>3、关于桃花：桃花用于发布动态、评论等，也可在</text>
+					<text class="eye-catching">福利中心</text>
+					<text>兑换红线。</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				day: new Date().getDate()
+			}
+		},
+		computed: {
+			// 获取当前月份天数
+			monthDate(){
+				var date = new Date();
+				var year = date.getFullYear();
+				var month = date.getMonth()+1;
+				var d = new Date(year, month, 0);
+				return d.getDate();
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	.active-bg{
+		background-color: #ffdaf1 !important;
+	}
+	.head{
+		width: 750rpx;
+		height: max-content;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 40rpx 32rpx;
+		box-sizing: border-box;
+		.left view:nth-child(1){
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.left view:nth-child(2){
+			font-size: 28rpx;
+			color: #555555;
+			margin-top: 20rpx;
+		}
+		.right{
+			width: 182rpx;
+			height: 82rpx;
+			background-color: #E21196;
+			border-radius: 10rpx;
+			color: #FFFFFF;
+			font-size: 36rpx;
+			line-height: 82rpx;
+			text-align: center;
+		}
+	}
+	
+	.content{
+		width: 750rpx;
+		height: max-content;
+		padding: 20rpx 32rpx 50rpx;
+		display: flex;
+		flex-wrap: wrap;
+		.hua-item{
+			width: 90rpx;
+			height: 90rpx;
+			background-color: #F5F5F5;
+			border-radius: 5rpx;
+			font-size: 18rpx;
+			color: #555555;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-around;
+			margin-right: 9rpx;
+			margin-bottom: 10rpx;
+			&:nth-child(7n){
+				margin-right: 0rpx;
+			}
+		}
+	}
+	
+	.explain{
+		width: 686rpx;
+		height: max-content;
+		background-color: #F5F5F5;
+		border-radius: 10rpx;
+		margin: 0 auto;
+		box-sizing: border-box;
+		padding: 30rpx;
+		.eye-catching{
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #E21196;
+			padding: 0 4rpx;
+		}
+	}
+</style>

pages/userList/userList.vue

@@ -0,0 +1,121 @@
+<template>
+	<view>
+		<view class="head">
+			<button class="sign-in-btn" @click="$url('/pages/signIn/signIn')">签到</button>
+			<view class="filter-item" @click="show_filter = true">
+				<text>女生</text>
+				<text class="lf-iconfont icon-iconfront-"></text>
+			</view>
+			<view class="filter-item" @click="show_filter = true">
+				<text>年龄</text>
+				<text class="lf-iconfont icon-iconfront-"></text>
+			</view>
+			<view class="filter-item" @click="show_filter = true">
+				<text>学历</text>
+				<text class="lf-iconfont icon-iconfront-"></text>
+			</view>
+			<view class="filter-item" @click="show_filter = true">
+				<text>搜索</text>
+				<text class="lf-iconfont icon-iconfront-"></text>
+			</view>
+			<view class="filter-modal" v-if="show_filter" @click="show_filter = false">
+				<view class="filter-content">
+					<view @click="show_filter = false">不限</view>
+					<view @click="show_filter = false">20~25岁</view>
+					<view @click="show_filter = false">25~30岁</view>
+					<view @click="show_filter = false">30~35岁</view>
+					<view @click="show_filter = false">35~40岁</view>
+					<view @click="show_filter = false">40~45岁</view>
+					<view @click="show_filter = false">45岁以上</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 104rpx;"></view>
+		<lf-user-list></lf-user-list>
+		<!-- 加载 -->
+		<view class="loading-more">
+			<text>没有更多数据啦~</text>
+		</view>
+		<!-- 回到顶部 -->
+		<u-back-top :scrollTop="pageScrollTop"></u-back-top>
+	</view>
+</template>
+
+<script>
+	import lfUserList from '@/components/lf-userList/lf-userList.vue'
+	export default {
+		components: { lfUserList },
+		data(){
+			return {
+				show_filter: false
+			}
+		},
+		onLoad(){
+			
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	.head{
+		width: 750rpx;
+		height: 102rpx;
+		border-bottom: 1rpx solid #e5e5e5;
+		position: fixed;
+		background-color: #FFFFFF;
+		z-index: 9;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 32rpx;
+		box-sizing: border-box;
+		.sign-in-btn{
+			margin: 0;
+			width: 140rpx;
+			height: 62rpx;
+			background-color: #FCF7FA;
+			border: 1rpx solid #E21196;
+			border-radius: 10rpx;
+			font-size: 28rpx;
+			color: #E21196;
+			line-height: 60rpx;
+		}
+		.filter-item{
+			width: 100rpx;
+			height: 62rpx;
+			line-height: 62rpx;
+			text-align: right;
+			font-size: 28rpx;
+			color: #222222;
+		}
+		.filter-modal{
+			position: absolute;
+			z-index: 7;
+			background-color: rgba(0,0,0,0.5);
+			top: 103rpx;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			width: 100vw;
+			height: calc(100vh - 103rpx);
+			.filter-content{
+				position: absolute;
+				width: 100%;
+				height: 300rpx;
+				background-color: #FFFFFF;
+				left: 0;
+				z-index: 14;
+				overflow-y: scroll;
+				padding-left: 32rpx;
+				view{
+					height: 60rpx;
+					border-bottom: 1rpx solid #e5e5e5;
+					line-height: 60rpx;
+				}
+			}
+		}
+	}
+</style>