diff --git a/androidPrivacy.json b/androidPrivacy.json
index 6ea7f39..d705b25 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -6,14 +6,14 @@
"buttonAccept": "同意并接受",
"buttonRefuse": "暂不同意",
"hrefLoader": "system",
- "backToExit":"false",
+ "backToExit": "false",
"second": {
"title": "确认提示",
"message": " 进入应用前,你需先同意《服务协议》和《隐私政策》,否则将退出应用。",
"buttonAccept": "同意并继续",
"buttonRefuse": "退出应用"
},
- "disagreeMode":{
+ "disagreeMode": {
"support": false,
"loadNativePlugins": false,
"visitorEntry": false,
@@ -21,12 +21,12 @@
},
"styles": {
"backgroundColor": "#fff",
- "borderRadius":"5px",
+ "borderRadius": "5px",
"title": {
"color": "#000000"
},
"buttonAccept": {
- "color": "#009c77"
+ "color": "#009458"
},
"buttonRefuse": {
"color": "#999999"
@@ -35,4 +35,4 @@
"color": "#999999"
}
}
-}
+}
\ No newline at end of file
diff --git a/components/Search/index.vue b/components/Search/index.vue
index a5f137b..391f8ef 100644
--- a/components/Search/index.vue
+++ b/components/Search/index.vue
@@ -1,18 +1,10 @@
-
-
-
+
+
- {{$t('homePage.alarm.sift')}}
-
+ {{ $t('homePage.alarm.sift') }}
+
@@ -25,7 +17,7 @@ export default {
default: "请输入告警内容筛选",
},
},
- data() {
+ data () {
return {
dec: "",
value1: 1,
@@ -34,11 +26,11 @@ export default {
};
},
methods: {
- open() {
+ open () {
this.show_ = true;
this.$emit("custom");
},
- blur() {
+ blur () {
this.$emit("blur", this.dec);
},
},
@@ -46,6 +38,13 @@ export default {
\ No newline at end of file
diff --git a/pages/login/components/dialog.vue b/pages/login/components/dialog.vue
index e137005..7fa365b 100644
--- a/pages/login/components/dialog.vue
+++ b/pages/login/components/dialog.vue
@@ -7,7 +7,7 @@
{{ $t('homePage.home.msgf')}}
- 《{{ $t('homePage.home.yhxy')}}》{{ $t('homePage.home.and')}}《{{ $t('homePage.home.yszc')}}》
+ 《{{ $t('homePage.home.yhxy')}}》{{ $t('homePage.home.and')}}《{{ $t('homePage.home.yszc')}}》
{{ $t('homePage.home.msgs')}}
@@ -116,7 +116,7 @@
font-size: 24rpx;
margin-top: 20rpx;
.xieyi {
- color: #009C77;
+ color: #009458;
}
}
@@ -144,7 +144,7 @@
.version {
padding-left: 24rpx;
font-size: 36rpx;
- color: #009c77;
+ color: #009458;
font-weight: 400;
}
}
@@ -167,7 +167,7 @@
max-width: 14rpx;
max-height: 12rpx;
border-radius: 50%;
- background-color: #009c77;
+ background-color: #009458;
font-size: 24rpx;
}
@@ -183,7 +183,7 @@
margin-top: 50rpx;
width: 360rpx;
height: 70rpx;
- background-color: #009c77;
+ background-color: #009458;
border: none !important;
font-size: 28rpx;
color: #fff;
diff --git a/pages/login/index.scss b/pages/login/index.scss
index fa3dbdb..c6b943d 100644
--- a/pages/login/index.scss
+++ b/pages/login/index.scss
@@ -4,13 +4,14 @@
display: flex;
flex-direction: column;
align-items: center;
- .EnglishFont{
- font-size: 36rpx;
- font-weight: 600;
- margin-top: 60rpx;
- margin-bottom: 40rpx;
- // display: flex;
- // align-items: center;
+
+ .EnglishFont {
+ font-size: 36rpx;
+ font-weight: 600;
+ margin-top: 60rpx;
+ margin-bottom: 40rpx;
+ // display: flex;
+ // align-items: center;
}
}
@@ -29,15 +30,15 @@
.list-call-user .u-input {
font-size: 30rpx;
- width: 100%;
- height: 110rpx;
- text-indent: 2%;
- border: 1px solid #00CA9A;
+ width: 100%;
+ height: 110rpx;
+ text-indent: 2%;
+ border: 1px solid #00CA9A;
}
-.zhanghao{
- color: #282828;
- margin-bottom: 10rpx;
+.zhanghao {
+ color: #282828;
+ margin-bottom: 10rpx;
}
.list-call-password .u-input {
@@ -45,15 +46,15 @@
font-size: 30rpx;
width: 100%;
height: 110rpx;
- text-indent: 2%;
- border: 1px solid #00CA9A;
+ text-indent: 2%;
+ border: 1px solid #00CA9A;
}
.list-call-password .u-icon-right {
- position: absolute;
- right: 20rpx;
+ position: absolute;
+ right: 20rpx;
color: #aaaaaa;
width: 40rpx;
height: 40rpx;
@@ -65,7 +66,7 @@
font-size: 35rpx;
width: 603rpx;
height: 95rpx;
- background: #009C77;
+ background: #009c77;
box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(15, 168, 250, 0.4);
border-radius: 10rpx;
line-height: 95rpx;
@@ -77,15 +78,16 @@
width: 100%;
height: 400rpx;
border-radius: 0 0 50% 50%;
- background-color: #069E7A;
+ background: linear-gradient(-45deg, rgba(7, 151, 110, 1), rgba(254, 131, 15, 0.3));
}
-.center-logo{
- width: 410rpx;
- height: 230rpx;
- top: 100rpx;
- position: absolute;
-
+
+.center-logo {
+ width: 410rpx;
+ height: 150rpx;
+ top: 100rpx;
+ position: absolute;
+
}
.user-card {
@@ -107,41 +109,45 @@
border-bottom: 1rpx solid #f5f5f5;
width: 100%;
height: 89rpx;
- position: relative;
+ position: relative;
margin-bottom: 30rpx;
- .u-icon-delete {
- position: absolute;
- right: 20rpx;
- color: #aaaaaa;
- width: 40rpx;
- height: 40rpx;
- }
+
+ .u-icon-delete {
+ position: absolute;
+ right: 20rpx;
+ color: #aaaaaa;
+ width: 40rpx;
+ height: 40rpx;
+ }
+
input {
height: 90rpx;
- border-radius: 10rpx;
- padding-left: 10rpx;
- box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1);
+ border-radius: 10rpx;
+ padding-left: 10rpx;
+ box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1);
}
+
.user-icon {
width: 36rpx;
height: 39rpx;
}
}
+
.list-call-password {
display: flex;
align-items: center;
border-bottom: 1rpx solid #f5f5f5;
width: 100%;
height: 89rpx;
- position: relative;
+ position: relative;
input {
height: 90rpx;
color: #939393;
- border-radius: 10rpx;
- padding-left: 10rpx;
- box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1);
+ border-radius: 10rpx;
+ padding-left: 10rpx;
+ box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1);
}
.password-icon {
@@ -159,4 +165,4 @@
.u-tabs {
padding: 0 70rpx;
-}
+}
\ No newline at end of file
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 5092291..05097e9 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -74,8 +74,8 @@
-
- {{ langValue === 'zh_CN' ? 'ZH' : 'EN' }}
+
+ {{ langValue === 'zh_CN' ? 'ZH' : 'EN' }}
diff --git a/pages/sys/user/pwd.vue b/pages/sys/user/pwd.vue
index e37b595..94147d5 100644
--- a/pages/sys/user/pwd.vue
+++ b/pages/sys/user/pwd.vue
@@ -168,8 +168,8 @@ page {
padding: 30rpx;
.btn {
width: 690rpx;
- background-color:#009C77;
- border-color: #009C77!important;
+ background-color:#009458;
+ border-color: #009458!important;
color: #fff;
}
}
diff --git a/pages/tabbar/components/dischargeChart/index.vue b/pages/tabbar/components/dischargeChart/index.vue
index bc209be..0e1ce44 100644
--- a/pages/tabbar/components/dischargeChart/index.vue
+++ b/pages/tabbar/components/dischargeChart/index.vue
@@ -145,7 +145,7 @@
return [x, y];
},
},
- color: ["#009C77", "#BFE49F", "#3977B1"],
+ color: ["#009458", "#BFE49F", "#3977B1"],
legend: {
animation: false,
right: "0",
diff --git a/pages/tabbar/components/environmentalControl/index.vue b/pages/tabbar/components/environmentalControl/index.vue
index 0e2f793..33ede17 100644
--- a/pages/tabbar/components/environmentalControl/index.vue
+++ b/pages/tabbar/components/environmentalControl/index.vue
@@ -136,7 +136,7 @@ export default {
.section {
height: 30rpx;
width: 6rpx;
- background-color: #009c77;
+ background-color: #009458;
border-radius: 8rpx;
}
diff --git a/pages/tabbar/components/environmentalControl/position.vue b/pages/tabbar/components/environmentalControl/position.vue
index c9f79ad..2781bfb 100644
--- a/pages/tabbar/components/environmentalControl/position.vue
+++ b/pages/tabbar/components/environmentalControl/position.vue
@@ -108,7 +108,7 @@ export default {
height: 110rpx;
justify-content: center;
padding: 10rpx;
- background: #d7e9e548;
+ background: rgba(254, 131, 15, 0.05);
border-radius: 10rpx;
margin: 10rpx 10rpx;
position: relative;
@@ -136,7 +136,7 @@ export default {
.section {
height: 30rpx;
width: 6rpx;
- background-color: #009c77;
+ background-color: #07976E;
border-radius: 8rpx;
}
diff --git a/pages/tabbar/components/topology/devicemonitoring.vue b/pages/tabbar/components/topology/devicemonitoring.vue
index ffee902..894337d 100644
--- a/pages/tabbar/components/topology/devicemonitoring.vue
+++ b/pages/tabbar/components/topology/devicemonitoring.vue
@@ -52,8 +52,8 @@
],
width: 2,
rectType: 'fill',
- borderColor: "#009C77",
- background: "#009C77"
+ borderColor: "#009458",
+ background: "#009458"
},
{
type: "text",
@@ -266,8 +266,8 @@
],
width: 2,
rectType: 'fill',
- borderColor: "#009C77",
- background: "#009C77"
+ borderColor: "#009458",
+ background: "#009458"
}
const textObj = {
type: "text",
diff --git a/pages/tabbar/components/topology/fire.vue b/pages/tabbar/components/topology/fire.vue
index d847713..ae57635 100644
--- a/pages/tabbar/components/topology/fire.vue
+++ b/pages/tabbar/components/topology/fire.vue
@@ -156,8 +156,8 @@
],
width: 2,
rectType: 'fill',
- borderColor: "#009C77",
- background: "#009C77"
+ borderColor: "#009458",
+ background: "#009458"
}
const textObj = {
type: "text",
diff --git a/pages/tabbar/components/topology/jingke.vue b/pages/tabbar/components/topology/jingke.vue
index 6ac8e75..5903dcb 100644
--- a/pages/tabbar/components/topology/jingke.vue
+++ b/pages/tabbar/components/topology/jingke.vue
@@ -7,7 +7,7 @@
:is-scroll="false"
:current="currentTab"
@change="changeTab"
- active-color="#009C77"
+ active-color="#009458"
>
0){
+ this.rightCenter = data[0]?.rightCenter
+ }
+
},
openTimer() {
@@ -449,15 +452,15 @@
.top-right-item {
padding: 5rpx 10rpx;
- border: 1rpx solid #009c77;
+ border: 1rpx solid #009458;
font-size: 24rpx;
- color: #009c77;
+ color: #009458;
cursor: pointer;
margin-right: 10rpx;
border-radius: 8rpx;
&.active {
- background: #009c77;
+ background: #07976E;
color: #ffffff;
}
}
diff --git a/pages/tabbar/electricityPrice.vue b/pages/tabbar/electricityPrice.vue
index b6d14a3..c9f5479 100644
--- a/pages/tabbar/electricityPrice.vue
+++ b/pages/tabbar/electricityPrice.vue
@@ -219,7 +219,7 @@
{{this.$t('homePage.price.sift')}}
-
-
-
-
-
@@ -353,18 +353,19 @@ export default {
second: false
},
sureButtonStyle: {
- backgroundColor: 'rgba(0, 156, 119, 1)',
- width: '280rpx',
- height: '70rpx',
- fontSize: '28rpx',
- color: 'rgba(255, 255, 255, 1)'
+ backgroundColor: '#009458',
+ width: '280rpx',
+ height: '70rpx',
+ fontSize: '28rpx',
+ color: 'rgba(255, 255, 255, 1)'
+
},
resetButtonStyle: {
- backgroundColor: 'rgba(191, 228, 159, 1)',
- width: '280rpx',
- height: '70rpx',
- fontSize: '28rpx',
- color: 'rgba(40, 40, 40, 1)'
+ backgroundColor: '#fdd100',
+ width: '280rpx',
+ height: '70rpx',
+ fontSize: '28rpx',
+ color: 'rgba(40, 40, 40, 1)'
},
dataList: [],
loading: false,
@@ -1011,7 +1012,7 @@ export default {
width: 100%;
height: 230rpx;
- background: linear-gradient(45deg, rgba(0, 156, 119, 1), rgba(178, 223, 138, 1));
+ background: linear-gradient(-45deg, rgba(7, 151, 110, 1), rgba(254, 131, 15, 0.4));
display: flex;
justify-content: center;
align-items: center;
@@ -1094,15 +1095,15 @@ export default {
.top-right-item {
padding: 5rpx 10rpx;
- border: 1rpx solid #009c77;
+ border: 1rpx solid #009458;
font-size: 24rpx;
- color: #009c77;
+ color: #009458;
cursor: pointer;
margin-right: 10rpx;
border-radius: 8rpx;
&.active {
- background: #009c77;
+ background: #009458;
color: #ffffff;
}
}
@@ -1151,7 +1152,7 @@ export default {
.box-value {
text-align: center;
- color: #009C77;
+ color: #009458;
font-size: 36rpx;
}
diff --git a/pages/tabbar/mine.vue b/pages/tabbar/mine.vue
index 4e7eff3..49ca378 100644
--- a/pages/tabbar/mine.vue
+++ b/pages/tabbar/mine.vue
@@ -12,7 +12,7 @@
-
+
@@ -44,11 +44,11 @@
-
+
@@ -287,7 +287,8 @@
.image {
flex-shrink: 0;
width: 60%;
- height: 270rpx;
+ margin-top: 100rpx;
+ height: 150rpx;
image {
width: 100%;
diff --git a/static/aidex/images/Data-fill.png b/static/aidex/images/Data-fill.png
index 0a3301e..2cf3e49 100644
Binary files a/static/aidex/images/Data-fill.png and b/static/aidex/images/Data-fill.png differ
diff --git a/static/aidex/images/My-fill.png b/static/aidex/images/My-fill.png
index 7efe796..34a002f 100644
Binary files a/static/aidex/images/My-fill.png and b/static/aidex/images/My-fill.png differ
diff --git a/static/aidex/images/Price-fill.png b/static/aidex/images/Price-fill.png
index 1d2cfb3..e7c5fb8 100644
Binary files a/static/aidex/images/Price-fill.png and b/static/aidex/images/Price-fill.png differ
diff --git a/static/aidex/images/checked.png b/static/aidex/images/checked.png
index 209d820..5634c8f 100644
Binary files a/static/aidex/images/checked.png and b/static/aidex/images/checked.png differ
diff --git a/static/aidex/images/dqgl.png b/static/aidex/images/dqgl.png
index 0e30145..f4a0a19 100644
Binary files a/static/aidex/images/dqgl.png and b/static/aidex/images/dqgl.png differ
diff --git a/static/aidex/images/item.png b/static/aidex/images/item.png
deleted file mode 100644
index 3500483..0000000
Binary files a/static/aidex/images/item.png and /dev/null differ
diff --git a/static/aidex/images/item2.png b/static/aidex/images/item2.png
new file mode 100644
index 0000000..6b2940c
Binary files /dev/null and b/static/aidex/images/item2.png differ
diff --git a/static/aidex/images/menu-alarm.png b/static/aidex/images/menu-alarm.png
index fd9be2e..26f623b 100644
Binary files a/static/aidex/images/menu-alarm.png and b/static/aidex/images/menu-alarm.png differ
diff --git a/static/aidex/images/menu-device.png b/static/aidex/images/menu-device.png
index 53de493..7477263 100644
Binary files a/static/aidex/images/menu-device.png and b/static/aidex/images/menu-device.png differ
diff --git a/static/aidex/images/menu-earnings.png b/static/aidex/images/menu-earnings.png
index 2c5035d..37aad69 100644
Binary files a/static/aidex/images/menu-earnings.png and b/static/aidex/images/menu-earnings.png differ
diff --git a/static/aidex/images/menu-policy.png b/static/aidex/images/menu-policy.png
index 236cd8f..0525839 100644
Binary files a/static/aidex/images/menu-policy.png and b/static/aidex/images/menu-policy.png differ
diff --git a/static/aidex/images/rcdl.png b/static/aidex/images/rcdl.png
index a3ae3f0..41e12e0 100644
Binary files a/static/aidex/images/rcdl.png and b/static/aidex/images/rcdl.png differ
diff --git a/static/aidex/images/rfdl.png b/static/aidex/images/rfdl.png
index 262522a..68a30e8 100644
Binary files a/static/aidex/images/rfdl.png and b/static/aidex/images/rfdl.png differ
diff --git a/static/aidex/images/search.png b/static/aidex/images/search.png
new file mode 100644
index 0000000..d2210b0
Binary files /dev/null and b/static/aidex/images/search.png differ
diff --git a/static/aidex/images/xtzhl.png b/static/aidex/images/xtzhl.png
index 2e3c82f..686c7ce 100644
Binary files a/static/aidex/images/xtzhl.png and b/static/aidex/images/xtzhl.png differ
diff --git a/static/aidex/images/yxts.png b/static/aidex/images/yxts.png
index 7ae9777..c419026 100644
Binary files a/static/aidex/images/yxts.png and b/static/aidex/images/yxts.png differ
diff --git a/static/aidex/images/zcdl.png b/static/aidex/images/zcdl.png
index 4b4d2ec..977dc0f 100644
Binary files a/static/aidex/images/zcdl.png and b/static/aidex/images/zcdl.png differ
diff --git a/static/aidex/images/zfdl.png b/static/aidex/images/zfdl.png
index 4a402c0..d2be27c 100644
Binary files a/static/aidex/images/zfdl.png and b/static/aidex/images/zfdl.png differ
diff --git a/static/aidex/images/zjrl.png b/static/aidex/images/zjrl.png
index 77e40d5..98834fb 100644
Binary files a/static/aidex/images/zjrl.png and b/static/aidex/images/zjrl.png differ
diff --git a/static/aidex/login/bg-logo.png b/static/aidex/login/bg-logo.png
deleted file mode 100644
index 6b085f1..0000000
Binary files a/static/aidex/login/bg-logo.png and /dev/null differ
diff --git a/static/aidex/login/bg-logo2.png b/static/aidex/login/bg-logo2.png
new file mode 100644
index 0000000..1faba1f
Binary files /dev/null and b/static/aidex/login/bg-logo2.png differ
diff --git a/static/topology/ACDC.png b/static/topology/ACDC.png
new file mode 100644
index 0000000..429ff0e
Binary files /dev/null and b/static/topology/ACDC.png differ
diff --git a/static/topology/ammeter-1.png b/static/topology/ammeter-1.png
new file mode 100644
index 0000000..c258fe1
Binary files /dev/null and b/static/topology/ammeter-1.png differ
diff --git a/static/topology/cang.png b/static/topology/cang.png
index 9a3ebd2..d172a71 100644
Binary files a/static/topology/cang.png and b/static/topology/cang.png differ
diff --git a/static/topology/fire.png b/static/topology/fire.png
index d665889..d073e8c 100644
Binary files a/static/topology/fire.png and b/static/topology/fire.png differ
diff --git a/static/topology/grid.png b/static/topology/grid.png
new file mode 100644
index 0000000..9d046d8
Binary files /dev/null and b/static/topology/grid.png differ
diff --git a/static/topology/yitigui.png b/static/topology/yitigui.png
index 16e9480..c3f6905 100644
Binary files a/static/topology/yitigui.png and b/static/topology/yitigui.png differ
diff --git a/uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.scss b/uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.scss
index 2e8069a..a39e41c 100644
--- a/uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.scss
+++ b/uni_modules/luyj-tree/components/luyj-tree-item/luyj-tree-item.scss
@@ -1,76 +1,83 @@
.container-list-item {
- background-color: #fff;
- border-bottom: 1rpx solid #f4f4f4;
- border-radius: 20rpx;
- margin:0 30rpx 20rpx 30rpx;
- .content
-{
- display: flex;
- align-items: center;
- // min-height: 60rpx;
- width: 100%;
- padding:30rpx 15rpx ;
- position: relative;
- font-size: 32rpx;
- // 默认文本显示内容(默认的slot)
- .slot {
- // position:absolute;
- right: 64rpx;
- font-size: 32rpx;
- color: #5b5757;
- .word {
- width:100%;
- word-break: break-all;
- }
- }
- // 默认箭头显示样式
- .right {
- position: absolute;
- text-align: center;
- width: 80rpx;
- right: 30rpx;
- color: #babdc3;
- font-size: 32rpx;
- }
-
- }
+ background-color: #fff;
+ border-bottom: 1rpx solid #f4f4f4;
+ border-radius: 20rpx;
+ margin: 0 30rpx 20rpx 30rpx;
+
+ .content {
+ display: flex;
+ align-items: center;
+ // min-height: 60rpx;
+ width: 100%;
+ padding: 30rpx 15rpx;
+ position: relative;
+ font-size: 32rpx;
+
+ // 默认文本显示内容(默认的slot)
+ .slot {
+ // position:absolute;
+ right: 64rpx;
+ font-size: 32rpx;
+ color: #5b5757;
+
+ .word {
+ width: 100%;
+ word-break: break-all;
+ }
+ }
+
+ // 默认箭头显示样式
+ .right {
+ position: absolute;
+ text-align: center;
+ width: 80rpx;
+ right: 30rpx;
+ color: #babdc3;
+ font-size: 32rpx;
+ }
+
+ }
}
+
// 复选框
- .checkbox {
- position: relative;
- height: 36rpx;
- margin-left: 10rpx;
- margin-right: 0px;
- width: 36rpx;
- .txt {
- font-size: 35rpx;
- line-height: 36rpx;
- width: 100%;
- height: 100%;
- display: flex;
- }
- }
-
+.checkbox {
+ position: relative;
+ height: 36rpx;
+ margin-left: 10rpx;
+ margin-right: 0px;
+ width: 36rpx;
+
+ .txt {
+ font-size: 35rpx;
+ line-height: 36rpx;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ }
+}
+
.checkBorder {
- border: 1px solid #ecdee4;
+ border: 1px solid #ecdee4;
}
-.text-cut{
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
+.text-cut {
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
}
-.value_box{
- display: flex;
- height: 100%;
- .index{
- color: #009C77;
- width: 70rpx;
- text-align: center;
- border-right: 1rpx solid #eeeeee;
- }
- .value{
- padding-left: 20rpx;
- }
+.value_box {
+ display: flex;
+ height: 100%;
+
+ .index {
+ color: #009458;
+ width: 70rpx;
+ text-align: center;
+ border-right: 1rpx solid #eeeeee;
+ }
+
+ .value {
+ padding-left: 20rpx;
+ }
}
\ No newline at end of file
diff --git a/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.scss b/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.scss
index b7c2f0e..c1da506 100644
--- a/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.scss
+++ b/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.scss
@@ -1,28 +1,32 @@
// 导航栏标题
.title {
- height: 90rpx;
- padding: 0 32rpx;
- line-height: 90rpx;
- font-size: 30rpx;
- background-color: #f5f5f5;
- color: #606064;
- // 导航栏图标样式
- .iconclass {
- display: inline-block;
- margin: 0 12rpx;
- color: #D0D4DB;
- font-size: 28rpx;
- }
+ height: 90rpx;
+ padding: 0 32rpx;
+ line-height: 90rpx;
+ font-size: 30rpx;
+ background-color: #f5f5f5;
+ color: #606064;
+
+ // 导航栏图标样式
+ .iconclass {
+ display: inline-block;
+ margin: 0 12rpx;
+ color: #D0D4DB;
+ font-size: 28rpx;
+ }
}
+
// 导航栏项样式
.inline-item {
- display: inline-block
+ display: inline-block
}
+
// 导航栏项-启用状态
.active {
- color: #666666 !important;
+ color: #666666 !important;
}
+
// 导航栏项-无状态
.none {
- color: #009C77;
-}
+ color: #009458;
+}
\ No newline at end of file
diff --git a/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue b/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue
index 0d43d67..49c8dfd 100644
--- a/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue
+++ b/uni_modules/luyj-tree/components/luyj-tree-navigation/luyj-tree-navigation.vue
@@ -18,7 +18,7 @@
-
+
{{item[slabel]}}
diff --git a/uni_modules/luyj-tree/components/luyj-tree-search/luyj-tree-search.vue b/uni_modules/luyj-tree/components/luyj-tree-search/luyj-tree-search.vue
index 91e37a4..fe367b2 100644
--- a/uni_modules/luyj-tree/components/luyj-tree-search/luyj-tree-search.vue
+++ b/uni_modules/luyj-tree/components/luyj-tree-search/luyj-tree-search.vue
@@ -4,7 +4,8 @@
-
+
+