diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css index 089002b..aa00b0e 100644 --- a/common/styles/iconfont.css +++ b/common/styles/iconfont.css @@ -1,11 +1,11 @@ @font-face { font-family: "lf-iconfont"; /* Project id 2779107 */ - src: url('//at.alicdn.com/t/font_2779107_i410qmxy80m.woff2?t=1630489955128') format('woff2'), - url('//at.alicdn.com/t/font_2779107_i410qmxy80m.woff?t=1630489955128') format('woff'), - url('//at.alicdn.com/t/font_2779107_i410qmxy80m.ttf?t=1630489955128') format('truetype'); + src: url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.woff2?t=1630663119031') format('woff2'), + url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.woff?t=1630663119031') format('woff'), + url('//at.alicdn.com/t/font_2779107_qs77qtmfs2o.ttf?t=1630663119031') format('truetype'); } -.iconfont { +.lf-iconfont { font-family: "lf-iconfont" !important; font-size: 16px; font-style: normal; @@ -13,6 +13,70 @@ -moz-osx-font-smoothing: grayscale; } +.icon-huiyuan:before { + content: "\e65d"; +} + +.icon-Group-:before { + content: "\e6ae"; +} + +.icon-Member:before { + content: "\e613"; +} + +.icon-daishouhuo:before { + content: "\e651"; +} + +.icon-shoucang1:before { + content: "\f49a"; +} + +.icon-daifukuan:before { + content: "\e682"; +} + +.icon-tihuo:before { + content: "\e62e"; +} + +.icon-huiyuan1:before { + content: "\f81e"; +} + +.icon-icon:before { + content: "\e658"; +} + +.icon-cuo:before { + content: "\e63f"; +} + +.icon-cuo1:before { + content: "\e635"; +} + +.icon-xuanzhong:before { + content: "\e600"; +} + +.icon-bianji:before { + content: "\f021"; +} + +.icon-erweima:before { + content: "\e634"; +} + +.icon-shanchu:before { + content: "\f36d"; +} + +.icon-tupian:before { + content: "\f46e"; +} + .icon-xiangyou:before { content: "\e6af"; } diff --git a/components/lf-tabbar/animate.scss b/components/lf-tabbar/animate.scss deleted file mode 100644 index b07e0db..0000000 --- a/components/lf-tabbar/animate.scss +++ /dev/null @@ -1,149 +0,0 @@ -.animate__animated { - animation-duration: 0.5s; - animation-fill-mode: both; -} - -@keyframes zoomIn { - from { - opacity: 0; - -webkit-transform: scale3d(0.3, 0.3, 0.3); - transform: scale3d(0.3, 0.3, 0.3); - } - - 50% { - opacity: 1; - } -} - -.animate__zoomIn { - animation-name: zoomIn; -} - -@keyframes bounce { - - from, - 20%, - 53%, - to { - -webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); - animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); - -webkit-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); - } - - 40%, - 43% { - animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); - transform: translate3d(0, -30px, 0) scaleY(1.1); - } - - 70% { - animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); - transform: translate3d(0, -15px, 0) scaleY(1.05); - } - - 80% { - transition-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); - transform: translate3d(0, 0, 0) scaleY(0.95); - } - - 90% { - transform: translate3d(0, -4px, 0) scaleY(1.02); - } -} - -.animate__bounce { - animation-name: bounce; - transform-origin: center bottom; -} - -@keyframes rubberBand { - from { - transform: scale3d(1, 1, 1); - } - - 30% { - transform: scale3d(1.25, 0.75, 1); - } - - 40% { - transform: scale3d(0.75, 1.25, 1); - } - - 50% { - transform: scale3d(1.15, 0.85, 1); - } - - 65% { - transform: scale3d(0.95, 1.05, 1); - } - - 75% { - transform: scale3d(1.05, 0.95, 1); - } - - to { - transform: scale3d(1, 1, 1); - } -} - -.animate__rubberBand { - animation-name: rubberBand; -} - -@keyframes bounceIn { - - from, - 20%, - 40%, - 60%, - 80%, - to { - animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); - } - - 0% { - opacity: 0; - transform: scale3d(0.3, 0.3, 0.3); - } - - 20% { - transform: scale3d(1.1, 1.1, 1.1); - } - - 40% { - transform: scale3d(0.9, 0.9, 0.9); - } - - 60% { - opacity: 1; - transform: scale3d(1.03, 1.03, 1.03); - } - - 80% { - transform: scale3d(0.97, 0.97, 0.97); - } - - to { - opacity: 1; - transform: scale3d(1, 1, 1); - } -} - -.animate__bounceIn { - animation-name: bounceIn; -} - -@keyframes fadeIn { - from { - opacity: 0; - } - - to { - opacity: 1; - } -} - -.animate__fadeIn { - animation-name: fadeIn; -} \ No newline at end of file diff --git a/components/lf-tabbar/lf-tabbar-box.vue b/components/lf-tabbar/lf-tabbar-box.vue deleted file mode 100644 index 90f88b3..0000000 --- a/components/lf-tabbar/lf-tabbar-box.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - diff --git a/components/lf-tabbar/lf-tabbar-item.vue b/components/lf-tabbar/lf-tabbar-item.vue deleted file mode 100644 index a2380d8..0000000 --- a/components/lf-tabbar/lf-tabbar-item.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - diff --git a/components/lf-tabbar/lf-tabbar.vue b/components/lf-tabbar/lf-tabbar.vue index 6f65a60..53a248d 100644 --- a/components/lf-tabbar/lf-tabbar.vue +++ b/components/lf-tabbar/lf-tabbar.vue @@ -1,42 +1,37 @@ - diff --git a/components/lf-tabbar/style.scss b/components/lf-tabbar/style.scss deleted file mode 100644 index 2123402..0000000 --- a/components/lf-tabbar/style.scss +++ /dev/null @@ -1,121 +0,0 @@ -.lb-tabbar-content { - /* #ifndef APP-NVUE */ - display: flex; - /* #endif */ - flex-direction: row; - align-items: center; - justify-content: center; -} - -.lb-tabbar--fixed { - position: fixed; - left: 0; - right: 0; - bottom: 0; -} - -.lb-tabbar-border { - height: 1px; - position: absolute; - left: 0; - right: 0; - top: 0; - transform: scaleY(0.5); -} - -/* #ifndef APP-NVUE */ -lb-tabbar-item { - flex: 1; -} - -/* #endif */ - -.lb-tabbar-item { - flex: 1; - /* #ifndef APP-NVUE */ - display: flex; - /* #endif */ - flex-direction: column; - align-items: center; - justify-content: center; - position: relative; - // justify-content: flex-end; -} - -.lb-tabbar-item__text { - overflow: hidden; -} - -.lb-tabbar-item__text--active { - transition-property: color; - transition-duration: 0.3s; -} - -.lb-tabbar-item__icon { - position: relative; -} - -.lb-tabbar-icon { - position: relative; - /* #ifndef APP-NVUE */ - line-height: 1; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - /* #endif */ -} - -.lb-tabbar-item__icon--active { - transition-property: color; - transition-duration: 0.3s; -} - -.lb-my-active{ - transform: translateY(-16.5px) scale(2) !important; - color: yellow; -} -.lb-tabbar-item__icon--raisede { - background-color: #fff; - border-radius: 9999px; - position: relative; - /* #ifndef APP-NVUE */ - z-index: 1; - /* #endif */ -} - -.lb-tabbar-item__dot--style { - border-radius: 9999px; - position: absolute; - top: 0; - right: 0; -} - -.lb-tabbar-item__dot { - width: 8px; - height: 8px; -} - -.lb-tabbar-item__dot--nvue { - opacity: 0; - transition-property: opacity; - transition-duration: 0.1s; -} - -.lb-tabbar-item__dot--show { - opacity: 1; -} - -.lb-tabbar-item__dot--info { - height: 14px; - line-height: 14px; - /* #ifdef APP-NVUE */ - flex: 1; - /* #endif */ - margin-top: 5px; - font-size: 12px; - padding-left: 4px; - padding-right: 4px; - text-align: center; - color: #fff; - transform: translate(50%, -50%); -} \ No newline at end of file diff --git a/components/lf-tabbar/utils.js b/components/lf-tabbar/utils.js deleted file mode 100644 index faf27b6..0000000 --- a/components/lf-tabbar/utils.js +++ /dev/null @@ -1,10 +0,0 @@ -export function getPx (val) { - if (!val) return 0 - if (val.indexOf('rpx') > -1) { - val = +val.replace('rpx', '') - val = uni.upx2px(val) - } else { - val = +val.replace('px', '') - } - return val -} diff --git a/pages.json b/pages.json index 63f69b3..ae95b8e 100644 --- a/pages.json +++ b/pages.json @@ -3,6 +3,14 @@ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/index/index/index", + "style": { + "navigationBarTitleText": "首页", + "enablePullDownRefresh":true, + "navigationStyle": "custom" + } + }, { "path": "pages/user/my/setting", "style": { @@ -45,14 +53,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/index/index/index", - "style": { - "navigationBarTitleText": "首页", - "enablePullDownRefresh":true, - "navigationStyle": "custom" - } - }, { "path": "pages/index/microPages/microPages", "style": { diff --git a/pages/discover/discover.vue b/pages/discover/discover.vue index ea00fec..f58939e 100644 --- a/pages/discover/discover.vue +++ b/pages/discover/discover.vue @@ -39,11 +39,16 @@ +