diff --git a/app.json b/app.json
index 84f9136..61f0f63 100644
--- a/app.json
+++ b/app.json
@@ -15,7 +15,7 @@
},
"tabBar": {
"color": "#808080",
- "selectedColor": "#1385FA",
+ "selectedColor": "#8363F9",
"borderStyle": "white",
"list": [{
"pagePath": "pages/home/home",
diff --git a/components/configureDevice_2/configureDevice_2.wxss b/components/configureDevice_2/configureDevice_2.wxss
index e667c6a..373ce93 100644
--- a/components/configureDevice_2/configureDevice_2.wxss
+++ b/components/configureDevice_2/configureDevice_2.wxss
@@ -143,7 +143,7 @@ input {
line-height: 88rpx;
border-radius: 44rpx;
margin-bottom: 40rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
.describe {
diff --git a/components/configureDevice_3/configureDevice_3.wxss b/components/configureDevice_3/configureDevice_3.wxss
index 0c91321..867b8ab 100644
--- a/components/configureDevice_3/configureDevice_3.wxss
+++ b/components/configureDevice_3/configureDevice_3.wxss
@@ -169,7 +169,7 @@
margin: 0 auto;
text-align: center;
border-radius: 44rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
@@ -187,7 +187,7 @@
}
.progress2>view:nth-of-type(2) {
- color: #1385FA;
+ color: #8363F9;
width: 100%;
height: 36rpx;
font-size: 36rpx;
diff --git a/components/configureDevice_4/configureDevice_4.wxss b/components/configureDevice_4/configureDevice_4.wxss
index d3107e8..aabb9cd 100644
--- a/components/configureDevice_4/configureDevice_4.wxss
+++ b/components/configureDevice_4/configureDevice_4.wxss
@@ -45,5 +45,5 @@
line-height: 88rpx;
text-align: center;
border-radius: 44rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
diff --git a/components/replaceNetwork_2/replaceNetwork_2.wxss b/components/replaceNetwork_2/replaceNetwork_2.wxss
index eb36896..1e33f19 100644
--- a/components/replaceNetwork_2/replaceNetwork_2.wxss
+++ b/components/replaceNetwork_2/replaceNetwork_2.wxss
@@ -91,5 +91,5 @@
margin: 0 auto;
text-align: center;
border-radius: 44rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
\ No newline at end of file
diff --git a/components/replaceNetwork_3/replaceNetwork_3.wxss b/components/replaceNetwork_3/replaceNetwork_3.wxss
index 2dc1157..17e0aa2 100644
--- a/components/replaceNetwork_3/replaceNetwork_3.wxss
+++ b/components/replaceNetwork_3/replaceNetwork_3.wxss
@@ -12,7 +12,7 @@
}
.replaceNetwork3>view:nth-of-type(2) {
- color: #1385FA;
+ color: #8363F9;
width: 100%;
height: 36rpx;
font-size: 36rpx;
diff --git a/components/replaceNetwork_4/replaceNetwork_4.wxss b/components/replaceNetwork_4/replaceNetwork_4.wxss
index 72e7366..c792e3b 100644
--- a/components/replaceNetwork_4/replaceNetwork_4.wxss
+++ b/components/replaceNetwork_4/replaceNetwork_4.wxss
@@ -45,5 +45,5 @@
line-height: 88rpx;
text-align: center;
border-radius: 44rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
diff --git a/images/configureDevice/configureDevice_3_icon.png b/images/configureDevice/configureDevice_3_icon.png
index 9974df8..a9ae852 100644
Binary files a/images/configureDevice/configureDevice_3_icon.png and b/images/configureDevice/configureDevice_3_icon.png differ
diff --git a/images/configureDevice/configureDevice_4_icon.png b/images/configureDevice/configureDevice_4_icon.png
index 6c7a21e..1323d14 100644
Binary files a/images/configureDevice/configureDevice_4_icon.png and b/images/configureDevice/configureDevice_4_icon.png differ
diff --git a/images/home/bg.jpg b/images/home/bg.jpg
deleted file mode 100644
index f23f89d..0000000
Binary files a/images/home/bg.jpg and /dev/null differ
diff --git a/images/home/bg.png b/images/home/bg.png
new file mode 100644
index 0000000..fccd768
Binary files /dev/null and b/images/home/bg.png differ
diff --git a/images/replaceNetwork/configureDevice_3_icon.png b/images/replaceNetwork/configureDevice_3_icon.png
index 9974df8..a9ae852 100644
Binary files a/images/replaceNetwork/configureDevice_3_icon.png and b/images/replaceNetwork/configureDevice_3_icon.png differ
diff --git a/images/replaceNetwork/configureDevice_4_icon.png b/images/replaceNetwork/configureDevice_4_icon.png
index 6c7a21e..1323d14 100644
Binary files a/images/replaceNetwork/configureDevice_4_icon.png and b/images/replaceNetwork/configureDevice_4_icon.png differ
diff --git a/images/searchDevice/icon.png b/images/searchDevice/icon.png
index 8304216..0a24c39 100644
Binary files a/images/searchDevice/icon.png and b/images/searchDevice/icon.png differ
diff --git a/images/tabBar/home_.png b/images/tabBar/home_.png
index 3fe72ed..eb39c4a 100644
Binary files a/images/tabBar/home_.png and b/images/tabBar/home_.png differ
diff --git a/images/tabBar/my_.png b/images/tabBar/my_.png
index 4383c26..36745f4 100644
Binary files a/images/tabBar/my_.png and b/images/tabBar/my_.png differ
diff --git a/pages/configureDevice/configureDevice.wxml b/pages/configureDevice/configureDevice.wxml
index 830b596..2eeeb2f 100644
--- a/pages/configureDevice/configureDevice.wxml
+++ b/pages/configureDevice/configureDevice.wxml
@@ -3,7 +3,7 @@
- {{progress.index >= index ? '' : index + 1}}
+ {{progress.index >= index ? '' : index + 1}}
{{item}}
diff --git a/pages/configureDevice/configureDevice.wxss b/pages/configureDevice/configureDevice.wxss
index 81c4ea6..f6fbaf1 100644
--- a/pages/configureDevice/configureDevice.wxss
+++ b/pages/configureDevice/configureDevice.wxss
@@ -70,7 +70,7 @@
}
.active {
- color: #3194FB !important;
+ color: #8363F9 !important;
font-weight: bold !important;
}
diff --git a/pages/deviceInfo/deviceInfo.wxss b/pages/deviceInfo/deviceInfo.wxss
index 3ba6bd8..b47c501 100644
--- a/pages/deviceInfo/deviceInfo.wxss
+++ b/pages/deviceInfo/deviceInfo.wxss
@@ -98,5 +98,5 @@ page {
line-height: 88rpx;
text-align: center;
border-radius: 44rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index ed3e3d5..71a27ef 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -1,5 +1,5 @@
-
+
@@ -16,8 +16,7 @@
智能蓝牙秤
- 注重更好的健康生活品质
-
+ 精准称重丨灵敏测脂丨健康管理
@@ -29,8 +28,6 @@
- 请添加设备
- 添加设备后，解锁更多体验
添加设备
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 14e9028..095e791 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -57,26 +57,20 @@
.title>view:nth-of-type(2) {
color: #FFFFFF;
- height: 58rpx;
- font-size: 58rpx;
+ height: 80rpx;
+ font-size: 80rpx;
font-weight: bold;
- line-height: 58rpx;
- margin-bottom: 34rpx;
+ line-height: 80rpx;
+ margin-bottom: 45rpx;
+ text-align: center;
}
.title>view:nth-of-type(3) {
color: #FFFFFF;
- height: 32rpx;
- font-size: 32rpx;
- line-height: 32rpx;
- margin-bottom: 48rpx;
-}
-
-.title>view:nth-of-type(4) {
- width: 120rpx;
- height: 6rpx;
- border-radius: 3rpx;
- background-color: #FFFFFF;
+ height: 40rpx;
+ font-size: 40rpx;
+ line-height: 40rpx;
+ text-align: center;
}
.device {
@@ -104,35 +98,15 @@
margin: 0 auto;
}
-.addDevice>view:nth-of-type(1) {
+.addDevice>view {
color: #FFFFFF;
width: 100%;
- height: 36rpx;
- font-size: 36rpx;
- font-weight: bold;
- text-align: center;
- line-height: 36rpx;
- margin-bottom: 30rpx;
-}
-
-.addDevice>view:nth-of-type(2) {
- color: #FFFFFF;
- width: 100%;
- height: 30rpx;
- font-size: 30rpx;
- text-align: center;
- line-height: 30rpx;
- margin-bottom: 80rpx;
-}
-
-.addDevice>view:nth-of-type(3) {
- color: #FFFFFF;
- width: 100%;
- height: 106rpx;
+ height: 88rpx;
font-size: 32rpx;
font-weight: bold;
text-align: center;
- line-height: 106rpx;
- border-radius: 16rpx;
- border: 1rpx solid #FFFFFF;
+ line-height: 88rpx;
+ border-radius: 44rpx;
+ border: 1rpx solid #FFFFFF;
+ background-color: rgba(0, 0, 0, .4);
}
diff --git a/pages/my/my.wxss b/pages/my/my.wxss
index ec64727..dea2739 100644
--- a/pages/my/my.wxss
+++ b/pages/my/my.wxss
@@ -152,7 +152,7 @@
}
.btn>view {
- color: #1385FA;
+ color: #8363F9;
width: 580rpx;
height: 88rpx;
line-height: 88rpx;
@@ -160,6 +160,6 @@
border-radius: 44rpx;
text-align: center;
background-color: #F5F7FB;
- border: 1rpx solid #1385FA;
+ border: 1rpx solid #8363F9;
}
\ No newline at end of file
diff --git a/pages/searchDevice/searchDevice.wxss b/pages/searchDevice/searchDevice.wxss
index f2149ff..55d86b9 100644
--- a/pages/searchDevice/searchDevice.wxss
+++ b/pages/searchDevice/searchDevice.wxss
@@ -44,7 +44,7 @@ page {
0% {
width: 200rpx;
height: 200rpx;
- background-color: #3194FB;
+ background-color: #8363F9;
}
100% {
width: 556rpx;
diff --git a/pages/userInfo/userInfo.wxss b/pages/userInfo/userInfo.wxss
index 6959e29..05a5485 100644
--- a/pages/userInfo/userInfo.wxss
+++ b/pages/userInfo/userInfo.wxss
@@ -151,7 +151,7 @@ input {
line-height: 88rpx;
border-radius: 44rpx;
margin-bottom: 40rpx;
- background-color: #1385FA;
+ background-color: #8363F9;
}
.describe {