diff --git a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss
index 713596f..4c9caec 100644
--- a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss
+++ b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss
@@ -3,7 +3,7 @@
height: 276rpx;
border-radius: 10rpx;
background: #fff;
- margin: 20rpx 20rpx 0rpx 20rpx;
+ margin-top: 20rpx;
/* flex-direction: column;
justify-content: space-between;
box-sizing: border-box; */
@@ -153,12 +153,7 @@
margin: 10rpx 20rpx 0rpx 0rpx;
float: left;
}
-
.total {
color: #666;
}
-.signed {
-
-
-}
diff --git a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.js b/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.js
deleted file mode 100644
index 55e21eb..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Component({
- properties: {
- newsList: {
- type: Array,
- value: []
- }
- },
- methods: {
- navigatetoNewsDetail (e) {
- this.triggerEvent('navigatetoNewsDetail', {id: e.currentTarget.dataset.newsid})
- }
- }
-})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.json b/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.json
deleted file mode 100644
index 32640e0..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxml b/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxml
deleted file mode 100644
index 668c3dd..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
- {{item.newsTitle}}
-
- {{item.deptName}}
- {{filters.formatTimestamp(item.newsStartTime)}}
-
-
-
-
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxss b/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxss
deleted file mode 100644
index 87d7c5d..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/announcementList/announcementList.wxss
+++ /dev/null
@@ -1,71 +0,0 @@
-.news-list {
- width: 100%;
- background: #fff;
- box-sizing: border-box;
- padding: 0 35rpx;
- margin-top: 20rpx;
-}
-.news-list .list-item {
- width: 100%;
- height: 205rpx;
- box-sizing: border-box;
- padding: 30rpx 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-.news-list .list-item .right {
- width: calc(100% - 50rpx - 220rpx);
- height: 146rpx;
-}
-.news-list .list-item .right .title {
- color: #3f3f3f;
- font-size: 30rpx;
- line-height: 45rpx;
- display: -webkit-box;
- overflow: hidden;
- text-overflow: ellipsis;
- word-wrap: break-word;
- white-space: normal !important;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- height:90rpx;
-}
-.news-list .list-item .right .bottom {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-top: 20rpx;
-}
-.news-list .list-item .right .bottom .category {
- color: #aaa;
- font-size: 22rpx;
- line-height: 48rpx;
- width: calc(100% - 150rpx);
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-.news-list .list-item .right .bottom .time {
- color: #aaa;
- font-size: 22rpx;
- line-height: 48rpx;
- width: 150rpx;
- text-align: right;
-}
-.news-list .list-item .left {
- width: 250rpx;
- height: 146rpx;
- border-radius: 12rpx;
- overflow: hidden;
-}
-.news-list .list-item .left image {
- width: 100%;
- height:100%;
-}
-.news-list .list-item + .list-item {
- border-top: 1rpx solid #ece9ec;
-}
-.news-list .hover-sudoku {
- background: rgba(0,0,0,0.1);
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.js b/epdc-resident-mp-yushan/subpages/education/components/banner/banner.js
deleted file mode 100644
index 03cd34a..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.js
+++ /dev/null
@@ -1,42 +0,0 @@
-Component({
- data: {
- currentIndex: 0,
- autoplay:false,
- bannerInterval:0
- },
- properties: {
- bannerList: {
- type: Array,
- value: []
- }
- },
- lifetimes: {
-
- },
- pageLifetimes: {
- show:function(){
- console.log("show")
- this.setData({
- autoplay:true,
- bannerInterval:3000
- })
- },
- hide:function(){
- this.setData({
- autoplay:false,
- bannerInterval:0
- })
- }
- },
- methods: {
- swiperChange (e) {
- this.setData({
- currentIndex: e.detail.current
- })
- },
- navigatetoBannerDetail (e) {
- const { id, url, newsflag } = e.currentTarget.dataset
- this.triggerEvent('navigatetoBannerDetail', {id, url, newsFlag: newsflag} )
- }
- }
-})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.json b/epdc-resident-mp-yushan/subpages/education/components/banner/banner.json
deleted file mode 100644
index 32640e0..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxml b/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxml
deleted file mode 100644
index 858dfba..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxss b/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxss
deleted file mode 100644
index 7f84fde..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/banner/banner.wxss
+++ /dev/null
@@ -1,80 +0,0 @@
-.banner {
- width: 100%;
- height: 320rpx;
- padding: 20rpx 0;
- background: #fff;
-}
-.banner swiper {
- width: 94%;
- height: 320rpx;
- margin:0 auto;
-}
-.banner-item {
- width: 100%;
- height: 320rpx;
- position: relative;
-}
-.banner-item .banner-img {
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
-}
-.banner-item .banner-content {
- position: relative;
- width: 100%;
- height: 100%;
- top: 0;
- left: 0;
- z-index: 100;
- display: flex;
- align-items: flex-end;
-}
-.banner-item .banner-content .title {
- width: 100%;
- height: 50rpx;
- background: rgba(0,0,0, 0.4);
- box-sizing: border-box;
- padding: 0 20rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-.banner-item .banner-content .title .title-text {
- width: 75%;
- height: 50rpx;
- color: #fff;
- font-size: 26rpx;
- line-height: 50rpx;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-/* 自定义轮播指示点样式 */
-.indication {
- height: 50rpx;
- display:flex;
- position: absolute;
- bottom: -2rpx;
- right: 20rpx;
- flex-direction:row;
- align-items:center;
- justify-content:center;
-}
-/* 未选中指示点样式 */
-.spot{
- width: 15rpx;
- height: 15rpx;
- border-radius: 50%;
- margin-right: 10rpx;
- background-color: #c6c6c8;
-}
-/*选中指示样式 */
-.spot.active{
- width: 15rpx;
- height: 15rpx;
- border-radius: 50%;
- background-color: #fff;
-}
diff --git a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.js b/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.js
deleted file mode 100644
index e8c7bba..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.js
+++ /dev/null
@@ -1,28 +0,0 @@
-Component({
- properties: {
- sudokuState: {
- type: Object,
- value: {
- consultAvailable: '0',
- appraiseAvailable: '0'
- }
- },
- policeInfo:{
- type:Object
- }
- },
- data:{
- },
- methods: {
- joinGroup(e){
- this.triggerEvent("joinGroup",e);
- },
- makeCall(e){
- console.log(e)
- const {phone} = e.target.dataset;
- wx.makePhoneCall({
- phoneNumber: phone,
- })
- }
- }
-})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.json b/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.json
deleted file mode 100644
index 32640e0..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxml b/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxml
deleted file mode 100644
index 74746ad..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
- 姓名:{{item.policeName}}
-
-
-
- 联系方式:{{item.policeTel}}
-
-
-
-
-
-
- {{policeInfo.groupName}}
- 共{{policeInfo.numberGroupMember}}人 {{policeInfo.numberGroupPartyMember}}名党员
-
-
-
-
- {{policeInfo.groupMemberFlag=='0'?'加入':policeInfo.groupMemberFlag=='1'?'待审核':'进入'}}
-
-
-
-
- 暂无民警信息~
-
-
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxss b/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxss
deleted file mode 100644
index bcf8fc4..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/policeInfo/policeInfo.wxss
+++ /dev/null
@@ -1,119 +0,0 @@
-.sudoku {
- background:#fff;
- margin-top: 20rpx;
-}
-.content {
- width: 100%;
- display: grid;
- grid-template-columns: 1fr 1fr 1fr;
- grid-template-rows: 215rpx;
- box-sizing: border-box;
- padding-bottom: 20rpx;
-}
-.item {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-.item image {
- width:126rpx;
- height:126rpx;
-}
-.item .name {
- font-size: 28rpx;
- color: #3f3f3f;
-}
-.sudoku .hover-sudoku {
- background: rgba(0,0,0,0.1);
-}
-.info-group{
- width: 94%;
- margin-left: 20rpx;
- display: flex;
- line-height: 100rpx;
- padding-top: 20rpx;
-}
-.group-pic{
- width: 120rpx;
- height: 120rpx;
- border-radius: 60px;
- padding: 20rpx;
-}
-.group-detail{
- width: 50%;
- display: inline-block;
- padding-left: 40rpx;
- height: 120rpx;
-}
-.group-name{
- font-size: 30rpx;
- font-weight: bold;
- height: 75rpx;
- word-break: break-all;
- line-height: 50rpx;
-}
-.group-number{
- font-size: 25rpx;
- color: #999;
- height: 30rpx;
-}
-.group-join{
- display: inline-block;
- margin:0 auto;
-}
-.join-button{
- height: 55rpx;
- width: 110rpx;
- border-radius: 60rpx;
- background: #F82424;
- color: white;
- font-size: 30rpx;
- text-align: center;
- line-height: 50rpx;
- margin-top: 50rpx;
-}
-.join-text{
- font-size: 30rpx;
- position: relative;
- color: #fff;
- margin-top: -120rpx;
- margin-left: 20rpx;
-}
-.info-police{
- width: 94%;
- margin-left: 20rpx;
- display: flex;
- line-height: 100rpx;
- padding-top: 20rpx;
-}
-.group-pic{
- width: 120rpx;
- height: 120rpx;
- border-radius: 60px;
- padding: 20rpx;
-}
-.police-detail{
- display: grid;
- padding-left: 40rpx;
- height: 120rpx;
- width: 70%;
-}
-.police-name{
- font-size: 30rpx;
- height: 75rpx;
- word-break: break-all;
- line-height: 75rpx;
- display: inline-flex;
-}
-.no-police-data{
- text-align: center;
- height: 400rpx;
- line-height: 400rpx;
-}
-.info-img{
- height: 45rpx;
- width: 45rpx;
- padding-top: 15rpx;
- display: inline-block;
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.js b/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.js
deleted file mode 100644
index 55e21eb..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Component({
- properties: {
- newsList: {
- type: Array,
- value: []
- }
- },
- methods: {
- navigatetoNewsDetail (e) {
- this.triggerEvent('navigatetoNewsDetail', {id: e.currentTarget.dataset.newsid})
- }
- }
-})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.json b/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.json
deleted file mode 100644
index 32640e0..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxml b/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxml
deleted file mode 100644
index 668c3dd..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
- {{item.newsTitle}}
-
- {{item.deptName}}
- {{filters.formatTimestamp(item.newsStartTime)}}
-
-
-
-
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxss b/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxss
deleted file mode 100644
index b884a8c..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/precautionList/precautionList.wxss
+++ /dev/null
@@ -1,71 +0,0 @@
-.news-list {
- width: 100%;
- background: #fff;
- box-sizing: border-box;
- padding: 0 35rpx;
- margin-top: 20rpx;
-}
-.news-list .list-item {
- width: 100%;
- height: 205rpx;
- box-sizing: border-box;
- padding: 30rpx 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-.news-list .list-item .right {
- width: calc(100% - 50rpx - 220rpx);
- height: 146rpx;
-}
-.news-list .list-item .right .title {
- color: #3f3f3f;
- font-size: 30rpx;
- line-height: 45rpx;
- display: -webkit-box;
- overflow: hidden;
- text-overflow: ellipsis;
- word-wrap: break-word;
- white-space: normal !important;
- -webkit-line-clamp: 2;
- -webkit-box-orient: vertical;
- height: 90rpx;
-}
-.news-list .list-item .right .bottom {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-top: 20rpx;
-}
-.news-list .list-item .right .bottom .category {
- color: #aaa;
- font-size: 22rpx;
- line-height: 48rpx;
- width: calc(100% - 150rpx);
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-.news-list .list-item .right .bottom .time {
- color: #aaa;
- font-size: 22rpx;
- line-height: 48rpx;
- width: 150rpx;
- text-align: right;
-}
-.news-list .list-item .left {
- width: 250rpx;
- height: 146rpx;
- border-radius: 12rpx;
- overflow: hidden;
-}
-.news-list .list-item .left image {
- width: 100%;
- height:100%;
-}
-.news-list .list-item + .list-item {
- border-top: 1rpx solid #ece9ec;
-}
-.news-list .hover-sudoku {
- background: rgba(0,0,0,0.1);
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.js b/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.js
deleted file mode 100644
index cc1a432..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.js
+++ /dev/null
@@ -1,24 +0,0 @@
-Component({
- properties: {
- sudokuState: {
- type: Object,
- value: {
- consultAvailable: '0',
- appraiseAvailable: '0'
- }
- },
- },
- data:{
- },
- methods: {
- showMyPolice(){
- this.triggerEvent('showMyPolice')
- },
- showPrecaution(){
- this.triggerEvent('showPrecaution')
- },
- showAnnouncement(){
- this.triggerEvent('showAnnouncement')
- }
-}
-})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.json b/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.json
deleted file mode 100644
index 32640e0..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "component": true
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxml b/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxml
deleted file mode 100644
index 59a3765..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxss b/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxss
deleted file mode 100644
index 5751c44..0000000
--- a/epdc-resident-mp-yushan/subpages/education/components/sudoku/sudoku.wxss
+++ /dev/null
@@ -1,111 +0,0 @@
-.sudoku {
- background:#fff;
- padding: 0 10rpx;
- margin-top: 20rpx;
-}
-.content {
- width: 100%;
- display: grid;
- grid-template-columns: 1fr 1fr 1fr;
- grid-template-rows: 215rpx;
- box-sizing: border-box;
-}
-.item {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-.item image {
- width:220rpx;
- height:130rpx;
-}
-.item .name {
- font-size: 28rpx;
- color: #3f3f3f;
-}
-.sudoku .hover-sudoku {
- background: rgba(0,0,0,0.1);
-}
-.info-group{
- width: 94%;
- margin-left: 20rpx;
- display: flex;
- line-height: 100rpx;
- padding-top: 20rpx;
-}
-.group-pic{
- width: 120rpx;
- height: 120rpx;
- border-radius: 60px;
- padding: 20rpx;
-}
-.group-detail{
- width: 50%;
- display: inline-block;
- padding-left: 40rpx;
- height: 120rpx;
-}
-.group-name{
- font-size: 30rpx;
- font-weight: bold;
- height: 75rpx;
- word-break: break-all;
- line-height: 50rpx;
-}
-.group-number{
- font-size: 25rpx;
- color: #999;
- height: 30rpx;
-}
-.group-join{
- display: inline-block;
- margin:0 auto;
-}
-.join-button{
- height: 55rpx;
- width: 110rpx;
- border-radius: 60rpx;
- background: #F82424;
- color: white;
- font-size: 30rpx;
- text-align: center;
- line-height: 50rpx;
- margin-top: 50rpx;
-}
-.join-text{
- font-size: 30rpx;
- position: relative;
- color: #fff;
- margin-top: -120rpx;
- margin-left: 20rpx;
-}
-.info-police{
- width: 94%;
- margin-left: 20rpx;
- display: flex;
- line-height: 100rpx;
- padding-top: 20rpx;
-}
-.group-pic{
- width: 120rpx;
- height: 120rpx;
- border-radius: 60px;
- padding: 20rpx;
-}
-.police-detail{
- width: 50%;
- display: inline-block;
- padding-left: 40rpx;
- height: 120rpx;
-}
-.police-name{
- font-size: 30rpx;
- height: 75rpx;
- word-break: break-all;
- line-height: 50rpx;
-}
-.no-police-data{
- margin-top: 200rpx;
- text-align: center;
-}
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/education/images/bm.png b/epdc-resident-mp-yushan/subpages/education/images/bm.png
index f3ed963..91a589b 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/bm.png and b/epdc-resident-mp-yushan/subpages/education/images/bm.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/collapse.png b/epdc-resident-mp-yushan/subpages/education/images/collapse.png
index d07c297..90958b6 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/collapse.png and b/epdc-resident-mp-yushan/subpages/education/images/collapse.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/enter.png b/epdc-resident-mp-yushan/subpages/education/images/enter.png
index 258c9d8..8098c85 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/enter.png and b/epdc-resident-mp-yushan/subpages/education/images/enter.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/jksh.png b/epdc-resident-mp-yushan/subpages/education/images/jksh.png
index b9024cb..3c86fb4 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/jksh.png and b/epdc-resident-mp-yushan/subpages/education/images/jksh.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/jmfx.png b/epdc-resident-mp-yushan/subpages/education/images/jmfx.png
index 30fa847..5b3a5f7 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/jmfx.png and b/epdc-resident-mp-yushan/subpages/education/images/jmfx.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/jypx.png b/epdc-resident-mp-yushan/subpages/education/images/jypx.png
index 1d2efe8..815b893 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/jypx.png and b/epdc-resident-mp-yushan/subpages/education/images/jypx.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/msfx.png b/epdc-resident-mp-yushan/subpages/education/images/msfx.png
index 9dc7ed8..485567f 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/msfx.png and b/epdc-resident-mp-yushan/subpages/education/images/msfx.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/sjjz.png b/epdc-resident-mp-yushan/subpages/education/images/sjjz.png
index e1b13c8..dde2671 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/sjjz.png and b/epdc-resident-mp-yushan/subpages/education/images/sjjz.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/sqjt.png b/epdc-resident-mp-yushan/subpages/education/images/sqjt.png
index 876f1b4..937eca4 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/sqjt.png and b/epdc-resident-mp-yushan/subpages/education/images/sqjt.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/xljz.png b/epdc-resident-mp-yushan/subpages/education/images/xljz.png
index a36f762..dfe2ce7 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/xljz.png and b/epdc-resident-mp-yushan/subpages/education/images/xljz.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/images/xqah.png b/epdc-resident-mp-yushan/subpages/education/images/xqah.png
index ccdd286..13ae89c 100644
Binary files a/epdc-resident-mp-yushan/subpages/education/images/xqah.png and b/epdc-resident-mp-yushan/subpages/education/images/xqah.png differ
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxss b/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxss
index ee94912..da7a224 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxss
+++ b/epdc-resident-mp-yushan/subpages/education/pages/class/class.wxss
@@ -99,7 +99,6 @@ page {
.propertyInfo{
margin-top: 10rpx;
width: 100%;
- background: #fff;
}
.info-item{
width: 94%;
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.json b/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.json
index a020ed7..bb33744 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.json
+++ b/epdc-resident-mp-yushan/subpages/education/pages/hobby/hobby.json
@@ -1,10 +1,5 @@
{
"usingComponents": {
- "banner":"../../components/banner/banner",
- "sudoku":"../../components/sudoku/sudoku",
- "policeInfo":"../../components/policeInfo/policeInfo",
- "announcementList":"../../components/announcementList/announcementList",
- "precautionList":"../../components/precautionList/precautionList",
"load-more":"../../components/loadMore/loadMore",
"complete-info-dialog": "../../../../components/completeInfoDialog/completeInfoDialog"
},
diff --git a/epdc-resident-mp-yushan/subpages/education/pages/index/index.json b/epdc-resident-mp-yushan/subpages/education/pages/index/index.json
index a020ed7..bb33744 100644
--- a/epdc-resident-mp-yushan/subpages/education/pages/index/index.json
+++ b/epdc-resident-mp-yushan/subpages/education/pages/index/index.json
@@ -1,10 +1,5 @@
{
"usingComponents": {
- "banner":"../../components/banner/banner",
- "sudoku":"../../components/sudoku/sudoku",
- "policeInfo":"../../components/policeInfo/policeInfo",
- "announcementList":"../../components/announcementList/announcementList",
- "precautionList":"../../components/precautionList/precautionList",
"load-more":"../../components/loadMore/loadMore",
"complete-info-dialog": "../../../../components/completeInfoDialog/completeInfoDialog"
},