From 5e69ab1da6b223d0ae0816db23adfa9a83330f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Mon, 20 Feb 2023 14:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + common/css/base.scss | 14 +- components/Cn-grid/Cn-grid.vue | 12 +- pages.json | 56 ++- pages/device/APF/about.vue | 2 +- pages/device/APF/detail.vue | 44 +-- pages/device/DVR/about.vue | 2 +- pages/device/DVR/detail.vue | 42 +-- pages/device/feedback.vue | 7 +- pages/device/new.vue | 16 +- pages/device/user.vue | 2 +- pages/gateway/new.vue | 12 +- pages/gateway/newDevice.vue | 79 ++-- pages/index/comp/indexZhuYongHu.vue | 88 ++++- pages/index/index.vue | 29 +- pages/index/message.vue | 2 +- pages/index/mine.vue | 18 +- pages/mine/about.vue | 2 +- pages/mine/agreement.vue | 2 +- pages/mine/company.vue | 2 +- pages/mine/feedback.vue | 12 +- pages/mine/policy.vue | 2 +- pages/mine/setup.vue | 3 +- pages/mine/setupMessage.vue | 2 +- pages/mine/subordinate.vue | 2 +- pages/mine/system.vue | 2 +- pages/mine/upgrade.vue | 2 +- pages/mine/user.vue | 2 +- pages/project/detail.vue | 126 +++++++ pages/{mine/project.vue => project/list.vue} | 26 +- pages/project/new.vue | 102 +++++ pages/user/basic.vue | 15 +- pages/user/changeName.vue | 4 +- pages/user/changePhone.vue | 2 +- pages/user/changePwd.vue | 2 +- pages/user/erweima.vue | 25 ++ pages/user/forget.vue | 2 +- pages/user/register.vue | 2 +- static/erweima.png | Bin 0 -> 4487 bytes static/project.png | Bin 0 -> 3531 bytes static/test2.pic.jpg | Bin 15540 -> 337524 bytes static/test3.pic.jpg | Bin 0 -> 15540 bytes .../uni-card/components/uni-card/uni-card.vue | 34 +- .../uni-file-picker/uni-file-picker.vue | 12 +- .../uni-forms-item/uni-forms-item.vue | 6 +- uni_modules/uni-nav-bar/changelog.md | 47 +++ .../components/uni-nav-bar/uni-nav-bar.vue | 357 ++++++++++++++++++ .../components/uni-nav-bar/uni-status-bar.vue | 27 ++ uni_modules/uni-nav-bar/package.json | 86 +++++ uni_modules/uni-nav-bar/readme.md | 15 + 50 files changed, 1136 insertions(+), 213 deletions(-) create mode 100644 pages/project/detail.vue rename pages/{mine/project.vue => project/list.vue} (75%) create mode 100644 pages/project/new.vue create mode 100644 pages/user/erweima.vue create mode 100644 static/erweima.png create mode 100644 static/project.png create mode 100644 static/test3.pic.jpg create mode 100644 uni_modules/uni-nav-bar/changelog.md create mode 100644 uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue create mode 100644 uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue create mode 100644 uni_modules/uni-nav-bar/package.json create mode 100644 uni_modules/uni-nav-bar/readme.md diff --git a/App.vue b/App.vue index dd11ebe..9f5c21c 100644 --- a/App.vue +++ b/App.vue @@ -30,4 +30,5 @@ export default { } + diff --git a/common/css/base.scss b/common/css/base.scss index 970b2d1..5b25fd6 100644 --- a/common/css/base.scss +++ b/common/css/base.scss @@ -84,7 +84,7 @@ page { margin-bottom: 20rpx; .grid-card-title { - padding: 20rpx 0; + padding: 0 0 20rpx; font-size: 28rpx; color: #111; font-weight: 700; @@ -133,7 +133,7 @@ page { .index { .header { - margin: 0 30rpx; + margin: 0 20rpx; background: $uni-theme-blue; border-radius: 12rpx; padding: 30rpx 10rpx 40rpx; @@ -162,21 +162,21 @@ page { position: sticky; top: 0; left: 0; - padding: 30rpx; + padding: 20rpx 20rpx 0; + padding-left: 0; display: flex; + flex-wrap: wrap; background: rgb(243, 244, 245); z-index: 2; + .nav-menu { padding: 10rpx 20rpx; margin-left: 20rpx; + margin-bottom: 20rpx; font-size: 28rpx; border-radius: 8rpx; background: #ebeaec; color: #666; - &:first-of-type { - margin-left: 0; - } - &-active { background: #dfe5f7; color: $uni-theme-blue; diff --git a/components/Cn-grid/Cn-grid.vue b/components/Cn-grid/Cn-grid.vue index 8bb1d0b..087e7d3 100644 --- a/components/Cn-grid/Cn-grid.vue +++ b/components/Cn-grid/Cn-grid.vue @@ -1,12 +1,12 @@ \ No newline at end of file diff --git a/pages/device/new.vue b/pages/device/new.vue index 36e8223..09cd8f2 100644 --- a/pages/device/new.vue +++ b/pages/device/new.vue @@ -3,16 +3,18 @@ + + + + diff --git a/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue new file mode 100644 index 0000000..75ce541 --- /dev/null +++ b/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/uni_modules/uni-nav-bar/package.json b/uni_modules/uni-nav-bar/package.json new file mode 100644 index 0000000..e4f5e29 --- /dev/null +++ b/uni_modules/uni-nav-bar/package.json @@ -0,0 +1,86 @@ +{ + "id": "uni-nav-bar", + "displayName": "uni-nav-bar 自定义导航栏", + "version": "1.3.9", + "description": "自定义导航栏组件,主要用于头部导航。", + "keywords": [ + "uni-ui", + "导航", + "导航栏", + "自定义导航栏" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} \ No newline at end of file diff --git a/uni_modules/uni-nav-bar/readme.md b/uni_modules/uni-nav-bar/readme.md new file mode 100644 index 0000000..3934b32 --- /dev/null +++ b/uni_modules/uni-nav-bar/readme.md @@ -0,0 +1,15 @@ + + +## NavBar 导航栏 +> **组件名:uni-nav-bar** +> 代码块: `uNavBar` + +导航栏组件,主要用于头部导航。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar) +#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839 + + + + +