From 946bb52c03e28edcc5a9051da0ce1eef6bc17230 Mon Sep 17 00:00:00 2001 From: JaylenTech <350683609@qq.com> Date: Tue, 8 Feb 2022 19:55:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E4=BB=B6=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4tn-button=E7=9A=84=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=EF=BC=8Ctn-avatar=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dtn-avatar-group=E6=9C=80=E5=BC=80=E5=A7=8B=E5=A4=B4?= =?UTF-8?q?=E5=83=8F=E8=BF=9B=E8=A1=8C=E4=BA=86=E5=81=8F=E7=A7=BB=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=9A=84bug=EF=BC=8Ctn-badge=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8Ctn-collap?= =?UTF-8?q?se-item=E4=BF=AE=E5=A4=8D=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=8C=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=A7=BB=E9=99=A4=E9=BB=98=E8=AE=A4=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E9=A2=9C=E8=89=B2=E5=92=8C=E5=AD=97=E4=BD=93=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=EF=BC=8Ctn-count-down=E4=BF=AE=E5=A4=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=8D=95=E4=BD=8D=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8Ctn-nav-bar=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E8=BF=9B=E8=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E5=9B=BE=E6=A0=87=EF=BC=8Ctn-step=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=82=B9=E5=87=BB=E6=AD=A5=E9=AA=A4=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=EF=BC=8Ctn-loading=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=BF=80=E6=B4=BB=E9=A2=9C=E8=89=B2=E5=87=BA?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8Ctn-tag=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=83=8C=E6=99=AF=E9=A2=9C=E8=89=B2=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=98=B4=E5=BD=B1=E5=A4=A7=E5=B0=8Fcss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- basicPage/avatar/avatar.vue | 339 +++---- basicPage/badge/badge.vue | 239 ++--- basicPage/border/border.vue | 210 ++--- basicPage/button/button.vue | 279 ++---- basicPage/color/color.vue | 93 +- basicPage/flex-layout/flex-layout.vue | 523 ++++------- basicPage/shadow/shadow.vue | 127 +-- basicPage/tag/tag.vue | 291 ++---- basicPage/test/test.vue | 245 ----- componentsPage/action-sheet/action-sheet.vue | 2 +- componentsPage/calendar/calendar.vue | 2 +- componentsPage/collapse/collapse.vue | 221 ++--- componentsPage/count-down/count-down.vue | 188 +--- componentsPage/count-scroll/count-scroll.vue | 118 +-- componentsPage/count-to/count-to.vue | 118 +-- componentsPage/fab/fab.vue | 196 ++++ componentsPage/form/form.vue | 2 +- componentsPage/image-upload/image-upload.vue | 2 +- .../index-list/avatar/index-list.vue | 70 ++ componentsPage/index-list/base/index-list.vue | 63 ++ componentsPage/index-list/index-list.vue | 73 +- componentsPage/list/list.vue | 565 ++++++----- componentsPage/loading/loading.vue | 129 ++- componentsPage/modal/modal.vue | 6 +- componentsPage/nav-bar/nav-bar.vue | 100 +- componentsPage/notice-bar/notice-bar.vue | 311 ++----- componentsPage/number-box/number-box.vue | 191 +--- componentsPage/picker/picker.vue | 2 +- componentsPage/popup/popup.vue | 2 +- componentsPage/progress/progress.vue | 231 ++--- componentsPage/rate/rate.vue | 203 ++-- componentsPage/read-more/read-more.vue | 149 +-- componentsPage/scroll-list/scroll-list.vue | 115 +-- componentsPage/select/select.vue | 2 +- componentsPage/slider/slider.vue | 198 +--- componentsPage/steps/steps.vue | 165 ++-- componentsPage/sticky/sticky.vue | 72 +- componentsPage/swipe-action/swipe-action.vue | 205 ++-- componentsPage/swiper/swiper.vue | 229 +---- componentsPage/switch/switch.vue | 167 ++-- componentsPage/tabs/tabs.vue | 255 +---- componentsPage/tips/tips.vue | 2 +- componentsPage/toast/toast.vue | 4 +- .../verification-code/verification-code.vue | 2 +- libs/components/demo-title.vue | 90 ++ libs/components/dynamic-demo-template.vue | 31 +- libs/components/multiple-options-demo.vue | 147 +++ libs/components/nav-index-button.vue | 2 +- mock/components_page.js | 5 + mock/template_page.js | 95 +- pages.json | 45 +- pages/template/template.vue | 66 +- pages/tuniao/tuniao.vue | 15 - templatePage/health/qrcode/qrcode.vue | 106 ++- templatePage/home/course/course.vue | 86 +- templatePage/home/screen/screen.vue | 102 +- templatePage/life/browser/browser.vue | 238 ----- templatePage/life/candle/candle.vue | 625 +++++++++++++ templatePage/life/pano/pano.vue | 23 + templatePage/life/plus/plus.vue | 51 +- templatePage/login/demo1/demo1.vue | 2 +- templatePage/login/demo2/demo2.vue | 4 +- templatePage/login/demo3/demo3.vue | 401 ++++++++ templatePage/login/demo4/demo4.vue | 420 +++++++++ templatePage/time/clock/clock.vue | 874 ++++++++++++++++++ .../tn-avatar-group/tn-avatar-group.vue | 36 +- tuniao-ui/components/tn-avatar/tn-avatar.vue | 4 +- tuniao-ui/components/tn-badge/tn-badge.vue | 15 +- tuniao-ui/components/tn-button/tn-button.vue | 18 +- .../tn-collapse-item/tn-collapse-item.vue | 4 + .../tn-column-notice/tn-column-notice.vue | 4 +- .../tn-count-down/tn-count-down.vue | 6 +- tuniao-ui/components/tn-fab/tn-fab.vue | 523 +++++++++++ .../components/tn-form-item/tn-form-item.vue | 2 +- .../tn-image-upload/tn-image-upload.vue | 81 +- .../components/tn-list-view/tn-list-view.vue | 19 +- tuniao-ui/components/tn-modal/tn-modal.vue | 39 +- .../components/tn-nav-bar/tn-nav-bar.vue | 31 +- tuniao-ui/components/tn-popup/tn-popup.vue | 11 +- .../tn-row-notice/tn-row-notice.vue | 4 +- tuniao-ui/components/tn-steps/tn-steps.vue | 44 +- tuniao-ui/components/tn-sticky/tn-sticky.vue | 3 + tuniao-ui/components/tn-switch/tn-switch.vue | 2 +- tuniao-ui/components/tn-tabbar/tn-tabbar.vue | 1 + .../tn-tabs-swiper/tn-tabs-swiper.vue | 2 +- tuniao-ui/components/tn-tabs/tn-tabs.vue | 2 +- tuniao-ui/components/tn-tag/tn-tag.vue | 11 +- tuniao-ui/libs/config/zIndex.js | 1 + tuniao-ui/libs/css/color.scss | 2 +- tuniao-ui/libs/css/main.scss | 9 + tuniao-ui/libs/css/style.h5.scss | 3 - tuniao-ui/libs/css/style.mp.scss | 3 - tuniao-ui/libs/function/colorUtils.js | 8 +- tuniao-ui/theme.scss | 1 + 94 files changed, 6296 insertions(+), 4727 deletions(-) delete mode 100644 basicPage/test/test.vue create mode 100644 componentsPage/fab/fab.vue create mode 100644 componentsPage/index-list/avatar/index-list.vue create mode 100644 componentsPage/index-list/base/index-list.vue create mode 100644 libs/components/demo-title.vue create mode 100644 libs/components/multiple-options-demo.vue delete mode 100644 templatePage/life/browser/browser.vue create mode 100644 templatePage/life/candle/candle.vue create mode 100644 templatePage/life/pano/pano.vue create mode 100644 templatePage/login/demo3/demo3.vue create mode 100644 templatePage/login/demo4/demo4.vue create mode 100644 templatePage/time/clock/clock.vue create mode 100644 tuniao-ui/components/tn-fab/tn-fab.vue diff --git a/basicPage/avatar/avatar.vue b/basicPage/avatar/avatar.vue index 7db362f..c1bdc66 100644 --- a/basicPage/avatar/avatar.vue +++ b/basicPage/avatar/avatar.vue @@ -1,6 +1,6 @@ diff --git a/basicPage/badge/badge.vue b/basicPage/badge/badge.vue index e1a2afe..b8f8e90 100644 --- a/basicPage/badge/badge.vue +++ b/basicPage/badge/badge.vue @@ -1,6 +1,6 @@ diff --git a/basicPage/border/border.vue b/basicPage/border/border.vue index 303a649..a3c9e82 100644 --- a/basicPage/border/border.vue +++ b/basicPage/border/border.vue @@ -1,6 +1,6 @@ diff --git a/basicPage/button/button.vue b/basicPage/button/button.vue index 01d67a9..02183f5 100644 --- a/basicPage/button/button.vue +++ b/basicPage/button/button.vue @@ -1,6 +1,6 @@ diff --git a/basicPage/color/color.vue b/basicPage/color/color.vue index f9fc54f..d0cc126 100644 --- a/basicPage/color/color.vue +++ b/basicPage/color/color.vue @@ -28,12 +28,10 @@ @@ -41,8 +39,18 @@ - - + + 图鸟基础配色 @@ -342,18 +350,23 @@ }, // 当前选中的颜色序号 currentColorIndex: 0, - colorSelectFlag: false, + // 内容容器滚动容器滚动的位置 + containerScrollTop: 0, + // 标记是否正在更新数据 + isUpdateColorInfo: false, + // 内容区域刷新标志 + containerRefreshFlag: false, // 当前选中颜色的色值信息 selectColorInfo: {} } }, onLoad() { - this.initScrollViewHeight() + }, onReady() { // 等待加载组件完成 setTimeout(() => { - this.getPickerColorItemInfo() + this.initScrollViewHeight() }, 10) }, methods: { @@ -362,11 +375,39 @@ // 获取当前屏幕的安全高度 uni.getSystemInfo({ success: (systemInfo) => { - this.scrollViewStyle.height = systemInfo.safeArea.height - this.vuex_custom_bar_height + systemInfo - .statusBarHeight + 'px' + this.scrollViewStyle.height = (systemInfo.safeArea.height - this.vuex_custom_bar_height + systemInfo.statusBarHeight) + 'px' + this.getPickerColorItemInfo() } }) }, + // 内容容器滚动事件 + containerScroll(e) { + // console.log(e); + // this.containerScrollTop = e.detail.scrollTop + }, + // 内容scroll-view下拉刷新事件 + containerRefresh(e) { + // console.log(e); + if (this.containerRefreshFlag) return + this.containerRefreshFlag = true + setTimeout(() => { + this.containerRefreshFlag = false + }, 10) + if (this.currentColorIndex - 1 < 0 || this.isUpdateColorInfo) return + this.pickerColorClick(this.currentColorIndex - 1) + + }, + // 内容scroll-view滚动到底部触发事件 + containerScrollLower(e) { + // console.log(e); + if (e.detail.direction === 'bottom') { + // console.log(e.detail.direction); + // 触发底部 + // if (this.currentColorIndex + 1 > this.colorList.length || this.isUpdateColorInfo) return + // console.log('update'); + // this.pickerColorClick(this.currentColorIndex + 1) + } + }, // 获取色值列表的位置信息 getPickerColorItemInfo() { // 获取picker容器的信息 @@ -399,7 +440,7 @@ }, // 色值选择 pickerColorClick(index) { - if (this.colorSelectFlag === false || index === this.currentColorIndex) { + if (index === this.currentColorIndex) { return } this.currentColorIndex = index @@ -408,23 +449,27 @@ }, // 设置选中圆环信息 updatePickerColorSelectItem() { - // 先设置已选中状态为false，然后再设置选中圆环的位置信息，等待动画执行完毕后在设置已选中状态为true - this.colorSelectFlag = false - const colorInfos = this.pickerColorInfos[this.currentColorIndex] this.colorSelectItemStyle.top = colorInfos.x - uni.upx2px(40) + 'px' this.colorSelectItemStyle.left = colorInfos.y - uni.upx2px(40) + 'px' - - setTimeout(() => { - this.colorSelectFlag = true - }, 10) }, // 设置选中颜色的信息 updateSelectColorInfo() { if (this.currentColorIndex === 0) { return } - this.selectColorInfo = this.colorList[this.currentColorIndex - 1] + this.isUpdateColorInfo = true + this.$t.messageUtils.loading('加载中...') + // this.containerScrollTop = Math.random() + setTimeout(() => { + // this.containerScrollTop = 0 + this.selectColorInfo = this.colorList[this.currentColorIndex - 1] + this.$t.messageUtils.closeLoading() + this.isUpdateColorInfo = false + }, 10) + // setTimeout(() => { + + // }, 1000) } } } @@ -580,7 +625,8 @@ border-radius: 50%; position: absolute; top: 0; - transform: rotate(225deg); + // transform: rotate(225deg); + transform: rotate(45deg); &.right-circle { right: 0; @@ -596,9 +642,9 @@ // transition: transform 0.3s cubic-bezier(0,.13,0,1.43); } - &--active { - transform: rotate(45deg); - } + // &--active { + // transform: rotate(45deg); + // } } } } @@ -619,6 +665,8 @@ padding: 30rpx; overflow: hidden; transform-origin: 0 50%; + // opacity: 0; + // transition: opacity 0.2s ease; // transform: scaleX(0) rotate(-90deg); // transform: rotateY(-90deg); // transform: scaleX(0); @@ -628,6 +676,7 @@ // transform: scaleX(1) rotate(0deg); // transform: rotateY(0deg); // transform: scaleX(1); + opacity: 1; } &--title { diff --git a/basicPage/flex-layout/flex-layout.vue b/basicPage/flex-layout/flex-layout.vue index 5bbc5a2..3e04056 100644 --- a/basicPage/flex-layout/flex-layout.vue +++ b/basicPage/flex-layout/flex-layout.vue @@ -1,22 +1,14 @@ diff --git a/basicPage/tag/tag.vue b/basicPage/tag/tag.vue index cc431cf..2cb0f44 100644 --- a/basicPage/tag/tag.vue +++ b/basicPage/tag/tag.vue @@ -1,6 +1,6 @@ - - diff --git a/basicPage/test/test.vue b/basicPage/test/test.vue deleted file mode 100644 index 418dcda..0000000 --- a/basicPage/test/test.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - diff --git a/componentsPage/action-sheet/action-sheet.vue b/componentsPage/action-sheet/action-sheet.vue index 94ba0f7..caf0b4e 100644 --- a/componentsPage/action-sheet/action-sheet.vue +++ b/componentsPage/action-sheet/action-sheet.vue @@ -9,7 +9,7 @@ - 弹出ActionSheet + 弹出ActionSheet diff --git a/componentsPage/calendar/calendar.vue b/componentsPage/calendar/calendar.vue index ae38add..f61e250 100644 --- a/componentsPage/calendar/calendar.vue +++ b/componentsPage/calendar/calendar.vue @@ -10,7 +10,7 @@ - 弹出日历 + 弹出日历 {{ result }} diff --git a/componentsPage/collapse/collapse.vue b/componentsPage/collapse/collapse.vue index 7801b13..2bf48d1 100644 --- a/componentsPage/collapse/collapse.vue +++ b/componentsPage/collapse/collapse.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/count-down/count-down.vue b/componentsPage/count-down/count-down.vue index d0845a6..079c9d4 100644 --- a/componentsPage/count-down/count-down.vue +++ b/componentsPage/count-down/count-down.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/count-scroll/count-scroll.vue b/componentsPage/count-scroll/count-scroll.vue index e10cf8c..8a3ca84 100644 --- a/componentsPage/count-scroll/count-scroll.vue +++ b/componentsPage/count-scroll/count-scroll.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/count-to/count-to.vue b/componentsPage/count-to/count-to.vue index 3fe03fb..dbfb106 100644 --- a/componentsPage/count-to/count-to.vue +++ b/componentsPage/count-to/count-to.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/fab/fab.vue b/componentsPage/fab/fab.vue new file mode 100644 index 0000000..81ae498 --- /dev/null +++ b/componentsPage/fab/fab.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/componentsPage/form/form.vue b/componentsPage/form/form.vue index 3ae1d16..619d911 100644 --- a/componentsPage/form/form.vue +++ b/componentsPage/form/form.vue @@ -58,7 +58,7 @@ 勾选同意当前协议 - 提交 + 提交 diff --git a/componentsPage/image-upload/image-upload.vue b/componentsPage/image-upload/image-upload.vue index 42e8986..f155d08 100644 --- a/componentsPage/image-upload/image-upload.vue +++ b/componentsPage/image-upload/image-upload.vue @@ -57,7 +57,7 @@ - 上传 + 上传 清空列表 diff --git a/componentsPage/index-list/avatar/index-list.vue b/componentsPage/index-list/avatar/index-list.vue new file mode 100644 index 0000000..994ef44 --- /dev/null +++ b/componentsPage/index-list/avatar/index-list.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/componentsPage/index-list/base/index-list.vue b/componentsPage/index-list/base/index-list.vue new file mode 100644 index 0000000..dfde1f4 --- /dev/null +++ b/componentsPage/index-list/base/index-list.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/componentsPage/index-list/index-list.vue b/componentsPage/index-list/index-list.vue index 9fa4f94..099c5f0 100644 --- a/componentsPage/index-list/index-list.vue +++ b/componentsPage/index-list/index-list.vue @@ -7,15 +7,9 @@ - - - - - - {{ data_item.name }} - - - + @@ -24,68 +18,23 @@ diff --git a/componentsPage/list/list.vue b/componentsPage/list/list.vue index 8f3ca99..66a4cab 100644 --- a/componentsPage/list/list.vue +++ b/componentsPage/list/list.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/loading/loading.vue b/componentsPage/loading/loading.vue index a24ce86..80bea5a 100644 --- a/componentsPage/loading/loading.vue +++ b/componentsPage/loading/loading.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/modal/modal.vue b/componentsPage/modal/modal.vue index f2aaa52..7338178 100644 --- a/componentsPage/modal/modal.vue +++ b/componentsPage/modal/modal.vue @@ -9,7 +9,7 @@ - 弹出模态框 + 弹出模态框 @@ -41,7 +41,7 @@ - 获取验证码 + 获取验证码 @@ -77,7 +77,7 @@ }, { text: '确定', - backgroundColor: 'tn-bg-red', + backgroundColor: 'tn-bg-indigo', fontColor: '#FFFFFF' } ], diff --git a/componentsPage/nav-bar/nav-bar.vue b/componentsPage/nav-bar/nav-bar.vue index 4dc8809..878f661 100644 --- a/componentsPage/nav-bar/nav-bar.vue +++ b/componentsPage/nav-bar/nav-bar.vue @@ -3,34 +3,58 @@ - navBar导航栏 + navBar导航栏 + + + + + + + + + + + + + + + + + + + + - - - 图鸟科技 - - - - - - - - - - - - - - - - - - - - + @@ -48,9 +72,11 @@ return { searchValue: '', mode: 'normal', - height: 46, + height: 0, backgroundColor: '#FFFFFF', + fontColor: '', alpha: false, + bottomShadow: true, tips: ['无需依赖额外的样式文件','使用tn-toast组件'], sectionList: [ @@ -59,9 +85,8 @@ section: [ { title: '高度', - optional: ['默认','46','80'], - methods: 'heightChange', - current: 1 + optional: ['默认','38','80'], + methods: 'heightChange' }, { title: '样式', @@ -70,8 +95,13 @@ }, { title: '背景颜色', - optional: ['默认','#01BEFF','透明'], + optional: ['默认','#01BEFF','tn-bg-grey','tn-main-gradient-indigo','透明'], methods: 'backgroundColorChange' + }, + { + title: '底部阴影', + optional: ['默认','隐藏'], + methods: 'bottomShadowChange' } ] } @@ -105,17 +135,27 @@ switch(event.index) { case 0: this.backgroundColor = '#FFFFFF' + this.fontColor = '' this.alpha = false break case 1: + case 2: + case 3: + this.fontColor = '#FFFFFF' this.backgroundColor = event.name this.alpha = false break - case 2: + case 4: + this.backgroundColor = '' + this.fontColor = '' this.alpha = true break } }, + // 切换底部阴影 + bottomShadowChange(event) { + this.bottomShadow = event.index === 0 ? true : false + } }, } diff --git a/componentsPage/notice-bar/notice-bar.vue b/componentsPage/notice-bar/notice-bar.vue index 9389e22..580a666 100644 --- a/componentsPage/notice-bar/notice-bar.vue +++ b/componentsPage/notice-bar/notice-bar.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/number-box/number-box.vue b/componentsPage/number-box/number-box.vue index b098e9d..f65d6ae 100644 --- a/componentsPage/number-box/number-box.vue +++ b/componentsPage/number-box/number-box.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/picker/picker.vue b/componentsPage/picker/picker.vue index 8c50188..1a36401 100644 --- a/componentsPage/picker/picker.vue +++ b/componentsPage/picker/picker.vue @@ -9,7 +9,7 @@ - 弹出Picker + 弹出Picker {{ result }} diff --git a/componentsPage/popup/popup.vue b/componentsPage/popup/popup.vue index 5e21202..04cd8ee 100644 --- a/componentsPage/popup/popup.vue +++ b/componentsPage/popup/popup.vue @@ -9,7 +9,7 @@ - 弹出弹框 + 弹出弹框 diff --git a/componentsPage/progress/progress.vue b/componentsPage/progress/progress.vue index 278f7fe..1622a74 100644 --- a/componentsPage/progress/progress.vue +++ b/componentsPage/progress/progress.vue @@ -1,38 +1,68 @@ diff --git a/componentsPage/read-more/read-more.vue b/componentsPage/read-more/read-more.vue index 15318de..c1c1f2c 100644 --- a/componentsPage/read-more/read-more.vue +++ b/componentsPage/read-more/read-more.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/scroll-list/scroll-list.vue b/componentsPage/scroll-list/scroll-list.vue index c246e17..ace9829 100644 --- a/componentsPage/scroll-list/scroll-list.vue +++ b/componentsPage/scroll-list/scroll-list.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/sticky/sticky.vue b/componentsPage/sticky/sticky.vue index 0201776..d4c1fed 100644 --- a/componentsPage/sticky/sticky.vue +++ b/componentsPage/sticky/sticky.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/swipe-action/swipe-action.vue b/componentsPage/swipe-action/swipe-action.vue index 6c192a4..f31db6d 100644 --- a/componentsPage/swipe-action/swipe-action.vue +++ b/componentsPage/swipe-action/swipe-action.vue @@ -1,126 +1,134 @@ diff --git a/componentsPage/swiper/swiper.vue b/componentsPage/swiper/swiper.vue index d0019d1..c77e782 100644 --- a/componentsPage/swiper/swiper.vue +++ b/componentsPage/swiper/swiper.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/switch/switch.vue b/componentsPage/switch/switch.vue index b86b55a..cfdfd26 100644 --- a/componentsPage/switch/switch.vue +++ b/componentsPage/switch/switch.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/tabs/tabs.vue b/componentsPage/tabs/tabs.vue index 15f43de..8181a51 100644 --- a/componentsPage/tabs/tabs.vue +++ b/componentsPage/tabs/tabs.vue @@ -1,6 +1,6 @@ diff --git a/componentsPage/tips/tips.vue b/componentsPage/tips/tips.vue index b91a815..622897f 100644 --- a/componentsPage/tips/tips.vue +++ b/componentsPage/tips/tips.vue @@ -9,7 +9,7 @@ - 弹出Tips + 弹出Tips diff --git a/componentsPage/toast/toast.vue b/componentsPage/toast/toast.vue index e60956c..c8cabb5 100644 --- a/componentsPage/toast/toast.vue +++ b/componentsPage/toast/toast.vue @@ -9,7 +9,7 @@ - 弹出Toast + 弹出Toast @@ -102,7 +102,7 @@ break case 2: this.icon = '' - this.image = '/static/logo1.png' + this.image = '/static/favicon.ico' break } this.openToast() diff --git a/componentsPage/verification-code/verification-code.vue b/componentsPage/verification-code/verification-code.vue index 9a23681..e48c42c 100644 --- a/componentsPage/verification-code/verification-code.vue +++ b/componentsPage/verification-code/verification-code.vue @@ -15,7 +15,7 @@ - {{ tips }} + {{ tips }} diff --git a/libs/components/demo-title.vue b/libs/components/demo-title.vue new file mode 100644 index 0000000..d787426 --- /dev/null +++ b/libs/components/demo-title.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/libs/components/dynamic-demo-template.vue b/libs/components/dynamic-demo-template.vue index d3e26b3..d6ca993 100644 --- a/libs/components/dynamic-demo-template.vue +++ b/libs/components/dynamic-demo-template.vue @@ -2,7 +2,7 @@ - + @@ -91,6 +91,11 @@ fullWindowsScroll: { type: Boolean, default: false + }, + // 没有演示内容 + noDemo: { + type: Boolean, + default: false } }, computed: { @@ -217,15 +222,19 @@ } }).exec() } else { - uni.createSelectorQuery().in(this).select('.demo-container').boundingClientRect(data => { - if (data.bottom >= systemInfo.safeArea.height) { - this.sectionScrollFlag = false - } else { - this.sectionScrollFlag = true - const containerBaseHeight = systemInfo.safeArea.height - data.bottom - this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px' - } - }).exec() + if (!this.noDemo) { + uni.createSelectorQuery().in(this).select('.demo-container').boundingClientRect(data => { + if (data.bottom >= systemInfo.safeArea.height) { + this.sectionScrollFlag = false + } else { + this.sectionScrollFlag = true + const containerBaseHeight = systemInfo.safeArea.height - data.bottom + this.sectionScrollViewStyle.height = (containerBaseHeight - navBarHeight) + systemInfo.statusBarHeight - uni.upx2px(75) + 'px' + } + }).exec() + } else { + this.sectionScrollFlag = false + } } } @@ -544,7 +553,7 @@ display: block; &:last-child { - padding-bottom: calc(40rpx + env(safe-area-inset-bottom)); + padding-bottom: calc(70rpx + env(safe-area-inset-bottom)); } } diff --git a/libs/components/multiple-options-demo.vue b/libs/components/multiple-options-demo.vue new file mode 100644 index 0000000..f3644b6 --- /dev/null +++ b/libs/components/multiple-options-demo.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/libs/components/nav-index-button.vue b/libs/components/nav-index-button.vue index 2af5a14..1a7fba6 100644 --- a/libs/components/nav-index-button.vue +++ b/libs/components/nav-index-button.vue @@ -44,7 +44,7 @@ if (pages && pages.length > 0) { const indexPath = this.indexPath || '/pages/index/index' const firstPage = pages[0] - if (!firstPage.route || firstPage.route != indexPath.substring(1, indexPath.length)) { + if (pages.length == 1 && (!firstPage.route || firstPage.route != indexPath.substring(1, indexPath.length))) { uni.reLaunch({ url: indexPath }) diff --git a/mock/components_page.js b/mock/components_page.js index ffd2965..52ba0f8 100644 --- a/mock/components_page.js +++ b/mock/components_page.js @@ -76,6 +76,11 @@ export default { icon: 'star', title: 'swipeAction滑动菜单', url: '/componentsPage/swipe-action/swipe-action' + }, + { + icon: 'star', + title: 'fab悬浮按钮', + url: '/componentsPage/fab/fab' } ] }, diff --git a/mock/template_page.js b/mock/template_page.js index 194913f..3e258d8 100644 --- a/mock/template_page.js +++ b/mock/template_page.js @@ -8,14 +8,28 @@ export default { backgroundColor: 'tn-cool-bg-color-1', list: [ { - icon: 'order', + icon: 'send', title: '火箭登录', + author: '可我会像', url: '/templatePage/login/demo1/demo1' }, { - icon: 'order', + icon: 'send', title: '粒子登录', + author: '可我会像', url: '/templatePage/login/demo2/demo2' + }, + { + icon: 'send', + title: '背景登录', + author: '可我会像', + url: '/templatePage/login/demo3/demo3' + }, + { + icon: 'send', + title: '简约登录', + author: '可我会像', + url: '/templatePage/login/demo4/demo4' } ] }, @@ -24,56 +38,65 @@ export default { backgroundColor: 'tn-cool-bg-color-1', list: [ { - icon: 'order', + icon: 'send', title: '音乐首页', + author: '可我会像', url: '/templatePage/home/music/music' }, { - icon: 'order', + icon: 'send', title: '课程首页', + author: '可我会像', url: '/templatePage/home/course/course' }, { - icon: 'order', + icon: 'send', title: '设计首页', + author: '可我会像', url: '/templatePage/home/design/design' }, { - icon: 'order', + icon: 'send', title: '招聘首页', + author: '可我会像', url: '/templatePage/home/job/job' }, { - icon: 'order', + icon: 'send', title: '投屏首页', + author: '可我会像', url: '/templatePage/home/screen/screen' }, { - icon: 'order', + icon: 'send', title: '壁纸首页', + author: '可我会像', url: '/templatePage/home/wallpaper/wallpaper' }, ] }, { - title: '其他页面', + title: '骚气页面', backgroundColor: 'tn-cool-bg-color-1', list: [ { - icon: 'order', + icon: 'send', title: '健康码', + author: '可我会像', url: '/templatePage/health/qrcode/qrcode' }, { - icon: 'order', + icon: 'send', title: '全屏轮播', + author: '可我会像', url: '/templatePage/life/fullpage/fullpage' }, { - icon: 'order', - title: '浏览器', - url: '/templatePage/life/browser/browser' + icon: 'like-break', + title: '时钟', + author: '可我会像', + url: '/templatePage/time/clock/clock' } ] }, @@ -82,26 +105,60 @@ export default { backgroundColor: 'tn-cool-bg-color-1', list: [ { - icon: 'order', + icon: 'send', title: '加载动画', + author: '可我会像', url: '/templatePage/animate/loading/loading' }, { - icon: 'order', + icon: 'send', title: '随机粒子', + author: 'Jaylen', url: '/templatePage/animate/particle/particle' }, { - icon: 'order', + icon: 'send', title: '相册图集', + author: '你的小可爱', url: '/templatePage/animate/photo/photo' }, { - icon: 'order', + icon: 'send', title: '镂空效果', + author: '你的小可爱', url: '/templatePage/animate/hollow/hollow' } ] - } + }, + { + title: '群友力献', + backgroundColor: 'tn-cool-bg-color-1', + list: [ + { + icon: 'send', + title: '3D全景', + author: '可我会像 & 芊云全景', + url: '/templatePage/life/pano/pano' + }, + { + icon: 'like-break', + title: '隔壁的小生', + author: '隔壁的小生', + url: '/templatePage/life/candle/candle' + }, + { + icon: 'like-break', + title: '阿凡提·污克西西', + author: '阿凡提·污克西西', + url: '/templatePage/life/candle/candle' + }, + { + icon: 'like-break', + title: '期待你的加入', + author: '期待你的加入', + url: '/templatePage/life/candle/candle' + } + ] + } ] } \ No newline at end of file diff --git a/pages.json b/pages.json index af19c93..86765eb 100644 --- a/pages.json +++ b/pages.json @@ -14,14 +14,6 @@ "subPackages": [{ "root": "basicPage", "pages": [ - { - "path": "test/test", - "style": { - "navigationStyle":"default", - "navigationBarTitleText": "测试页面", - "enablePullDownRefresh": false - } - }, { "path": "flex-layout/flex-layout", "style": { @@ -298,6 +290,13 @@ "enablePullDownRefresh": false // "pageOrientation": "landscape" } + }, { + "path": "fab/fab", + "style": { + "navigationBarTitleText": "fab悬浮按钮", + "enablePullDownRefresh": false + // "pageOrientation": "landscape" + } } ] },{ @@ -315,7 +314,19 @@ "navigationBarTitleText": "粒子登录", "enablePullDownRefresh": false } - }, { + },{ + "path": "login/demo3/demo3", + "style": { + "navigationBarTitleText": "背景登录", + "enablePullDownRefresh": false + } + },{ + "path": "login/demo4/demo4", + "style": { + "navigationBarTitleText": "简约登录", + "enablePullDownRefresh": false + } + },{ "path": "health/qrcode/qrcode", "style": { "navigationBarTitleText": "健康码", @@ -363,6 +374,12 @@ "navigationBarTitleText": "全屏轮播", "enablePullDownRefresh": false } + },{ + "path": "life/pano/pano", + "style": { + "navigationBarTitleText": "3D全景", + "enablePullDownRefresh": false + } },{ "path": "life/plus/plus", "style": { @@ -370,9 +387,15 @@ "enablePullDownRefresh": false } },{ - "path": "life/browser/browser", + "path": "life/candle/candle", "style": { - "navigationBarTitleText": "浏览器", + "navigationBarTitleText": "敬请期待", + "enablePullDownRefresh": false + } + },{ + "path": "time/clock/clock", + "style": { + "navigationBarTitleText": "时钟", "enablePullDownRefresh": false } },{ diff --git a/pages/template/template.vue b/pages/template/template.vue index 5072026..8228a51 100644 --- a/pages/template/template.vue +++ b/pages/template/template.vue @@ -1,5 +1,6 @@ @@ -109,19 +118,40 @@ padding: 0rpx 12rpx 0rpx; justify-content: space-between; + + /* 列表元素 start */ .nav-list-item { padding: 50rpx 30rpx 36rpx 30rpx; border-radius: 12rpx; width: 100%; - margin: 0 18rpx 40rpx; + margin: 0 18rpx 90rpx; background-size: cover; background-position: center; position: relative; z-index: 99; - display: flex; - align-items: center; - justify-content: space-between; + // display: flex; + // align-items: center; + // justify-content: space-between; + + + .author-title{ + position: absolute; + z-index: -1; + background-color: #FFFFFF; + width: 100%; + height: 100%; + left: 0; + bottom: -100%; + border-radius: 10upx; + opacity: 1; + transform: scale(1); + + .title { + color: #000000; + text-align: left; + } + } /* 元素标题 start */ .nav-link { @@ -160,6 +190,22 @@ border-radius: 5000rpx; } /* 元素图标 end */ + + /* 作者信息 start*/ + .author { + // background-color: red; + box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.12); + border-radius: 0 0 15rpx 15rpx; + position: absolute; + width: 85%; + line-height: 50rpx; + left: 50%; + bottom: -50rpx; + transform: translateX(-50%); + z-index: -1; + text-align: center; + } + /* 作者信息 end*/ } /* 列表元素 end */ } diff --git a/pages/tuniao/tuniao.vue b/pages/tuniao/tuniao.vue index aa5901e..d476889 100644 --- a/pages/tuniao/tuniao.vue +++ b/pages/tuniao/tuniao.vue @@ -57,15 +57,6 @@ - - - - - - 图鸟UI - 会员版 - - @@ -160,12 +151,6 @@ appId: 'wxa698b1eee960632f' }) }, - // 跳转到图鸟UI会员版 - navTuniaoUI() { - uni.navigateToMiniProgram({ - appId: 'wxf3d81a452b88ff4b' - }) - }, // 跳转到会员协议 navPlus() { diff --git a/templatePage/health/qrcode/qrcode.vue b/templatePage/health/qrcode/qrcode.vue index 2c77876..89fc8bc 100644 --- a/templatePage/health/qrcode/qrcode.vue +++ b/templatePage/health/qrcode/qrcode.vue @@ -131,7 +131,7 @@ - + @@ -144,7 +144,7 @@ @@ -177,6 +177,36 @@ + + + + + + + + + + + + + 首页 + + + + + + + + 粤码通城 + + + + + + + + 我的 + @@ -516,4 +546,76 @@ } } /* 移动背景部分 end*/ + + /* 底部tabbar start*/ + .footerfixed{ + position: fixed; + width: 100%; + bottom: 0; + z-index: 999; + background-color: #FFFFFF; + box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07); + } + + .tabbar { + display: flex; + align-items: center; + min-height: 110rpx; + justify-content: space-between; + padding: 0; + height: calc(110rpx + env(safe-area-inset-bottom) / 2); + padding-bottom: calc(env(safe-area-inset-bottom) / 2); + } + + .tabbar .action { + font-size: 22rpx; + position: relative; + flex: 1; + text-align: center; + padding: 0; + display: block; + height: auto; + line-height: 1; + margin: 0; + overflow: initial; + } + + .tabbar .action .bar-icon { + width: 100rpx; + position: relative; + display: block; + height: auto; + margin: 0 auto 10rpx; + text-align: center; + font-size: 42rpx; + // line-height: 50rpx; + } + + .tabbar .action .bar-icon image { + width: 50rpx; + height: 50rpx; + display: inline-block; + } + + .tabbar .action .bar-circle { + position: relative; + display: block; + margin: -60rpx auto 20rpx; + text-align: center; + font-size: 52rpx; + line-height: 90rpx; + background-color: #01BEFF; + width: 90rpx !important; + height: 90rpx !important; + overflow: hidden; + border-radius: 50%; + box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(1, 190, 255, 0.5); + } + + .tabbar .action .bar-circle image { + width: 60rpx; + height: 60rpx; + display: inline-block; + margin: 15rpx auto 15rpx; + } diff --git a/templatePage/home/course/course.vue b/templatePage/home/course/course.vue index 0c842c8..65c8630 100644 --- a/templatePage/home/course/course.vue +++ b/templatePage/home/course/course.vue @@ -129,7 +129,7 @@ - + @@ -160,6 +160,41 @@ + + + + + + + + 课程 + + + + + + + 精选 + + + + + + + 播放 + + + + + + + 我的 + + @@ -644,4 +679,53 @@ border-radius: 20rpx 20rpx 0 0; } /* 文章内容 end*/ + + /* 底部tabbar start*/ + .footerfixed{ + position: fixed; + width: 100%; + bottom: 0; + z-index: 999; + background-color: #FFFFFF; + box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07); + } + + .tabbar { + display: flex; + align-items: center; + min-height: 110rpx; + justify-content: space-between; + padding: 0; + height: calc(110rpx + env(safe-area-inset-bottom) / 2); + padding-bottom: calc(env(safe-area-inset-bottom) / 2); + } + + .tabbar .action { + font-size: 22rpx; + position: relative; + flex: 1; + text-align: center; + padding: 0; + display: block; + height: auto; + line-height: 1; + margin: 0; + overflow: initial; + } + + .tabbar .action .bar-icon { + width: 100rpx; + position: relative; + display: block; + height: auto; + margin: 0 auto 10rpx; + text-align: center; + font-size: 42rpx; + } + + .tabbar .action .bar-icon image { + width: 50rpx; + height: 50rpx; + display: inline-block; + } diff --git a/templatePage/home/screen/screen.vue b/templatePage/home/screen/screen.vue index 380efb6..00db99d 100644 --- a/templatePage/home/screen/screen.vue +++ b/templatePage/home/screen/screen.vue @@ -134,7 +134,7 @@ - + @@ -182,6 +182,34 @@ + + + + + + + + 首页 + + + + + + + + + + + + + + + 我的 + + + @@ -601,4 +629,76 @@ } } /* 移动背景部分 end*/ + + /* 底部tabbar start*/ + .footerfixed{ + position: fixed; + width: 100%; + bottom: 0; + z-index: 999; + background-color: #FFFFFF; + box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07); + } + + .tabbar { + display: flex; + align-items: center; + min-height: 110rpx; + justify-content: space-between; + padding: 0; + height: calc(110rpx + env(safe-area-inset-bottom) / 2); + padding-bottom: calc(env(safe-area-inset-bottom) / 2); + } + + .tabbar .action { + font-size: 22rpx; + position: relative; + flex: 1; + text-align: center; + padding: 0; + display: block; + height: auto; + line-height: 1; + margin: 0; + overflow: initial; + } + + .tabbar .action .bar-icon { + width: 100rpx; + position: relative; + display: block; + height: auto; + margin: 0 auto 10rpx; + text-align: center; + font-size: 42rpx; + // line-height: 50rpx; + } + + .tabbar .action .bar-icon image { + width: 50rpx; + height: 50rpx; + display: inline-block; + } + + .tabbar .action .bar-circle { + position: relative; + display: block; + margin: -30rpx auto 20rpx; + text-align: center; + font-size: 52rpx; + line-height: 90rpx; + background-color: #FFCA28; + width: 90rpx !important; + height: 90rpx !important; + overflow: hidden; + border-radius: 50%; + box-shadow: 0rpx 0rpx 20rpx 0rpx rgba(255, 202, 40, 0.5); + } + + .tabbar .action .bar-circle image { + width: 60rpx; + height: 60rpx; + display: inline-block; + margin: 15rpx auto 15rpx; + } diff --git a/templatePage/life/browser/browser.vue b/templatePage/life/browser/browser.vue deleted file mode 100644 index 67badfe..0000000 --- a/templatePage/life/browser/browser.vue +++ /dev/null @@ -1,238 +0,0 @@ - - - - - diff --git a/templatePage/life/candle/candle.vue b/templatePage/life/candle/candle.vue new file mode 100644 index 0000000..d6b0ddb --- /dev/null +++ b/templatePage/life/candle/candle.vue @@ -0,0 +1,625 @@ + + + + + diff --git a/templatePage/life/pano/pano.vue b/templatePage/life/pano/pano.vue new file mode 100644 index 0000000..18b68cd --- /dev/null +++ b/templatePage/life/pano/pano.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/templatePage/life/plus/plus.vue b/templatePage/life/plus/plus.vue index ef79526..eb5d915 100644 --- a/templatePage/life/plus/plus.vue +++ b/templatePage/life/plus/plus.vue @@ -18,10 +18,14 @@ 图鸟UI Plus会员，初步定价 - 699￥ / + 399￥ + 699￥ + + ———— + / 终身 - （大约等于两个前端页面价格） + （大约等于1个前端页面价格） @@ -53,7 +57,7 @@ 也希望大家能喜欢这个项目 - （不喜勿喷，东东还在努力成长） + （不喜勿喷，北北还在努力成长） @@ -70,32 +74,34 @@ 项目正式开始于2021年10月，于12月30上线 （期间断断续续的在接单恰饭） + 灵感来源于我的上一个原创项目 （项目初衷是拓展业务，寻求商务合作） + - 感恩你的支持 + 会员特权 + ①会员尊享更多酷炫模板，模板持续更新 + ②优先响应会员页面模板需求，icon需求 + ③会员版本更新，在会员群进行代码发送 + ④有什么好的建议，可以提出来，多沟通 + + + + 关于作者 + 蔡北北，95年，广州 + 浮夸UI设计 + 菜鸡软件开发 + 祭天产品经理 + 背锅项目经理 + 努力往CTO去发展 + + + + 北北感恩你的支持 - - 待补充.... - - - 待补充.... - - - 待补充.... - - - 待补充.... - - - 待补充.... - - - 待补充.... - @@ -162,5 +168,4 @@ align-self: flex-start; } - diff --git a/templatePage/login/demo1/demo1.vue b/templatePage/login/demo1/demo1.vue index 0949d43..d904e17 100644 --- a/templatePage/login/demo1/demo1.vue +++ b/templatePage/login/demo1/demo1.vue @@ -76,7 +76,7 @@ diff --git a/templatePage/login/demo2/demo2.vue b/templatePage/login/demo2/demo2.vue index 746878a..3aed31b 100644 --- a/templatePage/login/demo2/demo2.vue +++ b/templatePage/login/demo2/demo2.vue @@ -79,7 +79,7 @@ @@ -131,7 +131,7 @@ diff --git a/templatePage/login/demo3/demo3.vue b/templatePage/login/demo3/demo3.vue new file mode 100644 index 0000000..91e798a --- /dev/null +++ b/templatePage/login/demo3/demo3.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/templatePage/login/demo4/demo4.vue b/templatePage/login/demo4/demo4.vue new file mode 100644 index 0000000..8feddba --- /dev/null +++ b/templatePage/login/demo4/demo4.vue @@ -0,0 +1,420 @@ + + + + + diff --git a/templatePage/time/clock/clock.vue b/templatePage/time/clock/clock.vue new file mode 100644 index 0000000..dd31b79 --- /dev/null +++ b/templatePage/time/clock/clock.vue @@ -0,0 +1,874 @@ + + + + + diff --git a/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue b/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue index 848c1b2..4a7f11c 100644 --- a/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue +++ b/tuniao-ui/components/tn-avatar-group/tn-avatar-group.vue @@ -1,6 +1,6 @@ + + + + diff --git a/tuniao-ui/components/tn-form-item/tn-form-item.vue b/tuniao-ui/components/tn-form-item/tn-form-item.vue index c5a58ef..9e9725c 100644 --- a/tuniao-ui/components/tn-form-item/tn-form-item.vue +++ b/tuniao-ui/components/tn-form-item/tn-form-item.vue @@ -332,7 +332,7 @@ validation(trigger, callback = ()=>{}) { // 校验之前先获取需要校验的值 this.fieldValue = this.parent.model[this.prop] - // blur和唱歌是否有当前方式的校验规则 + // blur和change是否有当前方式的校验规则 let rules = this.getFilterRule(trigger) // 判断是否有验证规则，如果没有规则，也调用回调方法，否则父组件tn-form会因为 // 对count变量的统计错误而无法进入上一层的回调 diff --git a/tuniao-ui/components/tn-image-upload/tn-image-upload.vue b/tuniao-ui/components/tn-image-upload/tn-image-upload.vue index 50fa434..74dbfd6 100644 --- a/tuniao-ui/components/tn-image-upload/tn-image-upload.vue +++ b/tuniao-ui/components/tn-image-upload/tn-image-upload.vue @@ -1,51 +1,52 @@