diff --git a/miniprogram/app.json b/miniprogram/app.json index da3a888..863c546 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,7 +1,6 @@ { "pages": [ "pages/home/home", - "pages/message/message", "pages/my/my", "pages/index/index", @@ -26,14 +25,18 @@ "root": "subpages/redSail", "name": "redSail", "pages": [ - "pages/redSail/redSail" + "pages/redSail/redSail", + "pages/registerParty/registerParty", + "pages/flowParty/flowParty", + "pages/event/event" ] }, { "root": "subpages/knight", "name": "knight", "pages": [ - "pages/knight/knight" + "pages/knight/knight", + "pages/knight/brief/brief" ] }, { @@ -54,7 +57,8 @@ "root": "subpages/checkIn", "name": "checkIn", "pages": [ - "pages/checkIn/checkIn" + "pages/checkIn/checkIn", + "pages/checkIn/register/register" ] }, { @@ -64,10 +68,6 @@ "pages/volunteer/volunteer" ] }, - - - - { "root": "subpages/home", "name": "home", @@ -269,7 +269,6 @@ "iconPath": "images/main/icon02.png", "selectedIconPath": "images/main/icon02-a.png" }, - { "pagePath": "pages/my/my", "text": "我的", @@ -278,7 +277,6 @@ } ] }, - "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", diff --git a/miniprogram/custom-tab-bar/index.js b/miniprogram/custom-tab-bar/index.js index da9f7fb..160406e 100644 --- a/miniprogram/custom-tab-bar/index.js +++ b/miniprogram/custom-tab-bar/index.js @@ -6,17 +6,17 @@ Component({ selectedColor: "#F13A47", "list": [ { - "pagePath": "/pages/index/index", - "text": "首页", + "pagePath": "/pages/home/home", + "text": "", "iconPath": "/images/main/icon01.png", "selectedIconPath": "/images/main/icon01-a.png" }, - { - "pagePath": "/pages/message/message", - "text": "消息", - "iconPath": "/images/main/icon02.png", - "selectedIconPath": "/images/main/icon02-a.png" - }, + // { + // "pagePath": "/pages/message/message", + // "text": "消息", + // "iconPath": "/images/main/icon02.png", + // "selectedIconPath": "/images/main/icon02-a.png" + // }, { "pagePath": "/pages/my/my", @@ -35,7 +35,7 @@ Component({ }, methods: { switchTab(e) { - // console.log(e); + console.log(e); const data = e.currentTarget.dataset; const url = data.path; app.globalData.selected = data.index; diff --git a/miniprogram/images/association/ic_chuangjianshequn@3x.png b/miniprogram/images/association/ic_chuangjianshequn@3x.png deleted file mode 100644 index 351bfa9..0000000 Binary files a/miniprogram/images/association/ic_chuangjianshequn@3x.png and /dev/null differ diff --git a/miniprogram/images/main/home01.png b/miniprogram/images/main/home01.png deleted file mode 100644 index f35102a..0000000 Binary files a/miniprogram/images/main/home01.png and /dev/null differ diff --git a/miniprogram/images/main/home02.png b/miniprogram/images/main/home02.png deleted file mode 100644 index 7a7d497..0000000 Binary files a/miniprogram/images/main/home02.png and /dev/null differ diff --git a/miniprogram/images/main/home03.png b/miniprogram/images/main/home03.png deleted file mode 100644 index 9248bc8..0000000 Binary files a/miniprogram/images/main/home03.png and /dev/null differ diff --git a/miniprogram/images/main/home04.png b/miniprogram/images/main/home04.png deleted file mode 100644 index 29c61fa..0000000 Binary files a/miniprogram/images/main/home04.png and /dev/null differ diff --git a/miniprogram/images/main/home05.png b/miniprogram/images/main/home05.png deleted file mode 100644 index fc023e1..0000000 Binary files a/miniprogram/images/main/home05.png and /dev/null differ diff --git a/miniprogram/images/main/home06.png b/miniprogram/images/main/home06.png deleted file mode 100644 index 2acc9bd..0000000 Binary files a/miniprogram/images/main/home06.png and /dev/null differ diff --git a/miniprogram/images/main/home1.png b/miniprogram/images/main/home1.png new file mode 100644 index 0000000..b3cb8c8 Binary files /dev/null and b/miniprogram/images/main/home1.png differ diff --git a/miniprogram/images/main/home2.png b/miniprogram/images/main/home2.png new file mode 100644 index 0000000..c5a5e72 Binary files /dev/null and b/miniprogram/images/main/home2.png differ diff --git a/miniprogram/images/main/home3.png b/miniprogram/images/main/home3.png new file mode 100644 index 0000000..de229b4 Binary files /dev/null and b/miniprogram/images/main/home3.png differ diff --git a/miniprogram/images/main/home4.png b/miniprogram/images/main/home4.png new file mode 100644 index 0000000..f51dd9d Binary files /dev/null and b/miniprogram/images/main/home4.png differ diff --git a/miniprogram/images/main/home5.png b/miniprogram/images/main/home5.png new file mode 100644 index 0000000..89ca712 Binary files /dev/null and b/miniprogram/images/main/home5.png differ diff --git a/miniprogram/images/main/home6.png b/miniprogram/images/main/home6.png new file mode 100644 index 0000000..ccd0461 Binary files /dev/null and b/miniprogram/images/main/home6.png differ diff --git a/miniprogram/images/main/home_top.png b/miniprogram/images/main/home_top.png index 4251e62..9d83b16 100644 Binary files a/miniprogram/images/main/home_top.png and b/miniprogram/images/main/home_top.png differ diff --git a/miniprogram/pages/home/home.js b/miniprogram/pages/home/home.js index 7050845..b7c83fa 100644 --- a/miniprogram/pages/home/home.js +++ b/miniprogram/pages/home/home.js @@ -32,6 +32,7 @@ Page({ street: "",//所在街道 isCarryLoad: false, userId: "", + userInfo: { nickname: "", mobile: "", @@ -41,7 +42,15 @@ Page({ signMsg: "", signCode: 0, isSignUp: 0, - communityId: "" // 社区id + communityId: "", // 社区id + tabList:[ + {url:'/subpages/redSail/pages/redSail/redSail',src:'../../images/main/home1.png',text:'新锋支部'}, + {url:'/subpages/knight/pages/knight/knight',src:'../../images/main/home2.png',text:'新锋驿站'}, + {url:'/subpages/checkIn/pages/checkIn/register/register',src:'../../images/main/home3.png',text:'在职党员到居住社区报到'}, + {url:'/subpages/volunteer/pages/volunteer/volunteer',src:'../../images/main/home4.png',text:'红色志愿服务队'}, + {url:'/subpages/redGrider/pages/redGrider/redGrider',src:'../../images/main/home5.png',text:'网格力量'}, + {url:'',src:'../../images/main/home6.png',text:'新新向党'}, + ], }, async onLoad(options) { diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml index ca7e39c..4737837 100644 --- a/miniprogram/pages/home/home.wxml +++ b/miniprogram/pages/home/home.wxml @@ -4,80 +4,27 @@ 首页 - - - - - 红帆支队 - - - - 骑士驿站 - - - - 红色网格员 - - - - 西海岸先锋 - + + + + + {{item.text}} + + - - 推荐 - - - - - 围绕“经济抓党建，抓好党建促 发展”主题展开活动 - - 2023-05-22XXX社区党支部 - - - - - - - 围绕“经济抓党建，抓好党建促 发展”主题展开活动 - - 2023-05-22XXX社区党支部 - - - - - - - 围绕“经济抓党建，抓好党建促 发展”主题展开活动 - - 2023-05-22XXX社区党支部 - - - - - + + + + + + + 报到要求 + 凡党组织关系在青岛市北机关事业单位的党员干部职工（包含离退休党员干部），以及其他公职人员，应向长期居住地城市社区党组织报到。 + + + + 我已阅读并同意 + + + + + + + + + + + + diff --git a/miniprogram/subpages/checkIn/pages/checkIn/register/register.wxss b/miniprogram/subpages/checkIn/pages/checkIn/register/register.wxss new file mode 100644 index 0000000..6060ddf --- /dev/null +++ b/miniprogram/subpages/checkIn/pages/checkIn/register/register.wxss @@ -0,0 +1,54 @@ +/* subpages/checkIn/pages/checkIn/register/register.wxss */ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f5f5f5; + font-family: PingFang SC; +} +.card{ + background-color: #fff; +} +.card .title{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #e9e9e9; +} +.card .content{ + padding: 30rpx; + font-weight: 300; +} +.card .look{ + color: #999999; + text-align: center; + margin-bottom: 30rpx; + display: flex; + justify-content: center; +} +.card .look checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} +.buttom_btn{ + position: fixed; + bottom: 0; + height: 120rpx; + background-color: #fff; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.buttom_btn .back{ + width: 46%; + height: 80rpx; + line-height: 80rpx; +} +.buttom_btn .next{ + width: 46%; + height: 80rpx; + line-height: 80rpx; + color: #fff; +} diff --git a/miniprogram/subpages/demand/images/demand/add.png b/miniprogram/subpages/demand/images/demand/add.png deleted file mode 100644 index a0446a2..0000000 Binary files a/miniprogram/subpages/demand/images/demand/add.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/arrow-right.png b/miniprogram/subpages/demand/images/demand/arrow-right.png deleted file mode 100644 index 5563325..0000000 Binary files a/miniprogram/subpages/demand/images/demand/arrow-right.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/cancle.png b/miniprogram/subpages/demand/images/demand/cancle.png deleted file mode 100644 index f4c6b79..0000000 Binary files a/miniprogram/subpages/demand/images/demand/cancle.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/check.png b/miniprogram/subpages/demand/images/demand/check.png deleted file mode 100644 index fb9db5f..0000000 Binary files a/miniprogram/subpages/demand/images/demand/check.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/edit.png b/miniprogram/subpages/demand/images/demand/edit.png deleted file mode 100644 index ec7f156..0000000 Binary files a/miniprogram/subpages/demand/images/demand/edit.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/finish.png b/miniprogram/subpages/demand/images/demand/finish.png deleted file mode 100644 index e13814e..0000000 Binary files a/miniprogram/subpages/demand/images/demand/finish.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/jiedan.png b/miniprogram/subpages/demand/images/demand/jiedan.png deleted file mode 100644 index f17eb03..0000000 Binary files a/miniprogram/subpages/demand/images/demand/jiedan.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/point.png b/miniprogram/subpages/demand/images/demand/point.png deleted file mode 100644 index 50cc294..0000000 Binary files a/miniprogram/subpages/demand/images/demand/point.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/rate1.png b/miniprogram/subpages/demand/images/demand/rate1.png deleted file mode 100644 index 4150e75..0000000 Binary files a/miniprogram/subpages/demand/images/demand/rate1.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/rate2.png b/miniprogram/subpages/demand/images/demand/rate2.png deleted file mode 100644 index 54a7ee6..0000000 Binary files a/miniprogram/subpages/demand/images/demand/rate2.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/rate3.png b/miniprogram/subpages/demand/images/demand/rate3.png deleted file mode 100644 index 9926479..0000000 Binary files a/miniprogram/subpages/demand/images/demand/rate3.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/rate4.png b/miniprogram/subpages/demand/images/demand/rate4.png deleted file mode 100644 index 0a6c81c..0000000 Binary files a/miniprogram/subpages/demand/images/demand/rate4.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/tel.png b/miniprogram/subpages/demand/images/demand/tel.png deleted file mode 100644 index 4162325..0000000 Binary files a/miniprogram/subpages/demand/images/demand/tel.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/tel1.png b/miniprogram/subpages/demand/images/demand/tel1.png deleted file mode 100644 index 3c08a87..0000000 Binary files a/miniprogram/subpages/demand/images/demand/tel1.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/x1.png b/miniprogram/subpages/demand/images/demand/x1.png deleted file mode 100644 index e3d83e5..0000000 Binary files a/miniprogram/subpages/demand/images/demand/x1.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/x2.png b/miniprogram/subpages/demand/images/demand/x2.png deleted file mode 100644 index 3c794b2..0000000 Binary files a/miniprogram/subpages/demand/images/demand/x2.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/x3.png b/miniprogram/subpages/demand/images/demand/x3.png deleted file mode 100644 index 1a6dec5..0000000 Binary files a/miniprogram/subpages/demand/images/demand/x3.png and /dev/null differ diff --git a/miniprogram/subpages/demand/images/demand/x4.png b/miniprogram/subpages/demand/images/demand/x4.png deleted file mode 100644 index 0f0d7a7..0000000 Binary files a/miniprogram/subpages/demand/images/demand/x4.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/dispport.png b/miniprogram/subpages/discussion/images/dispport.png deleted file mode 100644 index e943000..0000000 Binary files a/miniprogram/subpages/discussion/images/dispport.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/dispported.png b/miniprogram/subpages/discussion/images/dispported.png deleted file mode 100644 index 0853d6d..0000000 Binary files a/miniprogram/subpages/discussion/images/dispported.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/feichangmanyihuise@2x.png b/miniprogram/subpages/discussion/images/feichangmanyihuise@2x.png deleted file mode 100644 index 74ee89c..0000000 Binary files a/miniprogram/subpages/discussion/images/feichangmanyihuise@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/ic_bumanyi@2x.png b/miniprogram/subpages/discussion/images/ic_bumanyi@2x.png deleted file mode 100644 index 14accff..0000000 Binary files a/miniprogram/subpages/discussion/images/ic_bumanyi@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/ic_bumanyihuise@2x.png b/miniprogram/subpages/discussion/images/ic_bumanyihuise@2x.png deleted file mode 100644 index 464aa91..0000000 Binary files a/miniprogram/subpages/discussion/images/ic_bumanyihuise@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/ic_feichangmanyi@2x.png b/miniprogram/subpages/discussion/images/ic_feichangmanyi@2x.png deleted file mode 100644 index 72c316c..0000000 Binary files a/miniprogram/subpages/discussion/images/ic_feichangmanyi@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/ic_jibenmanyi@2x.png b/miniprogram/subpages/discussion/images/ic_jibenmanyi@2x.png deleted file mode 100644 index a46170f..0000000 Binary files a/miniprogram/subpages/discussion/images/ic_jibenmanyi@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/ic_jibenmanyihuise@2x.png b/miniprogram/subpages/discussion/images/ic_jibenmanyihuise@2x.png deleted file mode 100644 index 90f7d7d..0000000 Binary files a/miniprogram/subpages/discussion/images/ic_jibenmanyihuise@2x.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/support.png b/miniprogram/subpages/discussion/images/support.png deleted file mode 100644 index 60e0b8a..0000000 Binary files a/miniprogram/subpages/discussion/images/support.png and /dev/null differ diff --git a/miniprogram/subpages/discussion/images/supported.png b/miniprogram/subpages/discussion/images/supported.png deleted file mode 100644 index 748a675..0000000 Binary files a/miniprogram/subpages/discussion/images/supported.png and /dev/null differ diff --git a/miniprogram/subpages/knight/images/bg.png b/miniprogram/subpages/knight/images/bg.png index a9be586..2817065 100644 Binary files a/miniprogram/subpages/knight/images/bg.png and b/miniprogram/subpages/knight/images/bg.png differ diff --git a/miniprogram/subpages/knight/pages/knight/brief/brief.js b/miniprogram/subpages/knight/pages/knight/brief/brief.js new file mode 100644 index 0000000..9bc4efa --- /dev/null +++ b/miniprogram/subpages/knight/pages/knight/brief/brief.js @@ -0,0 +1,90 @@ +// subpages/knight/pages/knight/brief/brief.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + look:true, + informFlag:false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + handleCheckbox(e){ + console.log(e); + if(e.detail .value.length!=0){ + this.setData({ + look:false + }) + }else{ + this.setData({ + look:true + }) + } + }, + handleBack(){ + wx.navigateBack({ + delta: 1 + }) + }, + handleNext(){ + console.log('11233'); + this.setData({ + informFlag:true + }) + } +}) \ No newline at end of file diff --git a/miniprogram/subpages/knight/pages/knight/brief/brief.json b/miniprogram/subpages/knight/pages/knight/brief/brief.json new file mode 100644 index 0000000..a51ade0 --- /dev/null +++ b/miniprogram/subpages/knight/pages/knight/brief/brief.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "驿站简介", + "navigationBarBackgroundColor": "#e33131" +} \ No newline at end of file diff --git a/miniprogram/subpages/knight/pages/knight/brief/brief.wxml b/miniprogram/subpages/knight/pages/knight/brief/brief.wxml new file mode 100644 index 0000000..702dea3 --- /dev/null +++ b/miniprogram/subpages/knight/pages/knight/brief/brief.wxml @@ -0,0 +1,28 @@ + + + + + + + + + + + + “新锋驿站”是面向全区外卖、快递等新就业群体打造的“提供暖心服务、倾听彼此心声、融入基层治理”的公益性共享空间。 + “新锋驿站”原则上实行全天候开放，均设在一楼以及临街位置，配备可供休息就餐的桌椅、烧水壶 (饮水机)、微波炉、报刊书籍、无线网络、应急药品充电充气工具等基本设施，有条件的还配备有冰箱沙发、储物柜、维修工具箱、电视机、爱心捐赠柜等设备，可就近解决如厕问题。 + “新锋驿站”免费为外卖、快递等新就业群体提供学习休息、纳凉取暖、饮水充电、饭菜加热、政策咨询等基础服务，后期还将探索引入社会力量拓展职业指导、法律援助等专业服务，创新““青年联谊””““联系帮扶“骑手相亲会””等特色服务项目，搭建婚恋、交友平台开展送心理疏导、送技能提升、送权益维护等活动为新就业群体打造一处“累了能歌脚、渴了能喝水、没电能充电、心烦能倾诉”的“临时小家”和和“温馨港湾”。 + + + + + + + + \ No newline at end of file diff --git a/miniprogram/subpages/knight/pages/knight/brief/brief.wxss b/miniprogram/subpages/knight/pages/knight/brief/brief.wxss new file mode 100644 index 0000000..059cd71 --- /dev/null +++ b/miniprogram/subpages/knight/pages/knight/brief/brief.wxss @@ -0,0 +1,64 @@ +/* subpages/knight/pages/knight/brief/brief.wxss */ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f5f5f5; + font-family: PingFang SC; + margin: 0 auto; +} +.gray{ + background-color: #fafafa; +} +.card{ + background-color: #fff; +} +.card .title{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #e9e9e9; +} +.card .content{ + padding: 30rpx; + font-weight: 300; +} +.card .look{ + color: #999999; + text-align: center; + margin-bottom: 30rpx; + display: flex; + justify-content: center; +} +.card .look checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} +.buttom_btn{ + position: fixed; + bottom: 0; + height: 120rpx; + background-color: #fff; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.buttom_btn .back{ + width: 46%; + height: 80rpx; + line-height: 80rpx; +} +.buttom_btn .next{ + width: 46%; + height: 80rpx; + line-height: 80rpx; + color: #fff; +} +.buttom_btn .next1{ + width: 98%; + height: 80rpx; + line-height: 80rpx; + color: #fff; +} \ No newline at end of file diff --git a/miniprogram/subpages/knight/pages/knight/knight.json b/miniprogram/subpages/knight/pages/knight/knight.json index 1db2a35..3548969 100644 --- a/miniprogram/subpages/knight/pages/knight/knight.json +++ b/miniprogram/subpages/knight/pages/knight/knight.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "骑士驿站", + "navigationBarTitleText": "新锋驿站", "navigationStyle": "custom", "navigationBarTextStyle": "white", "enablePullDownRefresh": true, diff --git a/miniprogram/subpages/knight/pages/knight/knight.wxml b/miniprogram/subpages/knight/pages/knight/knight.wxml index 46d0eb7..9c530e4 100644 --- a/miniprogram/subpages/knight/pages/knight/knight.wxml +++ b/miniprogram/subpages/knight/pages/knight/knight.wxml @@ -2,23 +2,23 @@ - 骑士驿站 + 新锋驿站 - + 驿站简介 - “骑士驿站”是面向全区外卖、快递··· + “新锋驿站”是面向全区外卖、快递··· - + @@ -31,7 +31,7 @@ - + @@ -55,7 +55,7 @@ - + + \ No newline at end of file diff --git a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml index b6292b6..677988f 100644 --- a/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml +++ b/miniprogram/subpages/pioneer/pages/pioneer/pioneer.wxml @@ -15,6 +15,6 @@ 扫码关注“北尚先锋” 点击上图，长按可进入“北尚先锋”公众号 - + \ No newline at end of file diff --git a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml index c2ff16d..8f620fd 100644 --- a/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml +++ b/miniprogram/subpages/redGrider/pages/redGrider/redGrider.wxml @@ -12,14 +12,14 @@ 招募令 - “骑士驿站”是面向全区外卖、快递··· + “新锋驿站”是面向全区外卖、快递··· - + + diff --git a/miniprogram/subpages/redSail/images/marker-icon.png b/miniprogram/subpages/redSail/images/marker-icon.png new file mode 100644 index 0000000..6e1a3b8 Binary files /dev/null and b/miniprogram/subpages/redSail/images/marker-icon.png differ diff --git a/miniprogram/subpages/redSail/images/party-logo.png b/miniprogram/subpages/redSail/images/party-logo.png new file mode 100644 index 0000000..b1d8ece Binary files /dev/null and b/miniprogram/subpages/redSail/images/party-logo.png differ diff --git a/miniprogram/subpages/redSail/pages/event/event.js b/miniprogram/subpages/redSail/pages/event/event.js new file mode 100644 index 0000000..d3e0b9f --- /dev/null +++ b/miniprogram/subpages/redSail/pages/event/event.js @@ -0,0 +1,66 @@ +// subpages/redSail/pages/event/event.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/event/event.json b/miniprogram/subpages/redSail/pages/event/event.json new file mode 100644 index 0000000..3e83fa9 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/event/event.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarBackgroundColor": "#e33131", + "navigationBarTitleText": "暖心实事" +} \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/event/event.wxml b/miniprogram/subpages/redSail/pages/event/event.wxml new file mode 100644 index 0000000..5d52bd3 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/event/event.wxml @@ -0,0 +1,8 @@ + + + + + 暖心实事 + + + diff --git a/miniprogram/subpages/redSail/pages/event/event.wxss b/miniprogram/subpages/redSail/pages/event/event.wxss new file mode 100644 index 0000000..2ad5651 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/event/event.wxss @@ -0,0 +1,33 @@ +/* subpages/redSail/pages/event/event.wxss */ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f5f5f5; + font-family: PingFang SC; +} +.card{ + background-color: #fff; +} +.card .title{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #e9e9e9; +} +.card .content{ + padding: 30rpx; + font-weight: 300; +} +.card .look{ + color: #999999; + text-align: center; + margin-bottom: 30rpx; + display: flex; + justify-content: center; +} +.card .look checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/flowParty/flowParty.js b/miniprogram/subpages/redSail/pages/flowParty/flowParty.js new file mode 100644 index 0000000..4b186b4 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/flowParty/flowParty.js @@ -0,0 +1,143 @@ +// subpages/redSail/pages/flowParty/flowParty.js +var mapCtx = ""; +Page({ + + /** + * 页面的初始数据 + */ + data: { + + selectedValue:'', + look:true, + informFlag:false, + longitude: 120.372537, + latitude: 36.098056, + scale: 13, + mapCtx: mapCtx, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.data.mapCtx = wx.createMapContext("party-masses-map"); + this.partyservicecenterlist(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + addMarkers (markerList) { + var markers = []; + markerList.forEach( (item, index)=> { + markers.push({ + id: index + 1, + iconPath: "../../images/marker-icon.png", + longitude: parseFloat(item.longitude), + latitude: parseFloat(item.latitude), + width: 30, + height: 35, + zIndex: 100, + customCallout: { + anchorY: 0, + anchorX: 0, + display: "ALWAYS" + } + }); + }); + this.data.mapCtx.addMarkers({ + markers: markers + }); + }, + + partyservicecenterlist: function () { + var _this = this; + var params = { + orgId: wx.getStorageSync("gridId"), + orgType: "grid" + }; + index_1.partyservicecenterlist(params).then(function (res) { + console.log("获取党群服务中心", res); + _this.setData({ + partyMassesList: res.data + }); + _this.addMarkers(_this.data.partyMassesList); + }).catch(function (err) { + console.error(err); + }); + }, + onPickerChange (event) { + const selectedIndex = event.detail.value; + const selectedValue = ['是', '否'][selectedIndex]; + this.setData({ + selectedValue: selectedValue + }); + }, + handleCheckbox(e){ + console.log(e); + if(e.detail .value.length!=0){ + this.setData({ + look:false + }) + }else{ + this.setData({ + look:true + }) + } + }, + handleBack(){ + wx.navigateBack({ + delta: 1 + }) + }, + handleNext(){ + this.setData({ + informFlag:true + }) + } +}) \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/flowParty/flowParty.json b/miniprogram/subpages/redSail/pages/flowParty/flowParty.json new file mode 100644 index 0000000..f39d2eb --- /dev/null +++ b/miniprogram/subpages/redSail/pages/flowParty/flowParty.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarBackgroundColor": "#e33131", + "navigationBarTitleText": "流动党员报到" +} \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxml b/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxml new file mode 100644 index 0000000..139b8bf --- /dev/null +++ b/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxml @@ -0,0 +1,121 @@ + + + + + + * + 姓名 + + + + + + + + * + 身份证号 + + + + + + + + * + 手机号码 + + + + + + + + * + 现属党支部 + + + + + + + + * + 是否为自由职业者 + + + + + {{selectedValue}} + + + + + + + * + 工作单位 + + + + + + + + * + 工作单位地址 + + + + + + + + * + 所属社区 + + + + + + + + + + + + + + + + + 流动党员报到须知 + 外来流动党员，一般是指党员本人在青岛市北工作、生活组织关系仍保留在区外党组织，没有转移正式组织关系，连续6个月不能线下参加正式组织关系所在党支部活动的党员 + 党员组织关系保留在区内农村党组织，本人常年进城务工经商的党员，也可纳入工作、生活所在地城市社区“红帆支部”管理 + 流入单位已建立党组织但暂不满足组织关系转接条件的外来流动党员，需持党员证明信或《流动党员活动证》向流入单位党组织报到:对流入单位未建立党组织的外来流动党员持党员证明信或《流动党员活动证》向所在城市社区““红帆支部”报到，接受“红帆支部”教育管理。纳入“红帆支部”管理的流动党员，一般应向所在“红帆支部”交纳党费 + + + + 我已阅读并同意 + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxss b/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxss new file mode 100644 index 0000000..b343021 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/flowParty/flowParty.wxss @@ -0,0 +1,99 @@ +/* subpages/redSail/pages/flowParty/flowParty.wxss */ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f5f5f5; + font-family: PingFang SC; + margin: 0 auto; +} +.gray{ + background-color: #fafafa; +} +.card{ + background-color: #fff; +} +.card .title{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #e9e9e9; +} +.card .content{ + padding: 30rpx; + font-weight: 300; +} +.card .look{ + color: #999999; + text-align: center; + margin-bottom: 30rpx; + display: flex; + justify-content: center; +} +.card .look checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} +.buttom_btn{ + position: fixed; + bottom: 0; + height: 120rpx; + background-color: #fff; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.buttom_btn .back{ + width: 46%; + height: 80rpx; + line-height: 80rpx; +} +.buttom_btn .next{ + width: 46%; + height: 80rpx; + line-height: 80rpx; + color: #fff; +} + +.basic-info { + width: 95%; + background: #fff; + border-radius: 16rpx; + box-sizing: border-box; + padding: 0 20rpx; + margin: 20rpx auto; + } + .basic-info .list-item { + width: 100%; + height: 100rpx; + display: flex; + align-items: center; + justify-content: space-between; + } + .basic-info .list-item .left .must { + color: #F61616; + font-size: 30rpx; + } + .basic-info .list-item .left .title { + color: #333; + font-size: 34rpx; + } + .basic-info .list-item .left { + display: flex; + align-items: center; + height: 100rpx; + } + .basic-info .list-item .right { + height: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + } + .basic-info .list-item .right picker{ + width: 100rpx; + } + .basic-info .list-item .right input{ + text-align: right; + } \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/redSail/redSail.wxml b/miniprogram/subpages/redSail/pages/redSail/redSail.wxml index 7e414be..099485c 100644 --- a/miniprogram/subpages/redSail/pages/redSail/redSail.wxml +++ b/miniprogram/subpages/redSail/pages/redSail/redSail.wxml @@ -7,10 +7,10 @@ - + - 新锋领航 + 暖心实事 在认真完成《中国共产党章··· @@ -18,8 +18,8 @@ - - + + 我要入党 @@ -30,8 +30,9 @@ - - + + + 流动党员报到 @@ -42,8 +43,8 @@ - - + + \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/registerParty/registerParty.js b/miniprogram/subpages/redSail/pages/registerParty/registerParty.js new file mode 100644 index 0000000..0e86ae4 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/registerParty/registerParty.js @@ -0,0 +1,143 @@ +// subpages/redSail/pages/registerParty/registerParty.js +var mapCtx = ""; +Page({ + + /** + * 页面的初始数据 + */ + data: { + + selectedValue:'', + look:true, + informFlag:false, + longitude: 120.372537, + latitude: 36.098056, + scale: 13, + mapCtx: mapCtx, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.data.mapCtx = wx.createMapContext("party-masses-map"); + this.partyservicecenterlist(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + addMarkers (markerList) { + var markers = []; + markerList.forEach( (item, index)=> { + markers.push({ + id: index + 1, + iconPath: "../../images/marker-icon.png", + longitude: parseFloat(item.longitude), + latitude: parseFloat(item.latitude), + width: 30, + height: 35, + zIndex: 100, + customCallout: { + anchorY: 0, + anchorX: 0, + display: "ALWAYS" + } + }); + }); + this.data.mapCtx.addMarkers({ + markers: markers + }); + }, + + partyservicecenterlist: function () { + var _this = this; + var params = { + orgId: wx.getStorageSync("gridId"), + orgType: "grid" + }; + index_1.partyservicecenterlist(params).then(function (res) { + console.log("获取党群服务中心", res); + _this.setData({ + partyMassesList: res.data + }); + _this.addMarkers(_this.data.partyMassesList); + }).catch(function (err) { + console.error(err); + }); + }, + onPickerChange (event) { + const selectedIndex = event.detail.value; + const selectedValue = ['是', '否'][selectedIndex]; + this.setData({ + selectedValue: selectedValue + }); + }, + handleCheckbox(e){ + console.log(e); + if(e.detail .value.length!=0){ + this.setData({ + look:false + }) + }else{ + this.setData({ + look:true + }) + } + }, + handleBack(){ + wx.navigateBack({ + delta: 1 + }) + }, + handleNext(){ + this.setData({ + informFlag:true + }) + } +}) \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/registerParty/registerParty.json b/miniprogram/subpages/redSail/pages/registerParty/registerParty.json new file mode 100644 index 0000000..337f3fa --- /dev/null +++ b/miniprogram/subpages/redSail/pages/registerParty/registerParty.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarBackgroundColor": "#e33131", + "navigationBarTitleText": "我要入党" +} \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxml b/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxml new file mode 100644 index 0000000..1ee856d --- /dev/null +++ b/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxml @@ -0,0 +1,110 @@ + + + + + + * + 姓名 + + + + + + + + * + 身份证号 + + + + + + + + * + 手机号码 + + + + + + + + * + 是否为自由职业者 + + + + + {{selectedValue}} + + + + + + + * + 工作单位 + + + + + + + + * + 工作单位地址 + + + + + + + + * + 所属社区 + + + + + + + + + + + + + + + + + 入党须知 + “ 红帆支部”主要接收城市社区、产业园区范围内直播电商、快递、物流、外卖、网约客运、网络货运等新业态新就业群体以及常年进城务工经商创业人员、不具备单独成立党支部条件的非公有制经济组织和社会组织中的优秀分了递交的入党申请。广籍在农村并在农村长期居住的，一般应向居住地农村党组织递交入党申请集体经济组织成员一般应向集体经济组织党组织递交入党,由请。在流入地申请入党，一般应具有相对固定的1作单位或居住地点，并已在该单位或该地连续工作、生活一年以上。 + + + + 我已阅读并同意 + + + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxss b/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxss new file mode 100644 index 0000000..ef0fc11 --- /dev/null +++ b/miniprogram/subpages/redSail/pages/registerParty/registerParty.wxss @@ -0,0 +1,99 @@ +/* subpages/redSail/pages/registerParty/registerParty.wxss */ +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f5f5f5; + font-family: PingFang SC; + margin: 0 auto; +} +.gray{ + background-color: #fafafa; +} +.card{ + background-color: #fff; +} +.card .title{ + height: 100rpx; + line-height: 100rpx; + text-align: center; + border-bottom: 1px solid #e9e9e9; +} +.card .content{ + padding: 30rpx; + font-weight: 300; +} +.card .look{ + color: #999999; + text-align: center; + margin-bottom: 30rpx; + display: flex; + justify-content: center; +} +.card .look checkbox-group { + display: flex; + align-items: center; + justify-content: center; +} +.buttom_btn{ + position: fixed; + bottom: 0; + height: 120rpx; + background-color: #fff; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.buttom_btn .back{ + width: 46%; + height: 80rpx; + line-height: 80rpx; +} +.buttom_btn .next{ + width: 46%; + height: 80rpx; + line-height: 80rpx; + color: #fff; +} + +.basic-info { + width: 95%; + background: #fff; + border-radius: 16rpx; + box-sizing: border-box; + padding: 0 20rpx; + margin: 20rpx auto; + } + .basic-info .list-item { + width: 100%; + height: 100rpx; + display: flex; + align-items: center; + justify-content: space-between; + } + .basic-info .list-item .left .must { + color: #F61616; + font-size: 30rpx; + } + .basic-info .list-item .left .title { + color: #333; + font-size: 34rpx; + } + .basic-info .list-item .left { + display: flex; + align-items: center; + height: 100rpx; + } + .basic-info .list-item .right { + height: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + } + .basic-info .list-item .right picker{ + width: 100rpx; + } + .basic-info .list-item .right input{ + text-align: right; + } \ No newline at end of file diff --git a/miniprogram/subpages/volunteer/pages/volunteer/volunteer.wxml b/miniprogram/subpages/volunteer/pages/volunteer/volunteer.wxml index e6a79dd..82b030d 100644 --- a/miniprogram/subpages/volunteer/pages/volunteer/volunteer.wxml +++ b/miniprogram/subpages/volunteer/pages/volunteer/volunteer.wxml @@ -19,7 +19,7 @@ - + - 尖兵风采 + 志愿风采 XXXXXXXXXXXXXXXXXXXX···