From 89f0e79cebbea7039b66a31f82ede4fea64894b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= Date: Thu, 23 Feb 2023 08:44:46 +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 | 4 - common/css/base.scss | 21 +++ pages.json | 10 +- pages/device/APF/comp/basic.vue | 26 ++++ pages/device/APF/comp/module.vue | 61 ++++++++ pages/device/APF/detail.vue | 127 +++++++++++------ pages/device/DVR/detail.vue | 38 ++--- pages/device/list.vue | 5 +- pages/device/new.vue | 6 +- pages/gateway/detail.vue | 109 ++++++++++++++ pages/gateway/list.vue | 33 ++++- pages/gateway/new.vue | 4 +- pages/gateway/newDevice.vue | 6 +- pages/index/comp/indexGongCheng.vue | 134 ++++++++++++++++-- pages/index/comp/indexYunWei.vue | 134 ++++++++++++++++-- pages/index/comp/indexZhuYongHu.vue | 16 +-- pages/index/comp/indexZiYongHu.vue | 134 ++++++++++++++++-- pages/index/index.vue | 44 ++++-- pages/index/message.vue | 13 +- pages/index/mine.vue | 18 ++- pages/project/detail.vue | 29 +++- static/scan.png | Bin 0 -> 3872 bytes static/table.png | Bin 0 -> 4550 bytes static/test2.pic.png | Bin 0 -> 223779 bytes .../uni-forms-item/uni-forms-item.vue | 6 +- 25 files changed, 830 insertions(+), 148 deletions(-) create mode 100644 pages/device/APF/comp/module.vue create mode 100644 pages/gateway/detail.vue create mode 100644 static/scan.png create mode 100644 static/table.png create mode 100644 static/test2.pic.png diff --git a/App.vue b/App.vue index 9f5c21c..87cc1e4 100644 --- a/App.vue +++ b/App.vue @@ -5,10 +5,6 @@ export default { }, onShow: function () { console.log('App Show') - uni.setTabBarBadge({ - index: 1, - text: '6' - }) }, onHide: function () { console.log('App Hide') diff --git a/common/css/base.scss b/common/css/base.scss index 5b25fd6..26333dc 100644 --- a/common/css/base.scss +++ b/common/css/base.scss @@ -91,6 +91,7 @@ page { } .grid-card-content-4, + .grid-card-content-2, .grid-card-content-3, .grid-card-content-5, .grid-card-content-6 { @@ -117,10 +118,15 @@ page { } } + .grid-card-content-2 { + grid-template-columns: 1fr 3fr; + } + .grid-card-content-3 { grid-template-columns: 1fr 2fr 2fr; } + .grid-card-content-5 { grid-template-columns: 1fr 1fr 1fr 1fr 1fr; } @@ -177,6 +183,7 @@ page { border-radius: 8rpx; background: #ebeaec; color: #666; + &-active { background: #dfe5f7; color: $uni-theme-blue; @@ -206,4 +213,18 @@ page { height: 60rpx; font-size: 24rpx; border-radius: 12rpx; +} + +.device{ + /deep/ .uni-card:first-of-type { + margin-top: 0 !important; + } + /deep/ .uni-card__header { + border-bottom: none !important; + } +} +.content{ + /deep/ .uni-forms-item:last-of-type { + margin-bottom: 0 !important; + } } \ No newline at end of file diff --git a/pages.json b/pages.json index 46198c0..e44ebb7 100644 --- a/pages.json +++ b/pages.json @@ -118,13 +118,13 @@ { "path": "pages/device/APF/detail", "style": { - "navigationBarTitleText": "APF设备详情" + "navigationBarTitleText": "APF 设备名称 + 型号" } }, { "path": "pages/device/DVR/detail", "style": { - "navigationBarTitleText": "DVR设备详情" + "navigationBarTitleText": "DVR 设备名称 + 型号" } }, { @@ -282,6 +282,12 @@ "style": { "navigationBarTitleText": "项目详情" } + }, + { + "path": "pages/gateway/detail", + "style": { + "navigationBarTitleText": "网关详情" + } } ], "tabBar": { diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue index ab30c9f..37dcca6 100644 --- a/pages/device/APF/comp/basic.vue +++ b/pages/device/APF/comp/basic.vue @@ -1,5 +1,31 @@