From cf329094ccc03ce13be0660b4fc4ee3cde77f17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com>
Date: Tue, 24 Aug 2021 11:15:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E6=8B=A9=E5=81=B6=E8=A6=81=E6=B1=82/=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E5=AE=B6=E5=BA=AD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 12 +
pages/register/basicInfo.vue | 2 +-
pages/register/chooseMate.vue | 385 +++++++++++++++++++++++++++++++
pages/register/perfectInfo.vue | 4 +-
pages/register/workFamily.vue | 409 +++++++++++++++++++++++++++++++++
5 files changed, 809 insertions(+), 3 deletions(-)
create mode 100644 pages/register/chooseMate.vue
create mode 100644 pages/register/workFamily.vue
diff --git a/pages.json b/pages.json
index 2d5a137..591e10c 100644
--- a/pages.json
+++ b/pages.json
@@ -29,6 +29,18 @@
"navigationBarTitleText": "会员注册-完善信息"
}
},
+ {
+ "path": "pages/register/chooseMate",
+ "style": {
+ "navigationBarTitleText": "会员注册-择偶条件"
+ }
+ },
+ {
+ "path": "pages/register/workFamily",
+ "style": {
+ "navigationBarTitleText": "会员注册-工作家庭"
+ }
+ },
{
"path": "pages/upTheWall/upTheWall",
"style": {
diff --git a/pages/register/basicInfo.vue b/pages/register/basicInfo.vue
index 58e655b..336c566 100644
--- a/pages/register/basicInfo.vue
+++ b/pages/register/basicInfo.vue
@@ -67,7 +67,7 @@
-
+
diff --git a/pages/register/chooseMate.vue b/pages/register/chooseMate.vue
new file mode 100644
index 0000000..259205a
--- /dev/null
+++ b/pages/register/chooseMate.vue
@@ -0,0 +1,385 @@
+
+
+
+
+ *婚史要求
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *最低身高
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+
+ *最低学历要求
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+
+ *最低年薪要求
+
+ 请选择
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 请选择你的家庭成员
+
+
+
+ {{item.name}}
+
+
+
+
+ 确认选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/register/perfectInfo.vue b/pages/register/perfectInfo.vue
index 24cd302..e156aff 100644
--- a/pages/register/perfectInfo.vue
+++ b/pages/register/perfectInfo.vue
@@ -27,7 +27,7 @@
*家庭成员
-
+
请选择
@@ -62,7 +62,7 @@
-
+
diff --git a/pages/register/workFamily.vue b/pages/register/workFamily.vue
new file mode 100644
index 0000000..08669ec
--- /dev/null
+++ b/pages/register/workFamily.vue
@@ -0,0 +1,409 @@
+
+
+
+
+ *单位性质
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *所属行业
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *户籍地
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *居住情况
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *住房情况
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+ *购房情况
+
+
+ {{ marriage[marriage_index] || '请选择' }}
+
+
+
+
+
+ *家庭成员
+
+ 请选择
+
+
+
+ {{item.name}}
+
+
+
+
+
+ 请选择你的家庭成员
+
+
+
+ {{item.name}}
+
+
+
+
+ 确认选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From d05e5cb3aef0b36613306a26e44ab720d37cf4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com>
Date: Tue, 24 Aug 2021 14:28:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/userList/userList.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/userList/userList.vue b/pages/userList/userList.vue
index 96e215a..04de67e 100644
--- a/pages/userList/userList.vue
+++ b/pages/userList/userList.vue
@@ -198,7 +198,7 @@
height: 62rpx;
border-radius: 31rpx;
border: 1rpx solid #999999;
- font-size: 28rpx;
+ font-size: 20rpx;
color: #999999;
text-align: center;
line-height: 62rpx;
From df3b02e15b3b7342a4f33e5bce3881cffed70a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com>
Date: Tue, 24 Aug 2021 15:00:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=80=E6=9C=9F=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 13 ++++++----
pages/find/find.vue | 9 ++++---
pages/index/index.vue | 9 ++++---
pages/messageCenter/index.vue | 48 +++++++++++++++++++++++------------
pages/my/exclusiveMatch.vue | 2 +-
pages/my/memberDetails.vue | 5 ++--
pages/userList/filter.json | 13 ++++++++++
pages/userList/userList.vue | 2 +-
8 files changed, 69 insertions(+), 32 deletions(-)
diff --git a/pages.json b/pages.json
index ab4477a..449af72 100644
--- a/pages.json
+++ b/pages.json
@@ -261,11 +261,6 @@
"iconPath": "static/tabbar/find.png",
"selectedIconPath": "static/tabbar/find-active.png",
"text": "发现"
- },{
- "pagePath": "pages/personalTailor/personalTailor",
- "iconPath": "static/tabbar/customized.png",
- "selectedIconPath": "static/tabbar/customized-active.png",
- "text": "私人定制"
},{
"pagePath": "pages/messageCenter/index",
"iconPath": "static/tabbar/message.png",
@@ -277,5 +272,13 @@
"selectedIconPath": "static/tabbar/my-active.png",
"text": "我的"
}]
+
+ //二期隐藏部分
+ // {
+ // "pagePath": "pages/personalTailor/personalTailor",
+ // "iconPath": "static/tabbar/customized.png",
+ // "selectedIconPath": "static/tabbar/customized-active.png",
+ // "text": "私人定制"
+ // },
}
}
diff --git a/pages/find/find.vue b/pages/find/find.vue
index d4cd6c6..c4eccb5 100644
--- a/pages/find/find.vue
+++ b/pages/find/find.vue
@@ -7,7 +7,7 @@
-
+
@@ -25,7 +25,10 @@
08:38
-
+
+ 分享
+
+
- 签到
+
-
+
@@ -71,7 +71,8 @@
display: flex;
justify-content: space-between;
.search{
- width: 530rpx;
+ // width: 530rpx;
+ width: 100%;
height: 62rpx;
background: #F7F7F7;
border-radius: 32rpx;
diff --git a/pages/messageCenter/index.vue b/pages/messageCenter/index.vue
index 755c331..b8196ef 100644
--- a/pages/messageCenter/index.vue
+++ b/pages/messageCenter/index.vue
@@ -9,7 +9,8 @@
{{ item.title }}
{{ item.desc }}
-
+
+ 99+
@@ -19,23 +20,25 @@
diff --git a/pages/my/exclusiveMatch.vue b/pages/my/exclusiveMatch.vue
index 7bbc690..0504370 100644
--- a/pages/my/exclusiveMatch.vue
+++ b/pages/my/exclusiveMatch.vue
@@ -12,7 +12,7 @@
微信:gyw38283
-
+
复制
diff --git a/pages/my/memberDetails.vue b/pages/my/memberDetails.vue
index 9922df9..3aa5002 100644
--- a/pages/my/memberDetails.vue
+++ b/pages/my/memberDetails.vue
@@ -65,14 +65,15 @@
分享
-
+
+
diff --git a/pages/userList/filter.json b/pages/userList/filter.json
index bfacf53..3b182b9 100644
--- a/pages/userList/filter.json
+++ b/pages/userList/filter.json
@@ -1,4 +1,17 @@
{
+ "total": {
+ "name": "综合",
+ "selected": "",
+ "data": [{
+ "value": "默认排序"
+ },{
+ "value": "最新加入"
+ },{
+ "value": "最近在线"
+ },{
+ "value": "动态最多"
+ }]
+ },
"gender": {
"name": "性别",
"selected": "",
diff --git a/pages/userList/userList.vue b/pages/userList/userList.vue
index 04de67e..21ba996 100644
--- a/pages/userList/userList.vue
+++ b/pages/userList/userList.vue
@@ -1,7 +1,7 @@
-
+
{{ value.selected || value.name }}
From 69528d67e065d15affb5eb233e896c3e4796a78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9F=B3=E5=8F=AF?= <1284707383@qq.com>
Date: Tue, 24 Aug 2021 15:55:23 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=80=E6=9C=9F=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 12 ++++++++
pages/find/find.vue | 5 +++-
pages/my/contact.vue | 56 +++++++++++++++++++++++++++++++++++--
pages/my/index.vue | 28 +++++++++++--------
pages/my/likeMe.vue | 11 ++++++++
pages/my/memberDetails.vue | 4 +--
pages/my/seeMe.vue | 11 ++++++++
pages/userList/userList.vue | 10 +++++--
8 files changed, 116 insertions(+), 21 deletions(-)
create mode 100644 pages/my/likeMe.vue
create mode 100644 pages/my/seeMe.vue
diff --git a/pages.json b/pages.json
index 449af72..ce186a7 100644
--- a/pages.json
+++ b/pages.json
@@ -102,6 +102,18 @@
"navigationBarTitleText": "我的收藏"
}
},
+ {
+ "path": "pages/my/seeMe",
+ "style": {
+ "navigationBarTitleText": "谁看过我"
+ }
+ },
+ {
+ "path": "pages/my/likeMe",
+ "style": {
+ "navigationBarTitleText": "喜欢我的"
+ }
+ },
{
"path": "pages/my/editInfo",
"style": {
diff --git a/pages/find/find.vue b/pages/find/find.vue
index c4eccb5..9521063 100644
--- a/pages/find/find.vue
+++ b/pages/find/find.vue
@@ -26,7 +26,10 @@
08:38
- 分享
+
+
+ 分享
+
+ 13:23
+
+
+
+
+
+
+
+ 嘉宾xxxx很符合我的期待,我想与Ta尝试配对。
+
+
+
+
+
+ 13:23
+
+
+
+
+
+
+
+ 嘻嘻,小红娘明白啦!已经将您的爱慕传达给了嘉宾xxx,咋们先等待一下Ta的回复吧
+
+
+
+
+
+ 13:23
diff --git a/pages/my/memberDetails.vue b/pages/my/memberDetails.vue
index 3aa5002..6e673c2 100644
--- a/pages/my/memberDetails.vue
+++ b/pages/my/memberDetails.vue
@@ -34,7 +34,7 @@
了解Ta的购车、住房情况和家庭成员资料
-
+
实名认证后可查看>>
@@ -43,7 +43,7 @@
了解Ta的婚史、身高、年龄等各项择偶要求
-
+
实名认证后可查看>>
diff --git a/pages/my/seeMe.vue b/pages/my/seeMe.vue
new file mode 100644
index 0000000..995a136
--- /dev/null
+++ b/pages/my/seeMe.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/userList/userList.vue b/pages/userList/userList.vue
index 21ba996..f96b178 100644
--- a/pages/userList/userList.vue
+++ b/pages/userList/userList.vue
@@ -138,7 +138,7 @@
line-height: 60rpx;
}
.filter-item{
- width: 100rpx;
+ width: 114rpx;
height: 62rpx;
line-height: 62rpx;
text-align: right;
@@ -168,10 +168,14 @@
left: 0;
z-index: 14;
overflow-y: scroll;
- padding-left: 32rpx;
+ padding: 0 0 32rpx 32rpx;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
view{
height: 60rpx;
- border-bottom: 1rpx solid #e5e5e5;
+ // border-bottom: 1rpx solid #e5e5e5;
+ padding: 20rpx 0;
line-height: 60rpx;
}
}