diff --git a/pages.json b/pages.json
index 844d6aa..d61df38 100644
--- a/pages.json
+++ b/pages.json
@@ -38,7 +38,8 @@
}, {
"path": "pages/mine/index",
"style": {
- "navigationBarTitleText": "我的"
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
}
}, {
"path": "pages/mine/avatar/index",
diff --git a/pages/index.vue b/pages/index.vue
index 48dba5d..ea7556d 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -241,9 +241,60 @@
-
+
+
+
+
+
+ 1-2
+ ①开
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ 52%
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
@@ -463,7 +514,6 @@
color: white;
border-radius: 0 0 30px 30px;
-
::v-deep.u-search__content,
::v-deep.u-search__content__input {
background-color: white !important;
@@ -781,4 +831,115 @@
.battery-level-0 {
width: 0%;
}
+
+ /* 弹出进度条 */
+ .dialog-container {
+ min-width: 300px;
+
+ .dialog-title {
+ position: relative;
+ text-align: center;
+ height: 34px;
+ line-height: 34px;
+ border-bottom: 1px solid #ddd;
+
+ &>uni-view {
+ display: inline-block;
+ font-weight: bold;
+ font-size: 16px;
+ }
+
+ &>uni-view:nth-child(2) {
+ font-size: 14px;
+ color: #5bc724;
+ margin-left: 10px;
+ }
+
+ .close-btn {
+ position: absolute;
+ top: 50%;
+ right: 10px;
+ transform: translateY(-50%);
+ }
+
+
+ }
+movable-area {
+
+ height: 30rpx;
+ width: 210px;
+ margin: auto;
+ border-radius: 5px;
+ background-color: #D8D8D8;
+ overflow: hidden;
+ }
+
+ movable-view {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ width: 10px;
+ height: 100%;
+ background-color: #15d99b;
+ color: #fff;
+ text-align: center;
+ }
+
+ ::v-deep .uni-slider-handle-wrapper {
+ height: 30px !important;
+ }
+
+
+ ::v-deep .uni-slider-thumb {
+ width: 24px !important;
+ height: 24px !important;
+ box-shadow: 0 0 0px 4px #74ffd4 !important;
+ margin-top: -12px !important;
+ }
+
+ ::v-deep uni-slider {
+ margin: 10px 18px 0 18px !important;
+ }
+
+ ::v-deep uni-slider .uni-slider-tap-area {
+ padding: 0 !important;
+ }
+ .dialog-body {
+ .grid {
+ margin: 20px;
+ display: grid;
+ grid-template-columns: 0.5fr 2fr 0.5fr;
+
+ .grid-time:first-child,
+ .grid-time:last-child {
+ display: grid;
+ justify-items: end;
+ align-items: end;
+
+ &>uni-view {
+ width: 35px;
+ height: 30px;
+ background-color: #eaecf0;
+ text-align: center;
+ font-size: 30px;
+ line-height: 26px;
+ color: #564556;
+ }
+ }
+
+ .grid-time:last-child {
+ justify-items: left;
+
+ }
+ }
+
+ .buttons {
+ margin: 40px 10px 10px;
+ display: flex;
+ justify-content: center;
+
+ }
+ }
+ }
\ No newline at end of file
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index a9aa900..815c387 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -1,234 +1,306 @@
-
-
-
+ .list-cell:last-child {
+ border-radius: 0 0 10px 10px;
+ }
+
+ .list-cell {
+ .menu-item-box {
+ .menu-icon {
+ color: #39ac4f;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/mine/info/index.vue b/pages/mine/info/index.vue
index 65c861a..9e4bdbd 100644
--- a/pages/mine/info/index.vue
+++ b/pages/mine/info/index.vue
@@ -3,8 +3,8 @@
-
-
+
+
@@ -41,4 +41,5 @@
page {
background-color: #ffffff;
}
+ .uni-icons{color: #39ac4f !important;}
diff --git a/static/scss/app.css b/static/scss/app.css
index bcd467d..46a5b80 100644
--- a/static/scss/app.css
+++ b/static/scss/app.css
@@ -17,22 +17,22 @@
}
/* 按钮 */
+
.u-button {
width: fit-content !important;
}
-
.u-button--square {
border-radius: 5px !important;
}
-
+.u-button--large {width: 100% !important;
+ height: 38px !important;
+}
.u-button--normal {
height: 28px !important;
}
-
.u-button--small {
height: 25px !important;
}
-
.u-button--success {
background-color: #39ac4f !important;
border-color: #39ac4f !important;
@@ -118,13 +118,17 @@
margin-bottom: 0 !important;
}
-/* 首页阀门 */
+/* 首页阀门列表 */
.control {
padding: 10px;
}
-.valve{display: flex;
+
+.valve {
+ display: flex;
align-items: center;
- flex-direction: column;}
+ flex-direction: column;
+}
+
.valve>view {
display: flex;
justify-content: center;
@@ -200,4 +204,7 @@
left: 33%;
}
-.valve .btn-img .text5 .bottom{bottom: 0px;}
\ No newline at end of file
+.valve .btn-img .text5 .bottom {
+ bottom: 0px;
+}
+