diff --git a/common/styles/theme.css b/common/styles/theme.css index 684756f..b9b7fc7 100644 --- a/common/styles/theme.css +++ b/common/styles/theme.css @@ -61,11 +61,11 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo /* #endif */ .lf-color-primary { - color: #1998FE !important; + color: #E21196 !important; } .lf-bg-primary { - background: #1998FE !important; + background: #E21196 !important; } .lf-color-secondary { diff --git a/components/lf-userList/lf-userList.vue b/components/lf-userList/lf-userList.vue new file mode 100644 index 0000000..98f137a --- /dev/null +++ b/components/lf-userList/lf-userList.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/components/self-line/self-line.vue b/components/self-line/self-line.vue new file mode 100644 index 0000000..ce1b55c --- /dev/null +++ b/components/self-line/self-line.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/main.js b/main.js index 6c139c5..a43a894 100644 --- a/main.js +++ b/main.js @@ -24,6 +24,10 @@ Vue.prototype.$http = $http; // 将无数据组件注入全局 import lfNocontent from '@/components/lf-nocontent/lf-nocontent.vue'; Vue.component('lf-nocontent', lfNocontent); +// 页面分割 +import selfLine from '@/components/self-line/self-line.vue'; +Vue.component('self-line', selfLine); + const app = new Vue({ ...App diff --git a/pages.json b/pages.json index a97b887..cfc937c 100644 --- a/pages.json +++ b/pages.json @@ -6,10 +6,23 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "首页", + "navigationBarTitleText": "相亲交友", "enablePullDownRefresh": true } }, + { + "path": "pages/wallMember/wallMember", + "style": { + "navigationBarTitleText": "上墙会员", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/upTheWall/upTheWall", + "style": { + "navigationBarTitleText": "我要上墙" + } + }, { "path": "pages/login/index", "style": { @@ -36,7 +49,7 @@ ], "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "领峰UI", + "navigationBarTitleText": "相亲交友", "navigationBarBackgroundColor": "#FFFFFF", "backgroundColor": "#F8F8F8" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index e1d2606..14b1692 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,41 +1,123 @@ diff --git a/pages/upTheWall/upTheWall.vue b/pages/upTheWall/upTheWall.vue new file mode 100644 index 0000000..83d1a1f --- /dev/null +++ b/pages/upTheWall/upTheWall.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/pages/wallMember/wallMember.vue b/pages/wallMember/wallMember.vue new file mode 100644 index 0000000..9aa7f01 --- /dev/null +++ b/pages/wallMember/wallMember.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/static/logo.png b/static/logo.png index b5771e2..e3e6210 100644 Binary files a/static/logo.png and b/static/logo.png differ