diff --git a/epdc-resident-mp-yushan/app.json b/epdc-resident-mp-yushan/app.json
index 92e11ef..4b2fb2e 100644
--- a/epdc-resident-mp-yushan/app.json
+++ b/epdc-resident-mp-yushan/app.json
@@ -251,37 +251,6 @@
}
},
- "tabBar": {
- "color": "#666666",
- "selectedColor": "#27be99",
- "backgroundColor": "#FFFFFF",
- "borderStyle": "white",
- "list": [{
- "pagePath": "pages/index/index",
- "text": "首页",
- "iconPath": "images/home.png",
- "selectedIconPath": "images/home-active.png"
- },
- {
- "pagePath": "pages/association/association",
- "text": "左邻右舍",
- "iconPath": "images/association.png",
- "selectedIconPath": "images/group-active.png"
- },
- {
- "pagePath": "pages/property/property",
- "text": "我的物业",
- "iconPath": "images/property.png",
- "selectedIconPath": "images/property-active.png"
- },
- {
- "pagePath": "pages/mine/mine",
- "text": "我的",
- "iconPath": "images/mine.png",
- "selectedIconPath": "images/mine-active.png"
- }
- ]
- },
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js
index 78500dd..b50eff7 100644
--- a/epdc-resident-mp-yushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/pages/index/index.js
@@ -37,16 +37,11 @@ Page({
},
{
icon:
- 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png',
+ 'https://epdc-yushan.elinkservice.cn/files-pro/20220324/118ea106d9ed40978f3e23cc51b43119.png',
+ // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/59b127e9fc8042969334c31fe0272c3f.png', // 蓝色
tip: '指尖榆山',
module: 'fingerYushan',
},
- {
- icon:
- 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/ccbab2a8a4a847548a72972770009576.png',
- tip: '网格队伍',
- module: 'gridArmy',
- },
{
icon:
'https://epdc-yushan.elinkservice.cn/files-pro/20211009/db945b5cc30147df80923f6c5928074f.png',
@@ -55,10 +50,22 @@ Page({
},
{
icon:
- 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/47c5baebb4d54987b4faebfeadd92a25.png',
- tip: '社会组织',
- module: 'societyOrg',
+ 'https://epdc-yushan.elinkservice.cn/files-pro/20220324/1083316800d948b4a8a4206dcb857722.png',
+ tip: '个人中心',
+ module: 'personalCenter',
},
+ // {
+ // icon:
+ // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/ccbab2a8a4a847548a72972770009576.png',
+ // tip: '网格队伍',
+ // module: 'gridArmy',
+ // },
+ // {
+ // icon:
+ // 'https://epdc-yushan.elinkservice.cn/files-pro/20211009/47c5baebb4d54987b4faebfeadd92a25.png',
+ // tip: '社会组织',
+ // module: 'societyOrg',
+ // },
],
serviceImgUrl: '',
servicePhone: '',
@@ -444,6 +451,10 @@ Page({
wx.navigateTo({
url: '/subpages/fingertipYushan/pages/index/index',
})
+ } else if (module === 'personalCenter') {
+ wx.navigateTo({
+ url: '/pages/mine/mine'
+ })
}
},
// 我有事要说跳转
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml
index d9fec2e..6d73dc5 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxml
+++ b/epdc-resident-mp-yushan/pages/index/index.wxml
@@ -2,7 +2,7 @@
@@ -25,9 +25,9 @@
-
+
@@ -62,7 +62,7 @@
-->
-
+
+
+
+
+
+
+
+
+
+
diff --git a/epdc-resident-mp-yushan/pages/index/index.wxss b/epdc-resident-mp-yushan/pages/index/index.wxss
index 443e857..f115adf 100644
--- a/epdc-resident-mp-yushan/pages/index/index.wxss
+++ b/epdc-resident-mp-yushan/pages/index/index.wxss
@@ -11,7 +11,8 @@ page {
top: 0;
left: 0;
z-index: 1000;
- background: #349c83;
+ background: #bb0300;
+ /* background: #349c83; */
}
.header .header-bg {
@@ -34,12 +35,19 @@ page {
z-index: 100;
letter-spacing: 2rpx;
}
+.header .navigation image {
+ width: 150rpx;
+ height: 50rpx;
+}
.belong-grid {
width: 100%;
- height: 160rpx;
+ height: 70rpx;
position: relative;
- background: linear-gradient(to bottom, #349c83, #39b092);
+ background: #bb0300;
+ padding-top: 14rpx;
+ box-sizing: border-box;
+ /* background: linear-gradient(to bottom, #349c83, #39b092); */
}
.belong-grid .newbelong-grid {
@@ -262,6 +270,36 @@ page {
margin-right: 20rpx;
}
.grid-list {
+ width: 100%;
+ height: 300rpx;
+ margin: -30rpx auto 0;
+ position: relative;
+ background: #ffffff;
+ padding: 28rpx 24rpx;
+ box-sizing: border-box;
+ border-radius: 20rpx 20rpx 0 0;
+ display: flex;
+}
+.grid-list .grid-item-left {
+
+}
+.grid-list .grid-item-left image {
+ width: 336rpx;
+ height: 272rpx;
+ float: none;
+}
+.grid-list .grid-item-right {
+ display: flex;
+ flex-direction: column;
+ height: 272rpx;
+}
+.grid-list .grid-item-right image {
+ width: 360rpx;
+ height: 136rpx;
+ float: none;
+ margin-top: 4rpx;
+}
+/* .grid-list {
width: 100%;
display: flex;
align-items: center;
@@ -296,7 +334,7 @@ page {
color: #333;
font-size: 30rpx;
line-height: 50rpx;
-}
+} */
/* .grid-list {
width: 100%;
box-sizing: border-box;
diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index 3500fc4..bee3e14 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
}
})
let that = this
- const versionNum = '1.2.29'
+ const versionNum = '1.2.31'
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data ? res.data.scanFlag : '1'
diff --git a/epdc-resident-mp-yushan/subpages/association/pages/associationDetail/associationDetail.js b/epdc-resident-mp-yushan/subpages/association/pages/associationDetail/associationDetail.js
index 21eaa80..78e2cab 100644
--- a/epdc-resident-mp-yushan/subpages/association/pages/associationDetail/associationDetail.js
+++ b/epdc-resident-mp-yushan/subpages/association/pages/associationDetail/associationDetail.js
@@ -255,7 +255,7 @@ Page({
icon: 'none',
duration: 2000
})
- wx.switchTab({
+ wx.navigateTo({
url: '/pages/association/association'
})
}).catch(err => {
diff --git a/epdc-resident-mp-yushan/subpages/association/pages/createassociation/createassociation.js b/epdc-resident-mp-yushan/subpages/association/pages/createassociation/createassociation.js
index 5a3fa66..cde4c5b 100644
--- a/epdc-resident-mp-yushan/subpages/association/pages/createassociation/createassociation.js
+++ b/epdc-resident-mp-yushan/subpages/association/pages/createassociation/createassociation.js
@@ -182,14 +182,16 @@ Page({
},
// 关闭弹框
closeDialog () {
- wx.switchTab({
- url: '/pages/association/association'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/association/association'
+ // })
},
// 弹框确定按钮
confirmDialog () {
- wx.switchTab({
- url: '/pages/association/association'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/association/association'
+ // })
}
})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js b/epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js
index fb76946..8fb4657 100644
--- a/epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js
+++ b/epdc-resident-mp-yushan/subpages/discussion/pages/addIssue/addIssue.js
@@ -336,8 +336,9 @@ Page({
},
// 知道了 确认按钮
confirmDialog () {
- wx.switchTab({
- url: '/pages/discussion/discussion'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/discussion/discussion'
+ // })
}
})
\ No newline at end of file
diff --git a/epdc-resident-mp-yushan/subpages/discussion/pages/publishEvaluation/components/evaluationCallback/evaluationCallback.js b/epdc-resident-mp-yushan/subpages/discussion/pages/publishEvaluation/components/evaluationCallback/evaluationCallback.js
index 4667c2b..f07ea77 100644
--- a/epdc-resident-mp-yushan/subpages/discussion/pages/publishEvaluation/components/evaluationCallback/evaluationCallback.js
+++ b/epdc-resident-mp-yushan/subpages/discussion/pages/publishEvaluation/components/evaluationCallback/evaluationCallback.js
@@ -30,7 +30,7 @@ Component({
},
methods: {
backDiscussion () {
- wx.switchTab({
+ wx.navigateTo({
url: '/pages/discussion/discussion'
})
},
diff --git a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
index 49f0acb..4a7b697 100644
--- a/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
+++ b/epdc-resident-mp-yushan/subpages/extend/pages/tripReport/tripReport.js
@@ -284,7 +284,7 @@ Page({
_this.showToast('提交成功')
setTimeout(() => {
_this.data.lock = false
- wx.switchTab({
+ wx.reLaunch({
url: '/pages/index/index',
})
}, 1000)
diff --git a/epdc-resident-mp-yushan/subpages/home/pages/info/info.js b/epdc-resident-mp-yushan/subpages/home/pages/info/info.js
index cbc168f..af0868b 100644
--- a/epdc-resident-mp-yushan/subpages/home/pages/info/info.js
+++ b/epdc-resident-mp-yushan/subpages/home/pages/info/info.js
@@ -54,7 +54,7 @@ Page({
})
if (type === '0') {
if (businessType === 'groupUserReviewPassed' || businessType === 'groupPassed' || businessType === 'groupUserReviewNotPass') {
- wx.switchTab({
+ wx.navigateTo({
url: '/pages/association/association'
})
} else if (businessType === 'groupNotPassedOrDisband') {
@@ -132,7 +132,7 @@ Page({
})
}
} else if (type === '3') {
- wx.switchTab({
+ wx.navigateTo({
url: '/pages/association/association'
})
}
diff --git a/epdc-resident-mp-yushan/subpages/integralCentre/pages/index/index.wxss b/epdc-resident-mp-yushan/subpages/integralCentre/pages/index/index.wxss
index f74a177..23ad8f2 100644
--- a/epdc-resident-mp-yushan/subpages/integralCentre/pages/index/index.wxss
+++ b/epdc-resident-mp-yushan/subpages/integralCentre/pages/index/index.wxss
@@ -14,17 +14,21 @@ page {
display: flex;
flex-direction: column;
align-items: center;
+ position: relative;
}
.title .exchange-enter {
- width: 100%;
- height: 50rpx;
- line-height: 50rpx;
+ width: 150rpx;
+ height: 80rpx;
+ line-height: 80rpx;
padding: 0 30rpx;
box-sizing: border-box;
- font-size: 28rpx;
- text-align: right;
+ font-size: 32rpx;
+ text-align: center;
color: rgba(255, 255, 255, 1);
+ position: absolute;
+ top: 20px;
+ right: 20px;
}
.title .number {
@@ -33,7 +37,7 @@ page {
line-height: 86rpx;
font-weight: bold;
color: rgba(255, 255, 255, 1);
- margin-top: 10rpx;
+ margin-top: 60rpx;
}
.title .name {
diff --git a/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js b/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js
index 3574a10..1839f49 100644
--- a/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js
+++ b/epdc-resident-mp-yushan/subpages/property/pages/associationDetail/associationDetail.js
@@ -257,9 +257,10 @@ Page({
icon: 'none',
duration: 2000
})
- wx.switchTab({
- url: '/pages/association/association'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/association/association'
+ // })
}).catch(err => {
console.log(err)
})
diff --git a/epdc-resident-mp-yushan/subpages/property/pages/createassociation/createassociation.js b/epdc-resident-mp-yushan/subpages/property/pages/createassociation/createassociation.js
index 5a3fa66..cde4c5b 100644
--- a/epdc-resident-mp-yushan/subpages/property/pages/createassociation/createassociation.js
+++ b/epdc-resident-mp-yushan/subpages/property/pages/createassociation/createassociation.js
@@ -182,14 +182,16 @@ Page({
},
// 关闭弹框
closeDialog () {
- wx.switchTab({
- url: '/pages/association/association'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/association/association'
+ // })
},
// 弹框确定按钮
confirmDialog () {
- wx.switchTab({
- url: '/pages/association/association'
- })
+ wx.navigateBack()
+ // wx.switchTab({
+ // url: '/pages/association/association'
+ // })
}
})
\ No newline at end of file