diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5fd0154 Binary files /dev/null and b/.DS_Store differ diff --git a/app.json b/app.json index 73ff9b7..860b785 100644 --- a/app.json +++ b/app.json @@ -11,12 +11,12 @@ ], "window": { "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#FFC640", + "navigationBarBackgroundColor": "#00AA00", "navigationBarTitleText": "WeChat" }, "tabBar": { "color": "#272636", - "selectedColor": "#FFD161", + "selectedColor": "#00AA00", "backgroundColor": "#fff", "borderStyle": "black", "list": [ @@ -29,8 +29,8 @@ { "pagePath": "pages/circle/circle", "text": "小区圈", - "iconPath": "images/book.png", - "selectedIconPath": "images/bookSelected.png" + "iconPath": "images/circle.png", + "selectedIconPath": "images/circleSelected.png" }, { "pagePath": "pages/my/my", diff --git a/app.wxss b/app.wxss index 9b18fdf..fa4cc45 100644 --- a/app.wxss +++ b/app.wxss @@ -1,4 +1,5 @@ /**app.wxss**/ +@import "style/iconfont.wxss"; .container { height: 100%; display: flex; diff --git a/images/.DS_Store b/images/.DS_Store new file mode 100644 index 0000000..174e79a Binary files /dev/null and b/images/.DS_Store differ diff --git a/images/circle.png b/images/circle.png new file mode 100644 index 0000000..627cb55 Binary files /dev/null and b/images/circle.png differ diff --git a/images/circleSelected.png b/images/circleSelected.png new file mode 100644 index 0000000..0f885e9 Binary files /dev/null and b/images/circleSelected.png differ diff --git a/images/home-selected.png b/images/home-selected.png index 3a64d1c..73342eb 100644 Binary files a/images/home-selected.png and b/images/home-selected.png differ diff --git a/images/home.png b/images/home.png index 3c97389..c8017fd 100644 Binary files a/images/home.png and b/images/home.png differ diff --git a/images/my-selected.png b/images/my-selected.png deleted file mode 100644 index 51ef97c..0000000 Binary files a/images/my-selected.png and /dev/null differ diff --git a/images/my.png b/images/my.png index dee9fc7..f39e841 100644 Binary files a/images/my.png and b/images/my.png differ diff --git a/images/mySelected.png b/images/mySelected.png index bb4c896..7593bfc 100644 Binary files a/images/mySelected.png and b/images/mySelected.png differ diff --git a/pages/index/index.json b/pages/index/index.json index e2c6932..a707c91 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "HC智慧小区", + "navigationBarTitleText": "HC智慧家园", "backgroundColor": "#ffffff", "usingComponents": {} } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8bf51de..37c1249 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -42,14 +42,17 @@ style="height:100%"> duration='1000' circular='true' > - + - 最新动态 + + 最新动态 + + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 732e139..bb7c4cb 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,3 +1,4 @@ +@import "../../style/iconfont.wxss"; page { background-color: #ffffff; } @@ -114,7 +115,7 @@ page { display: flex; width: 100%; height: 80rpx; - background: #FFC640; + background: #00AA00; } .heard-location-icon{ position: absolute; @@ -137,7 +138,7 @@ page { margin: 10rpx; width: 250rpx; height: 40rpx; - background: #B38B2D; + background: #008800; color: white; border-radius: 20rpx; } @@ -190,14 +191,24 @@ page { line-height: 30rpx } .header-title{ - text-align: center; width: 100%; height: 80rpx; + justify-content: space-between; + display: flex; line-height: 80rpx; font-size: 31rpx; font-weight: 600; border: 1rpx solid #ECECEC; } + +.header-title .new{ + margin-left: 20rpx; +} + +.header-title .gd{ + margin-right: 20rpx; + color: #8a8a8a +} .sort-list{ justify-content: space-around; display: flex; diff --git a/pages/location/location.json b/pages/location/location.json index a9fb894..8720782 100644 --- a/pages/location/location.json +++ b/pages/location/location.json @@ -1,5 +1,4 @@ { "navigationBarTitleText": "选择小区", - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#FFC640" + "navigationBarTextStyle": "white" } \ No newline at end of file diff --git a/pages/my/my.json b/pages/my/my.json index ab27bff..c307734 100644 --- a/pages/my/my.json +++ b/pages/my/my.json @@ -1,4 +1,3 @@ { - "navigationBarTitleText": "我", - "navigationBarBackgroundColor": "#ffffff" + "navigationBarTitleText": "我" } \ No newline at end of file diff --git a/style/.DS_Store b/style/.DS_Store new file mode 100644 index 0000000..08e85fb Binary files /dev/null and b/style/.DS_Store differ diff --git a/style/iconfont.wxss b/style/iconfont.wxss new file mode 100644 index 0000000..c1f8f05 --- /dev/null +++ b/style/iconfont.wxss @@ -0,0 +1,159 @@ +@font-face { + font-family: 'iconfont'; /* project id 1513691 */ + src: url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.eot'); + src: url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.eot?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.woff2') format('woff2'), + url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.woff') format('woff'), + url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.ttf') format('truetype'), + url('//at.alicdn.com/t/font_1513691_j1bbh5xfyja.svg#iconfont') format('svg'); +} + + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icongengduo:before { + content: "\e64c"; +} + +.iconbianji:before { + content: "\eabd"; +} + +.iconzhaoshangxiaochengxu-shimingrenzheng:before { + content: "\e634"; +} + +.icongengduo1:before { + content: "\e86d"; +} + +.iconpengyouquan:before { + content: "\e8b4"; +} + +.iconadd:before { + content: "\e6ec"; +} + +.iconcategory:before { + content: "\e6eb"; +} + +.iconall:before { + content: "\e6ef"; +} + +.iconclose:before { + content: "\e6f0"; +} + +.iconbad:before { + content: "\e6f1"; +} + +.iconfalling:before { + content: "\e6f8"; +} + +.icongood:before { + content: "\e6f9"; +} + +.iconaccount:before { + content: "\e6fa"; +} + +.iconeditor:before { + content: "\e6f6"; +} + +.iconemail:before { + content: "\e6fb"; +} + +.iconfavorites:before { + content: "\e6fe"; +} + +.iconloading:before { + content: "\e6fc"; +} + +.iconreduce:before { + content: "\e700"; +} + +.iconremind:before { + content: "\e701"; +} + +.iconQRcode:before { + content: "\e704"; +} + +.iconscanning:before { + content: "\e705"; +} + +.iconsuccess:before { + content: "\e709"; +} + +.iconsearch:before { + content: "\e70a"; +} + +.iconaccount1:before { + content: "\e716"; +} + +.iconadd-fill:before { + content: "\e717"; +} + +.iconbad-fill:before { + content: "\e719"; +} + +.iconfavorites-fill:before { + content: "\e721"; +} + +.icongood-fill:before { + content: "\e723"; +} + +.iconreduce-fill:before { + content: "\e730"; +} + +.iconcollection:before { + content: "\e797"; +} + +.iconcollection-fill1:before { + content: "\e798"; +} + +.iconconsumption-fill:before { + content: "\e799"; +} + +.iconconsumption:before { + content: "\e79a"; +} + +.iconwode:before { + content: "\e6b4"; +} + +.iconshouye1:before { + content: "\e6b3"; +} +