diff --git a/common/styles/theme.css b/common/styles/theme.css index cd95db8..684756f 100644 --- a/common/styles/theme.css +++ b/common/styles/theme.css @@ -140,6 +140,12 @@ radio:not([disabled]) .wx-radio-input:hover checkbox:not([disabled]) .wx-checkbo .lf-color-333{ color: #333333 !important; } +.lf-color-222{ + color: #222222!important; +} +.lf-color-777{ + color: #777777!important; +} .lf-color-blue { color: #1998FE !important; diff --git a/package-lock.json b/package-lock.json index 2c0c238..0cfea6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,11 @@ { "requires": true, "lockfileVersion": 1, - "dependencies": {} + "dependencies": { + "tki-qrcode": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/tki-qrcode/-/tki-qrcode-0.1.6.tgz", + "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ==" + } + } } diff --git a/pages.json b/pages.json index c18ceae..a97b887 100644 --- a/pages.json +++ b/pages.json @@ -6,7 +6,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "领峰UI", + "navigationBarTitleText": "首页", "enablePullDownRefresh": true } }, @@ -16,6 +16,22 @@ "navigationBarTitleText": "登录", "enablePullDownRefresh": true } + }, + { + "path": "pages/my/index", + "style": { + "navigationBarTitleText": "我的", + "navigationBarBackgroundColor": "#FE3EA5", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/my/exclusive-match", + "style": { + "navigationBarTitleText": "专属红娘", + "navigationBarBackgroundColor": "#FE3EA5", + "navigationBarTextStyle": "white" + } } ], "globalStyle": { @@ -39,6 +55,11 @@ "iconPath": "static/tabbar/find.png", "selectedIconPath": "static/tabbar/find-active.png", "text": "登录" + },{ + "pagePath": "pages/my/index", + "iconPath": "static/tabbar/find.png", + "selectedIconPath": "static/tabbar/find-active.png", + "text": "我的" }] } } diff --git a/pages/my/exclusive-match.vue b/pages/my/exclusive-match.vue new file mode 100644 index 0000000..619b292 --- /dev/null +++ b/pages/my/exclusive-match.vue @@ -0,0 +1,127 @@ + + + + + + diff --git a/pages/my/index.vue b/pages/my/index.vue new file mode 100644 index 0000000..50010a5 --- /dev/null +++ b/pages/my/index.vue @@ -0,0 +1,261 @@ + + + + +