diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 02d8f02..0bfd93e 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -155,8 +155,8 @@ Page({
getNewsList: function() {
let that = this
let para = {
- pageIndex: this.data.pageNo,
- pageSize: this.data.pageSize,
+ pageIndex: 1, //this.data.pageNo,
+ pageSize: 5, //this.data.pageSize,
timestamp: getTimestamp()
}
api.newsList(para).then(function(res) {
@@ -395,4 +395,31 @@ Page({
duration: 1000
})
},
+ //功能暂未开放
+ nofunction() {
+ wx.showToast({
+ title: '功能暂未开放~',
+ icon: 'none',
+ duration: 1000
+ })
+ },
+ //拨打电话
+ getPhone(e) {
+ wx.showModal({
+ title: '拨打电话',
+ content: `您确定拨打${e.currentTarget.dataset.number}`,
+ cancelColor: '#29B9A5',
+ confirmColor: '#29B9A5',
+ success: (res) => {
+ if (res.confirm) {
+ console.log('用户点击确定')
+ wx.makePhoneCall({
+ phoneNumber: e.currentTarget.dataset.number
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
+ }
+ })
+ }
})
\ No newline at end of file
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 011d395..20db117 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -1,6 +1,6 @@
@@ -8,16 +8,21 @@
-
-
-
- {{departmentName}}
-
+
+
+
+
+ {{departmentName}}
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -41,7 +46,7 @@
-
+
-
-
+
+
+
+
+
+
+
+ 83312345
-
+
+
+
+
+
+
+
+
+ -->
+
+
+
+
+ 积分排名
+
+
+
+ 通知公告
+
+
+
+ 了解锦水
+
+
+
+ 个人中心
+
-
diff --git a/pages/indexNew/indexNew.wxss b/pages/indexNew/indexNew.wxss
index f0b9ed8..8833d73 100644
--- a/pages/indexNew/indexNew.wxss
+++ b/pages/indexNew/indexNew.wxss
@@ -40,11 +40,14 @@ page {
.belong-grid {
width: 100%;
- height: 100rpx;
+ height: 160rpx;
position: relative;
+}
+
+.belong-grid .newbelong-grid {
display: flex;
flex-direction: row;
- align-items: center;
+ /* align-items: center; */
justify-content: space-between;
}
@@ -57,54 +60,70 @@ page {
z-index: 10;
}
-.belong-grid .grid {
+.belong-grid .newbelong-grid .grid {
/* width: 90%; */
width: calc(100% - 129rpx);
- height: 100%;
+ height: 34rpx;
position: relative;
z-index: 100;
display: flex;
align-items: center;
}
-.belong-grid .grid .party-logo {
+.belong-grid .newbelong-grid .grid .party-logo {
width: 24rpx;
height: 30rpx;
margin: 0 14rpx 0 22rpx;
}
-.belong-grid .grid .grid-name {
+.belong-grid .newbelong-grid .grid .grid-name {
font-size: 32rpx;
color: #fff;
}
-.belong-grid .grid .more-grid {
+.belong-grid .newbelong-grid .grid .more-grid {
width: 16rpx;
height: 22rpx;
margin-left: 10rpx;
margin-top: 5rpx;
}
-.belong-grid .my-and-news {
+.belong-grid .newbelong-grid .my-and-news {
width: 129rpx;
- height: 100%;
+ height: 34rpx;
position: relative;
z-index: 100;
display: flex;
align-items: center;
+ justify-content: flex-end;
}
-.belong-grid .my-and-news .news {
+.belong-grid .newbelong-grid .my-and-news .news {
width: 34rpx;
height: 34rpx;
+ margin-right: 24rpx;
}
-.belong-grid .my-and-news .my {
+.belong-grid .newbelong-grid .my-and-news .my {
width: 34rpx;
height: 34rpx;
margin-left: 30rpx;
}
+.belong-grid .newImage {
+ position: relative;
+ height: calc(100% - 34rpx);
+ z-index: 999;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.belong-grid .newImage image {
+ width: 576rpx;
+ height: 52rpx;
+}
+
/* .belong-grid .news {
width: 34rpx;
height: 34rpx;
@@ -207,6 +226,43 @@ page {
/* bannner *********** end */
+/* 新版通知 */
+
+.newnotice {
+ width: calc(100% - 88rpx);
+ height: 102rpx;
+ margin-left: 24rpx;
+ position: relative;
+ z-index: 888;
+ margin-top: -31rpx;
+ border-radius: 10rpx;
+ background: rgba(253, 253, 253, 1);
+ box-shadow: 0px 4px 29px 0px rgba(63, 63, 63, 0.1);
+ padding: 0 20rpx;
+ display: flex;
+ align-items: center;
+}
+
+.newnotice .image1 {
+ width: 46rpx;
+ height: 40rpx;
+}
+
+.newnotice .image2 {
+ width: 174rpx;
+ height: 40rpx;
+ margin-left: 11rpx;
+}
+
+.newnotice text {
+ font-size: 50rpx;
+ font-family: Impact;
+ font-weight: 400;
+ font-style: italic;
+ color: rgba(72, 72, 72, 1);
+ margin-left: 25rpx;
+}
+
/* 通知 start*/
.notice {
@@ -356,6 +412,59 @@ page {
/* 通知 end*/
+/* 我有事说新版 */
+
+.grid-all-new {
+ height: 278rpx;
+ width: calc(100% - 42rpx);
+ margin-top: 29rpx;
+ margin-left: 21rpx;
+}
+
+.grid-all-new .weui-btn-left {
+ height: 100%;
+ width: 50%;
+ padding: 0;
+ border: none;
+ float: left;
+}
+
+.hover-btn {
+ box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
+ border: 1px solid #666;
+}
+
+.weui-btn-left+.weui-btn-left {
+ margin-top: 0 !important;
+}
+
+.grid-all-new .weui-btn-left image {
+ height: 100%;
+ width: 100%;
+}
+
+.grid-all-new .weui-btn-right {
+ height: 100%;
+ width: 50%;
+ float: left;
+}
+
+.grid-all-new .weui-btn-right .weui-btn-top {
+ height: 50%;
+ width: 100%;
+ padding: 0;
+ border: none;
+}
+
+.weui-btn-top+.weui-btn-top {
+ margin-top: 0 !important;
+}
+
+.grid-all-new .weui-btn-right .weui-btn-top image {
+ height: 100%;
+ width: 100%;
+}
+
/* 我有事说 */
.grid-all {
@@ -394,6 +503,7 @@ page {
.list-all {
width: calc(100% - 48rpx);
margin-left: 21rpx;
+ margin-top: 50rpx;
}
.list-all .list-item {
@@ -403,6 +513,10 @@ page {
align-items: center;
}
+.list-all .list-item:first-child {
+ border-top: 1rpx solid #eaeaea;
+}
+
.list-all .list-item:last-child {
border: none;
}
@@ -456,3 +570,44 @@ page {
color: #999;
padding: 20rpx;
}
+
+/* 九宫格 */
+
+.grid-new {
+ width: 100%;
+ height: 174rpx;
+}
+
+.grid-new-item {
+ width: 25%;
+ height: 174rpx;
+ float: left;
+ /* display: flex;
+ justify-content: center; *//* align-items: center; */
+}
+
+.grid-new-item .grid-new-text {
+ height: 48rpx;
+ width: 100%;
+ font-size: 28rpx;
+ line-height: 48rpx;
+ font-weight: 500;
+ color: rgba(63, 63, 63, 1);
+ text-align: center;
+}
+
+.grid-new-item .grid-new-btn {
+ height: 126rpx;
+ width: 126rpx;
+ padding: 0;
+ border: none;
+}
+
+.grid-new-btn+.grid-new-btn {
+ margin-top: 0 !important;
+}
+
+.grid-new-item .grid-new-btn image {
+ height: 100%;
+ width: 100%;
+}