diff --git a/App.vue b/App.vue index ee288b1..726e150 100644 --- a/App.vue +++ b/App.vue @@ -6,6 +6,7 @@ }, onShow: function() { console.log('App Show') + uni.hideTabBar(); }, onHide: function() { console.log('App Hide') diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue new file mode 100644 index 0000000..0176850 --- /dev/null +++ b/components/tabbar/tabbar.vue @@ -0,0 +1,130 @@ + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 6a3c6a6..0605dd0 100644 --- a/pages.json +++ b/pages.json @@ -60,23 +60,23 @@ "tabBar": { "selectedColor": "#009eff", "list": [{ - "pagePath": "pages/index/index", - "text": "首页", - "iconPath": "static/tab_icons/home.png" + "pagePath": "pages/index/index" + // "text": "首页", + // "iconPath": "static/tab_icons/home.png" }, { - "pagePath": "pages/scan/scan", - "text": "扫一扫", - "iconPath": "static/tab_icons/cate.png" + "pagePath": "pages/scan/scan" + // "text": "扫一扫", + // "iconPath": "static/tab_icons/cate.png" }, { - "pagePath": "pages/knowledge/knowledge", - "text": "知识库", - "iconPath": "static/tab_icons/knownledge.png" + "pagePath": "pages/knowledge/knowledge" + // "text": "知识库", + // "iconPath": "static/tab_icons/knownledge.png" }, { - "pagePath": "pages/my/my", - "text": "我的", - "iconPath": "static/tab_icons/my.png" + "pagePath": "pages/my/my" + // "text": "我的", + // "iconPath": "static/tab_icons/my.png" } ] } diff --git a/pages/index/index.vue b/pages/index/index.vue index 45b4694..b26a285 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -16,15 +16,19 @@ + + diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue index 901c839..4add765 100644 --- a/pages/knowledge/knowledge.vue +++ b/pages/knowledge/knowledge.vue @@ -1,16 +1,23 @@ diff --git a/pages/my/my.vue b/pages/my/my.vue index d7c09cf..9498f10 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -1,208 +1,224 @@ + .my-userinfo-container { + height: 100%; + background-color: #F4F4F4; + + .top-box { + height: 400rpx; + background-color: #aba9d0; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + + .avatar { + width: 90px; + height: 90px; + border-radius: 45px; + border: 2px solid #FFF; + box-shadow: 0 1px 5px black; + } + + .nickname { + font-size: 16px; + color: black; + font-family: Georgia, 'Times New Roman', Times, serif; + margin-top: 10px; + } + } + } + + .panel-list { + padding: 0 10px; + position: relative; + top: -10px; + + .panel { + background-color: white; + border-radius: 3px; + margin-bottom: 8px; + + .panel-title { + line-height: 45px; + padding-left: 10px; + font-size: 15px; + border-bottom: 1px solid #F4F4F4; + } + + .panel-body { + display: flex; + justify-content: space-around; + + .panel-item { + display: flex; + flex-direction: column; + align-items: center; + justify-content: space-around; + padding: 10px 0; + font-size: 13px; + + .icon { + width: 35px; + height: 35px; + } + } + } + } + } + + .function-img { + width: 30px; + height: 30px; + } + .panel-list-item { + display: flex; + justify-content: space-between; + align-items: center; + font-size: 15px; + padding: 0 10px; + line-height: 45px; + } + + swiper { + height: 230rpx; + + .swiper-item, + image { + width: 100%; + height: 100%; + border-radius: 4px; + } + } + \ No newline at end of file diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue index 52e624e..ac54b36 100644 --- a/pages/scan/scan.vue +++ b/pages/scan/scan.vue @@ -2,20 +2,26 @@ + +