diff --git a/miniprogram/custom-tab-bar/index.js b/miniprogram/custom-tab-bar/index.js index 70dc56a..da9f7fb 100644 --- a/miniprogram/custom-tab-bar/index.js +++ b/miniprogram/custom-tab-bar/index.js @@ -6,7 +6,7 @@ Component({ selectedColor: "#F13A47", "list": [ { - "pagePath": "/pages/home/home", + "pagePath": "/pages/index/index", "text": "首页", "iconPath": "/images/main/icon01.png", "selectedIconPath": "/images/main/icon01-a.png" diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index dae0bc7..6003ec0 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -1,3 +1,4 @@ + const app = getApp() const api = require("../../utils/api") const homeApi = require("../../utils/home") @@ -40,63 +41,66 @@ Page({ signMsg: "", signCode: 0, isSignUp: 0, - communityId: "" // 社区id + communityId: "",// 社区id + statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度 + navigationHeight: app.globalData.deviceInfo.navigationHeight, }, + async onLoad(options) { - wx.showLoading({ - title: "加载中,请稍后", - mask: true - }) - if (options.shareType) { - const para = { - shareType: options.shareType, - detailId: options.detailId, - infoCompleted: options.infoCompleted ? options.infoCompleted : "", - type: options.detailType ? options.detailType : "", - showClassify: options.showClassify ? options.showClassify : "", - nowGridId: options.nowGridId ? options.nowGridId : "" - } - wx.setStorageSync("shareObj", JSON.stringify(para)) - } - if (options.scene) { - this.setData({ - statusHeight: app.globalData.deviceInfo.statusHeight, - navigationHeight: app.globalData.deviceInfo.navigationHeight, - gridId: options.scene, - }) - } else { - this.setData({ - statusHeight: app.globalData.deviceInfo.statusHeight, - navigationHeight: app.globalData.deviceInfo.navigationHeight, - }) - } + // wx.showLoading({ + // title: "加载中,请稍后", + // mask: true + // }) + // if (options.shareType) { + // const para = { + // shareType: options.shareType, + // detailId: options.detailId, + // infoCompleted: options.infoCompleted ? options.infoCompleted : "", + // type: options.detailType ? options.detailType : "", + // showClassify: options.showClassify ? options.showClassify : "", + // nowGridId: options.nowGridId ? options.nowGridId : "" + // } + // wx.setStorageSync("shareObj", JSON.stringify(para)) + // } + // if (options.scene) { + // this.setData({ + // statusHeight: app.globalData.deviceInfo.statusHeight, + // navigationHeight: app.globalData.deviceInfo.navigationHeight, + // gridId: options.scene, + // }) + // } else { + // this.setData({ + // statusHeight: app.globalData.deviceInfo.statusHeight, + // navigationHeight: app.globalData.deviceInfo.navigationHeight, + // }) + // } - // 切换网格的时候,更换网格id - if (options.departmentId) { - this.setData({ - departmentId: options.departmentId - }) - } - await this.getUserState() - this.data.isCarryLoad = true + // // 切换网格的时候,更换网格id + // if (options.departmentId) { + // this.setData({ + // departmentId: options.departmentId + // }) + // } + // // await this.getUserState() + // this.data.isCarryLoad = true }, onTabItemTap() { - this.getUserState() + // this.getUserState() }, onShow() { // 检查版本更新 - checkoutVersion() - this.getFirstInfo() + // checkoutVersion() + // this.getFirstInfo() }, onReachBottom() { - this.setData({ - loadMoreVisible: true - }) - if (this.data.loadMoreType === "loading") { - this.data.pageNo += 1 - this.getNewsList() - } + // this.setData({ + // loadMoreVisible: true + // }) + // if (this.data.loadMoreType === "loading") { + // this.data.pageNo += 1 + // this.getNewsList() + // } }, // 根据微信code查询用户当前状态 getUserState() { diff --git a/miniprogram/pages/index/index.json b/miniprogram/pages/index/index.json index 2572627..e94a2cb 100644 --- a/miniprogram/pages/index/index.json +++ b/miniprogram/pages/index/index.json @@ -1,18 +1,11 @@ { - "navigationBarTitleText": "党群e家", - "navigationStyle": "custom", - "navigationBarTextStyle": "white", - "usingComponents": { - "banner": "./components/banner/banner", - "sudoku": "./components/sudoku/sudoku", - "notice": "./components/notice/notice", - "project": "./components/project/project", - "news-list":"./components/newsList/newsList", - "load-more": "../../components/loadMore/loadMore", - "complete-info-dialog": "../../components/completeInfoDialog/completeInfoDialog", - "wux-popup": "../../dist/popup/index" - }, - "enablePullDownRefresh": true, - "backgroundColor": "#f8f8f8", - "backgroundTextStyle": "dark" -} \ No newline at end of file + "navigationBarTitleText": "党群e家", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "usingComponents": { + + }, + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index e69f96b..ad642c8 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -1,12 +1,86 @@ - - - - 党群e家 - + + + + 首页 + + + + + + + 新锋支部 + + + + 骑士驿站 + + + + 网格力量 + + + + 北尚先锋 + + + + + + + + 在职党员 + 到居住社区报到 + + + + + + + + + 红色尖兵 + 志愿服务队 + + + + - - - + + + 推荐 + + + + + 围绕“经济抓党建,抓好党建促 发展”主题展开活动 + + 2023-05-22XXX社区党支部 + + + + + + + 围绕“经济抓党建,抓好党建促 发展”主题展开活动 + + 2023-05-22XXX社区党支部 + + + + + + + 围绕“经济抓党建,抓好党建促 发展”主题展开活动 + + 2023-05-22XXX社区党支部 + + + + + + + + - - - - - - - - - - - - - - + --> + + + + + + + + + + + + + + + - - 确定 - \ No newline at end of file + \ No newline at end of file diff --git a/miniprogram/pages/index/index.wxss b/miniprogram/pages/index/index.wxss index 3efdafa..62c9b30 100644 --- a/miniprogram/pages/index/index.wxss +++ b/miniprogram/pages/index/index.wxss @@ -1,127 +1,287 @@ page { - width: 100%; - height: auto; - overflow-y: auto; - background: #f7f7f7; + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; + font-family: PingFang SC; } .header { - position: fixed; - width: 100%; - top: 0; - left: 0; - z-index: 1000; + + width: 100%; + height: 484rpx; + /* position: fixed; + top: 0; + left: 0; + z-index: 1000; */ } + .header .header-bg { - width: 100%; - height: 100%; - position: absolute; - z-index: 10; - left: 0; - top: 0; + width: 100%; + height: 100%; + /* position: absolute; + z-index: 10; + left: 0; + top: 0; */ + position: absolute; + height: 100%; + z-index: -999; } + .header .navigation { - width: 100%; - display: flex; - align-items: center; - justify-content: center; - color: rgba(255,255,255, 0.9); - font-size: 32rpx; - position: relative; - z-index: 100; + width: 100%; + display: flex; + align-items: center; + justify-content: center; + color: rgba(255, 255, 255, 0.9); + font-size: 32rpx; + position: relative; + z-index: 100; } .home { - width: 100%; + width: 100%; } + .belong-grid { - width: 100%; - height: 100rpx; - position: relative; + width: 100%; + height: 100rpx; + position: relative; } + .belong-grid .belong-grid-bg { - width: 100%; - height: 100%; - position: absolute; - top: 0; - left: 0; - z-index: 10; + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; + z-index: 0; + } + .belong-grid .grid { - width: 100%; - height: 100%; - position: relative; - z-index: 100; - display: flex; - align-items: center; + width: 100%; + height: 100%; + position: relative; + z-index: 100; + display: flex; + align-items: center; } + .belong-grid .grid .party-logo { - width: 32rpx; - height: 32rpx; - margin: 0 10rpx 0 23rpx; + width: 32rpx; + height: 32rpx; + margin: 0 10rpx 0 23rpx; } + .belong-grid .grid .grid-name { - font-size: 32rpx; - color: #fff; + font-size: 32rpx; + color: #fff; } + .belong-grid .grid .more-grid { - width: 18rpx; - height: 26rpx; - margin-left: 10rpx; + width: 18rpx; + height: 26rpx; + margin-left: 10rpx; } + .belong-grid .newbelong-grid { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - width: 100%; - height: 100rpx; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + width: 100%; + height: 100rpx; } .belong-grid .newbelong-grid .signin-btn { - width: 140rpx; - height: 44rpx; - position: absolute; - z-index: 99; - right: 30rpx; + width: 140rpx; + height: 44rpx; + position: absolute; + z-index: 99; + right: 30rpx; } .belong-grid .newbelong-grid .signin-btn image { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .belong-grid .newbelong-grid .grid { - /* width: 90%; */ - width: calc(100% - 170rpx); - height: 34rpx; - position: relative; - z-index: 100; - display: flex; - align-items: center; + /* width: 90%; */ + width: calc(100% - 170rpx); + height: 34rpx; + position: relative; + z-index: 100; + display: flex; + align-items: center; } .belong-grid .newbelong-grid .grid .party-logo { - width: 24rpx; - height: 30rpx; - margin: 0 14rpx 0 22rpx; + width: 24rpx; + height: 30rpx; + margin: 0 14rpx 0 22rpx; } .belong-grid .newbelong-grid .grid .grid-name { - font-size: 32rpx; - color: #fff; + font-size: 32rpx; + color: #fff; } .belong-grid .newbelong-grid .grid .more-grid { - width: 16rpx; - height: 22rpx; - margin-left: 10rpx; - margin-top: 5rpx; + width: 16rpx; + height: 22rpx; + margin-left: 10rpx; + margin-top: 5rpx; } .popup__button { - width: 100%; - text-align: center; - font-size: 36rpx; - color: #04BCA0; + width: 100%; + text-align: center; + font-size: 36rpx; + color: #04BCA0; +} + +.bgw { + background-color: #fff; + margin: 20rpx; + + border-radius: 20rpx; + padding: 40rpx 30rpx; + box-sizing: border-box; + z-index: 1; +} + +.gridouter { + display: flex; + justify-content: space-around; + +} + +.grid { + width: 25%; + text-align: center; + font-size: 28rpx; + line-height: 56rpx; + color: #333333; +} + +.grid image { + width: 80rpx; + height: 80rpx; + +} + +.grid2outer { + display: flex; + justify-content: space-between; + +} + +.grid2 { + flex: 1; + background: linear-gradient(90deg, #F5F9FE 0%, #FBFDFF 100%); + border-radius: 16rpx; + display: flex; + padding: 30rpx; + margin: 20rpx 0rpx 0rpx; +} + + +.grid2 .h1 { + font-size: 32rpx; + font-weight: bold; + line-height: 36rpx; +} + +.grid2 .h2 { + height: 23rpx; + font-size: 24rpx; + line-height: 36rpx; +} + +.grid2 image { + width: 64rpx; + height: 64rpx; + margin-right: 10rpx +} + +.blue { + background: linear-gradient(90deg, #F5F9FE 0%, #FBFDFF 100%); +} + +.blue .h1 { + color: #5A89B7; +} + +.blue .h2 { + color: #80A4C7; +} + +.red { + background: linear-gradient(90deg, #FEFBF0 0%, #FFFDF9 100%); +} + +.red .h1 { + color: #CD9058; +} + +.red .h2 { + color: #C89C74; +} + +.topf50 { + margin-top: -50rpx; +} + +.top16 { + margin-top: 16rpx +} + +.w40 { + width: 40rpx; +} +.vbetween{ + display: flex; + flex-direction: column; + justify-content:space-between; +} +.title01 { + font-size: 36rpx; + font-family: FZZongYi-M05; + font-weight: 400; + color: #121212; + line-height: 42rpx; +} + +.home_news_list { + padding: 20rpx 0rpx +} + +.home_news_list .item { + padding: 20rpx 0rpx; + border-bottom: solid #EAEAEA 1px; + display: flex; +} + +.home_news_list .item image { + width: 220rpx; + height: 140rpx; + margin-right: 18rpx; + border-radius: 12rpx; +} + +.home_news_list .item .h1 { + font-size: 32rpx; + color: #333333; + line-height: 40rpx; +} + +.home_news_list .item .h2 { + font-size: 24rpx; + color: #AAAAAA; + line-height: 24rpx; +} +.home_news_list .item .h2 .time{ + float: right; } \ No newline at end of file diff --git a/miniprogram/subpages/knight/pages/knight/knight.wxml b/miniprogram/subpages/knight/pages/knight/knight.wxml index 62247a6..46d0eb7 100644 --- a/miniprogram/subpages/knight/pages/knight/knight.wxml +++ b/miniprogram/subpages/knight/pages/knight/knight.wxml @@ -48,7 +48,7 @@ 骑先锋 - 申请加入红色网格员。 + 申请加入网格力量。 diff --git a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.json b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.json index a756297..04685c4 100644 --- a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.json +++ b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "西海岸先锋", + "navigationBarTitleText": "北尚先锋", "navigationStyle": "custom", "navigationBarTextStyle": "white", "enablePullDownRefresh": true, diff --git a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml index 37f2801..b6292b6 100644 --- a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml +++ b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml @@ -2,7 +2,7 @@ - 西海岸先锋 + 北尚先锋 @@ -12,8 +12,8 @@ - 扫码关注“西海岸先锋” - 点击上图,长按可进入“西海岸先锋”公众号 + 扫码关注“北尚先锋” + 点击上图,长按可进入“北尚先锋”公众号 diff --git a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.json b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.json index f7df8c8..1ba9197 100644 --- a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.json +++ b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "红色网格员", + "navigationBarTitleText": "网格力量", "navigationStyle": "custom", "navigationBarTextStyle": "white", "enablePullDownRefresh": true, diff --git a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml index 470943f..c2ff16d 100644 --- a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml +++ b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml @@ -2,7 +2,7 @@ - 红色网格员 + 网格力量 @@ -48,7 +48,7 @@ 网格风采 - 申请加入红色网格员。 + 申请加入网格力量。 diff --git a/miniprogram/subpages/redSail/pages/redSail/redSail.json b/miniprogram/subpages/redSail/pages/redSail/redSail.json index d518ddc..755a817 100644 --- a/miniprogram/subpages/redSail/pages/redSail/redSail.json +++ b/miniprogram/subpages/redSail/pages/redSail/redSail.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "红帆支队", + "navigationBarTitleText": "新锋支部", "navigationStyle": "custom", "navigationBarTextStyle": "white", "enablePullDownRefresh": true, diff --git a/miniprogram/subpages/redSail/pages/redSail/redSail.wxml b/miniprogram/subpages/redSail/pages/redSail/redSail.wxml index 3df5bd7..098fc66 100644 --- a/miniprogram/subpages/redSail/pages/redSail/redSail.wxml +++ b/miniprogram/subpages/redSail/pages/redSail/redSail.wxml @@ -10,7 +10,7 @@ - 红帆领航 + 新锋领航 在认真完成《中国共产党章···