diff --git a/member/homepage/homepage.vue b/member/homepage/homepage.vue
index 1d4118c..56445e6 100644
--- a/member/homepage/homepage.vue
+++ b/member/homepage/homepage.vue
@@ -1,14 +1,15 @@
-
+
-
-
+
+
+
@@ -44,8 +45,9 @@
-
-
+
+
+
@@ -79,12 +81,11 @@
text: '关注',
}],
buttonGroup: [{
- text: '撩一下TA',
- backgroundColor: 'linear-gradient(90deg, #ff55ff, #ff557f)',
- color: '#fff'
- }
- ],
- }
+ text: '撩一下TA',
+ backgroundColor: 'linear-gradient(90deg, #ff55ff, #ff557f)',
+ color: '#fff'
+ }],
+ }
},
methods: {
@@ -93,5 +94,18 @@
diff --git a/member/profile/profile.vue b/member/profile/profile.vue
index c4a7a27..8718f40 100644
--- a/member/profile/profile.vue
+++ b/member/profile/profile.vue
@@ -9,8 +9,8 @@
-
-
+
+
@@ -19,22 +19,22 @@
-
-
+
+
-
+
-
+
@@ -46,11 +46,11 @@
-
+
-
+
@@ -69,7 +69,7 @@
-
+
@@ -87,8 +87,9 @@
isDisabled: true,
// 基础表单数据
formData: {
- name: '',
- age: '',
+ nickname: '',
+ height:0,
+ age: 0,
introduction: '',
sex: 2,
hobby: [5],
diff --git a/pages.json b/pages.json
index 8067bd4..5cc356b 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,24 @@
"navigationBarTitleText": "主页",
"enablePullDownRefresh": false
}
- },
+ },{
+ "path" : "pages/tabbar/videos/videos",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ,{
+ "path" : "pages/tabbar/dynamics/dynamics",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ },
{
"path": "pages/tabbar/my/my",
"style": {
@@ -30,7 +47,17 @@
}
}
- ],
+ ,{
+ "path" : "pages/tabbar/messages/messages",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+
+ }
+ ],
"subPackages": [{
"root": "member",
"pages": [{
@@ -50,21 +77,27 @@
}]
}],
"tabBar": {
+
"list": [{
"pagePath": "pages/tabbar/home/home",
"text": "主页",
"selectedIconPath": "static/tabbar/home_active.png",
"iconPath": "static/tabbar/home.png"
},{
- "pagePath": "pages/tabbar/home/home",
+ "pagePath": "pages/tabbar/dynamics/dynamics",
"text": "动态",
- "selectedIconPath": "static/tabbar/home_active.png",
- "iconPath": "static/tabbar/home.png"
+ "selectedIconPath": "static/tabbar/pyq_active.png",
+ "iconPath": "static/tabbar/pyq.png"
},{
- "pagePath": "pages/tabbar/home/home",
+ "pagePath": "pages/tabbar/videos/videos",
+ "text": "视频",
+ "selectedIconPath": "static/tabbar/videos_active.png",
+ "iconPath": "static/tabbar/videos.png"
+ },{
+ "pagePath": "pages/tabbar/messages/messages",
"text": "消息",
- "selectedIconPath": "static/tabbar/home_active.png",
- "iconPath": "static/tabbar/home.png"
+ "selectedIconPath": "static/tabbar/message-active.png",
+ "iconPath": "static/tabbar/message.png"
},
{
"pagePath": "pages/tabbar/my/my",
diff --git a/pages/tabbar/dynamics/dynamics.vue b/pages/tabbar/dynamics/dynamics.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/tabbar/dynamics/dynamics.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/tabbar/messages/messages.vue b/pages/tabbar/messages/messages.vue
new file mode 100644
index 0000000..347da2b
--- /dev/null
+++ b/pages/tabbar/messages/messages.vue
@@ -0,0 +1,213 @@
+
+
+
+
+
+
+ {{ city }}
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+ 刚刚
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/tabbar/videos/videos.vue b/pages/tabbar/videos/videos.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/tabbar/videos/videos.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/static/tabbar/message-active.png b/static/tabbar/message-active.png
new file mode 100644
index 0000000..015fd6d
Binary files /dev/null and b/static/tabbar/message-active.png differ
diff --git a/static/tabbar/message.png b/static/tabbar/message.png
new file mode 100644
index 0000000..ab844a9
Binary files /dev/null and b/static/tabbar/message.png differ
diff --git a/static/tabbar/pyq.png b/static/tabbar/pyq.png
new file mode 100644
index 0000000..59b7161
Binary files /dev/null and b/static/tabbar/pyq.png differ
diff --git a/static/tabbar/pyq_active.png b/static/tabbar/pyq_active.png
new file mode 100644
index 0000000..9655a57
Binary files /dev/null and b/static/tabbar/pyq_active.png differ
diff --git a/static/tabbar/videos.png b/static/tabbar/videos.png
new file mode 100644
index 0000000..70d7a77
Binary files /dev/null and b/static/tabbar/videos.png differ
diff --git a/static/tabbar/videos_active.png b/static/tabbar/videos_active.png
new file mode 100644
index 0000000..c946591
Binary files /dev/null and b/static/tabbar/videos_active.png differ
diff --git a/static/user/back.jpg b/static/user/back.jpg
new file mode 100644
index 0000000..618181b
Binary files /dev/null and b/static/user/back.jpg differ