diff --git a/miniprogram/app.json b/miniprogram/app.json index c43b873..e4711e8 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -5,7 +5,7 @@ "pages/knight/knight", "pages/redGrider/redGrider", "pages/Pioneer/Pioneer", - "pages/CheckIn/CheckIn", + "pages/checkIn/checkIn", "pages/volunteer/volunteer", "pages/message/message", "pages/my/my", diff --git a/miniprogram/images/knight/knight01.png b/miniprogram/images/knight/knight01.png new file mode 100644 index 0000000..088d53f Binary files /dev/null and b/miniprogram/images/knight/knight01.png differ diff --git a/miniprogram/images/knight/knight01r.png b/miniprogram/images/knight/knight01r.png new file mode 100644 index 0000000..d6f9c2c Binary files /dev/null and b/miniprogram/images/knight/knight01r.png differ diff --git a/miniprogram/images/knight/knight02.png b/miniprogram/images/knight/knight02.png new file mode 100644 index 0000000..648eae8 Binary files /dev/null and b/miniprogram/images/knight/knight02.png differ diff --git a/miniprogram/images/knight/knight02r.png b/miniprogram/images/knight/knight02r.png new file mode 100644 index 0000000..712d6dd Binary files /dev/null and b/miniprogram/images/knight/knight02r.png differ diff --git a/miniprogram/images/knight/knight03.png b/miniprogram/images/knight/knight03.png new file mode 100644 index 0000000..ec0502a Binary files /dev/null and b/miniprogram/images/knight/knight03.png differ diff --git a/miniprogram/images/knight/knight03r.png b/miniprogram/images/knight/knight03r.png new file mode 100644 index 0000000..439c48b Binary files /dev/null and b/miniprogram/images/knight/knight03r.png differ diff --git a/miniprogram/images/knight/knight04.png b/miniprogram/images/knight/knight04.png new file mode 100644 index 0000000..8b9f4f2 Binary files /dev/null and b/miniprogram/images/knight/knight04.png differ diff --git a/miniprogram/images/knight/knight04r.png b/miniprogram/images/knight/knight04r.png new file mode 100644 index 0000000..935aa7d Binary files /dev/null and b/miniprogram/images/knight/knight04r.png differ diff --git a/miniprogram/images/knight/knight05.png b/miniprogram/images/knight/knight05.png new file mode 100644 index 0000000..f47b42c Binary files /dev/null and b/miniprogram/images/knight/knight05.png differ diff --git a/miniprogram/images/knight/knight05r.png b/miniprogram/images/knight/knight05r.png new file mode 100644 index 0000000..133170d Binary files /dev/null and b/miniprogram/images/knight/knight05r.png differ diff --git a/miniprogram/images/knight/knight06.png b/miniprogram/images/knight/knight06.png new file mode 100644 index 0000000..617e95e Binary files /dev/null and b/miniprogram/images/knight/knight06.png differ diff --git a/miniprogram/images/knight/knight06r.png b/miniprogram/images/knight/knight06r.png new file mode 100644 index 0000000..2e4c9d7 Binary files /dev/null and b/miniprogram/images/knight/knight06r.png differ diff --git a/miniprogram/images/knight/knight_bg.png b/miniprogram/images/knight/knight_bg.png new file mode 100644 index 0000000..a9be586 Binary files /dev/null and b/miniprogram/images/knight/knight_bg.png differ diff --git a/miniprogram/images/main/back2.png b/miniprogram/images/main/back2.png new file mode 100644 index 0000000..0604ff6 Binary files /dev/null and b/miniprogram/images/main/back2.png differ diff --git a/miniprogram/images/main/redSail01.png b/miniprogram/images/redSail/redSail01.png similarity index 100% rename from miniprogram/images/main/redSail01.png rename to miniprogram/images/redSail/redSail01.png diff --git a/miniprogram/images/main/redSail02.png b/miniprogram/images/redSail/redSail02.png similarity index 100% rename from miniprogram/images/main/redSail02.png rename to miniprogram/images/redSail/redSail02.png diff --git a/miniprogram/images/main/redSail03.png b/miniprogram/images/redSail/redSail03.png similarity index 100% rename from miniprogram/images/main/redSail03.png rename to miniprogram/images/redSail/redSail03.png diff --git a/miniprogram/images/main/redSail04.png b/miniprogram/images/redSail/redSail04.png similarity index 100% rename from miniprogram/images/main/redSail04.png rename to miniprogram/images/redSail/redSail04.png diff --git a/miniprogram/images/main/redSail05.png b/miniprogram/images/redSail/redSail05.png similarity index 100% rename from miniprogram/images/main/redSail05.png rename to miniprogram/images/redSail/redSail05.png diff --git a/miniprogram/images/main/redSail_bg.png b/miniprogram/images/redSail/redSail_bg.png similarity index 100% rename from miniprogram/images/main/redSail_bg.png rename to miniprogram/images/redSail/redSail_bg.png diff --git a/miniprogram/images/main/redSail_right.png b/miniprogram/images/redSail/redSail_right.png similarity index 100% rename from miniprogram/images/main/redSail_right.png rename to miniprogram/images/redSail/redSail_right.png diff --git a/miniprogram/pages/CheckIn/CheckIn.js b/miniprogram/pages/CheckIn/CheckIn.js index 015d125..622ce5e 100644 --- a/miniprogram/pages/CheckIn/CheckIn.js +++ b/miniprogram/pages/CheckIn/CheckIn.js @@ -1,11 +1,13 @@ -// pages/CheckIn/CheckIn.js +// pages/redGrider/redGrider.js +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度 + navigationHeight: app.globalData.deviceInfo.navigationHeight, }, /** @@ -62,5 +64,12 @@ Page({ */ onShareAppMessage() { - } + }, + back() { + console.log("dddddddddd") + //返回上一级，关闭当前页面 + wx.navigateBack({ + delta: 1 + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/CheckIn/CheckIn.json b/miniprogram/pages/CheckIn/CheckIn.json index 3928faa..62ac817 100644 --- a/miniprogram/pages/CheckIn/CheckIn.json +++ b/miniprogram/pages/CheckIn/CheckIn.json @@ -1,3 +1,8 @@ { - "usingComponents": {} -} \ No newline at end of file + "navigationBarTitleText": "在职党员", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/CheckIn/CheckIn.wxml b/miniprogram/pages/CheckIn/CheckIn.wxml index e76914d..db7bbc8 100644 --- a/miniprogram/pages/CheckIn/CheckIn.wxml +++ b/miniprogram/pages/CheckIn/CheckIn.wxml @@ -1,2 +1,72 @@ - -pages/CheckIn/CheckIn.wxml + + + + + 红帆支部 + + + + + + + + 红帆领航 + + 在认真完成《中国共产党章··· + + + + + + + + + + 我要入党 + + “红帆支部”主要接受城市社··· + + + + + + + + + + 流动党员报到 + + 外来流动党员，一般指党员··· + + + + + + + + + + 我要转出 + + 填写身份信息以及转出事由 + + + + + + + + + + 我的支部 + + 我所在的支部信息 + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/CheckIn/CheckIn.wxss b/miniprogram/pages/CheckIn/CheckIn.wxss index c53d12c..309a761 100644 --- a/miniprogram/pages/CheckIn/CheckIn.wxss +++ b/miniprogram/pages/CheckIn/CheckIn.wxss @@ -1 +1,113 @@ -/* pages/CheckIn/CheckIn.wxss */ \ No newline at end of file +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; + font-family: PingFang SC; +} + +.header { + + 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; */ + 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: 1; +} + +.w20 { + width: 20rpx; +} + +.flex1 { + flex: 1; +} + +.mtf80 { + margin-top: -80rpx; +} + +.back { + width: 20rpx; + height: 20rpx; + margin-left: 20rpx; + position: absolute; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 2; +} + +.list { + padding: 20rpx 35rpx; + +} + +.list .item { + padding: 40rpx 40rpx; + + display: flex; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 20rpx; +} + +.vcenter { + display: flex; + flex-direction: column; + justify-content: center; +} + +.list .item .icon { + width: 130rpx; + height: 130rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .go { + width: 20rpx; + height: 20rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .h1 { + font-size: 36rpx; + color: #333333; + line-height: 1rem; + margin-bottom: 5rpx; +} + +.list .item .h2 { + font-size: 28rpx; + color: #999; + line-height: 1rem; +} + +.list .item .h2 .time { + float: right; +} \ No newline at end of file diff --git a/miniprogram/pages/Pioneer/Pioneer.js b/miniprogram/pages/Pioneer/Pioneer.js index 667670f..622ce5e 100644 --- a/miniprogram/pages/Pioneer/Pioneer.js +++ b/miniprogram/pages/Pioneer/Pioneer.js @@ -1,11 +1,13 @@ -// pages/Pioneer/Pioneer.js +// pages/redGrider/redGrider.js +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度 + navigationHeight: app.globalData.deviceInfo.navigationHeight, }, /** @@ -62,5 +64,12 @@ Page({ */ onShareAppMessage() { - } + }, + back() { + console.log("dddddddddd") + //返回上一级，关闭当前页面 + wx.navigateBack({ + delta: 1 + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/Pioneer/Pioneer.json b/miniprogram/pages/Pioneer/Pioneer.json index 3928faa..a756297 100644 --- a/miniprogram/pages/Pioneer/Pioneer.json +++ b/miniprogram/pages/Pioneer/Pioneer.json @@ -1,3 +1,8 @@ { - "usingComponents": {} -} \ No newline at end of file + "navigationBarTitleText": "西海岸先锋", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/Pioneer/Pioneer.wxml b/miniprogram/pages/Pioneer/Pioneer.wxml index 657eed8..db7bbc8 100644 --- a/miniprogram/pages/Pioneer/Pioneer.wxml +++ b/miniprogram/pages/Pioneer/Pioneer.wxml @@ -1,2 +1,72 @@ - -pages/Pioneer/Pioneer.wxml + + + + + 红帆支部 + + + + + + + + 红帆领航 + + 在认真完成《中国共产党章··· + + + + + + + + + + 我要入党 + + “红帆支部”主要接受城市社··· + + + + + + + + + + 流动党员报到 + + 外来流动党员，一般指党员··· + + + + + + + + + + 我要转出 + + 填写身份信息以及转出事由 + + + + + + + + + + 我的支部 + + 我所在的支部信息 + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/Pioneer/Pioneer.wxss b/miniprogram/pages/Pioneer/Pioneer.wxss index 352a08a..309a761 100644 --- a/miniprogram/pages/Pioneer/Pioneer.wxss +++ b/miniprogram/pages/Pioneer/Pioneer.wxss @@ -1 +1,113 @@ -/* pages/Pioneer/Pioneer.wxss */ \ No newline at end of file +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; + font-family: PingFang SC; +} + +.header { + + 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; */ + 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: 1; +} + +.w20 { + width: 20rpx; +} + +.flex1 { + flex: 1; +} + +.mtf80 { + margin-top: -80rpx; +} + +.back { + width: 20rpx; + height: 20rpx; + margin-left: 20rpx; + position: absolute; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 2; +} + +.list { + padding: 20rpx 35rpx; + +} + +.list .item { + padding: 40rpx 40rpx; + + display: flex; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 20rpx; +} + +.vcenter { + display: flex; + flex-direction: column; + justify-content: center; +} + +.list .item .icon { + width: 130rpx; + height: 130rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .go { + width: 20rpx; + height: 20rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .h1 { + font-size: 36rpx; + color: #333333; + line-height: 1rem; + margin-bottom: 5rpx; +} + +.list .item .h2 { + font-size: 28rpx; + color: #999; + line-height: 1rem; +} + +.list .item .h2 .time { + float: right; +} \ No newline at end of file diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml index f19086f..f603a4a 100644 --- a/miniprogram/pages/home/home.wxml +++ b/miniprogram/pages/home/home.wxml @@ -7,39 +7,49 @@ - - - 红帆支队 - + + + 红帆支队 + - + + 骑士驿站 + - - 红色网格员 + + + 红色网格员 + - - 西海岸先锋 + + + 西海岸先锋 + - - - 在职党员 - 到居住社区报到 - + + + + 在职党员 + 到居住社区报到 + + - - - 红色尖兵 - 志愿服务队 - + + + + 红色尖兵 + 志愿服务队 + + diff --git a/miniprogram/pages/knight/knight.js b/miniprogram/pages/knight/knight.js index dde83df..622ce5e 100644 --- a/miniprogram/pages/knight/knight.js +++ b/miniprogram/pages/knight/knight.js @@ -1,11 +1,13 @@ -// pages/knight/knight.js +// pages/redGrider/redGrider.js +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度 + navigationHeight: app.globalData.deviceInfo.navigationHeight, }, /** @@ -62,5 +64,12 @@ Page({ */ onShareAppMessage() { - } + }, + back() { + console.log("dddddddddd") + //返回上一级，关闭当前页面 + wx.navigateBack({ + delta: 1 + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/knight/knight.json b/miniprogram/pages/knight/knight.json index 3928faa..1db2a35 100644 --- a/miniprogram/pages/knight/knight.json +++ b/miniprogram/pages/knight/knight.json @@ -1,3 +1,8 @@ { - "usingComponents": {} -} \ No newline at end of file + "navigationBarTitleText": "骑士驿站", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/knight/knight.wxml b/miniprogram/pages/knight/knight.wxml index de87b0a..d08b369 100644 --- a/miniprogram/pages/knight/knight.wxml +++ b/miniprogram/pages/knight/knight.wxml @@ -1,2 +1,83 @@ - -pages/knight/knight.wxml + + + + + 骑士驿站 + + + + + + + + 驿站简介 + + “骑士驿站”是面向全区外卖、快递··· + + + + + + + + + + 驿站地图 + + 主要是浏览、查询附近驿站点位。 + + + + + + + + + + 骑士注册 + + 注册骑士的详细内容以及参与的驿站。 + + + + + + + + + + 骑先锋 + + 申请加入红色网格员。 + + + + + + + + + + 骑士上报 + + 内容XXXXXXXXXXXXXXXXXXXX··· + + + + + + + + + + 关爱行动 + + 全区关爱活动的活动详情。 + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/knight/knight.wxss b/miniprogram/pages/knight/knight.wxss index 62c0f3f..7291969 100644 --- a/miniprogram/pages/knight/knight.wxss +++ b/miniprogram/pages/knight/knight.wxss @@ -1 +1,176 @@ -/* pages/knight/knight.wxss */ \ No newline at end of file +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #fff; + font-family: PingFang SC; +} + +.header { + + 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; */ + position: absolute; + height: 100%; + z-index: -999; +} + +.header .navigation { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + color: rgba(0, 0, 0, 0.9); + font-size: 32rpx; + position: relative; + z-index: 1; +} + +.w20 { + width: 38rpx; +} + +.flex1 { + flex: 1; +} + +.mtf80 { + margin-top: -80rpx; +} + +.back { + width: 20rpx; + height: 20rpx; + margin-left: 20rpx; + position: absolute; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 2; +} + +.list { + padding: 20rpx 35rpx; + +} + +.list .item { + padding: 50rpx 40rpx; + + display: flex; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 20rpx; +} + +.vcenter { + display: flex; + flex-direction: column; + justify-content: center; +} + +.list .item .icon { + width: 70rpx; + height: 70rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .go { + width: 38rpx; + height: 38rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .h1 { + font-size: 36rpx; + + line-height: 1rem; + margin-bottom: 20rpx; +} + +.list .item .h2 { + font-size: 28rpx; + + line-height: 1rem; +} + +.list .item .h2 .time { + float: right; +} + +.color01 { + border-image: linear-gradient(124deg, #FFFFFF, #FFFFFF) 10 10; + background: linear-gradient(82deg, #FFFFFF 0%, #000000 0%, #F2FFFB 0%, #E5FFF9 100%); + color: #224D3F; +} + +.color02 { + border-image: linear-gradient(124deg, #FFFFFF, #FFFFFF) 10 10; + background: linear-gradient(82deg, #F2FFFB 0%, #FFFFFF 0%, #F2FAFD 0%, #E5F6FF 100%); + box-shadow: 0px 4px 12px 0px rgba(202, 202, 202, 0.24); + color: #3B5B8C; +} + +.color03 { + border-image: linear-gradient(146deg, #FFFFFF, #FFFFFF) 10 10; + background: linear-gradient(82deg, #F8FAFF 0%, #F9FFFD 0%, #F6FDFF 0%, #EBFAFF 100%); + box-shadow: 0px 4px 12px 0px rgba(202, 202, 202, 0.24); + color: #117589; +} + +.color04 { + border-image: linear-gradient(146deg, #FFFFFF, #FFFFFF) 10 10; + background: linear-gradient(82deg, #FEFEF2 0%, #F2FAFD 0%, #FFFEFA 0%, #FEF8E8 100%); + box-shadow: 0px 6px 16px 0px rgba(202, 202, 202, 0.42); + color: #A96C35; +} + +.color05 { + background: linear-gradient(82deg, #FEF2F3 0%, #FFFCFB 0%, #F8F4FF 0%, #EFE4FF 100%); + box-shadow: 0px 6px 16px 0px rgba(202, 202, 202, 0.4); + color: #856AAD; +} + +.color06 { + background: linear-gradient(82deg, #E6EEFF 0%, #FAFCFF 0%, #EDF3FF 0%, #D8E5FF 100%); + box-shadow: 0px 6px 16px 0px rgba(202, 202, 202, 0.4); + color: #5374B2; +} + +.color01 .h2 { + color: #6A8079; +} + +.color02 .h2 { + color: #5E89B3; +} + +.color03 .h2 { + color: #488D9A; +} + +.color04 .h2 { + color: #B98A60; +} + +.color05 .h2 { + color: #9484AC; +} + +.color06 .h2 { + color: #6D89BF; +} \ No newline at end of file diff --git a/miniprogram/pages/redGrider/redGrider.json b/miniprogram/pages/redGrider/redGrider.json index 3928faa..f7df8c8 100644 --- a/miniprogram/pages/redGrider/redGrider.json +++ b/miniprogram/pages/redGrider/redGrider.json @@ -1,3 +1,8 @@ { - "usingComponents": {} -} \ No newline at end of file + "navigationBarTitleText": "红色网格员", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/redGrider/redGrider.wxml b/miniprogram/pages/redGrider/redGrider.wxml index ba2beb3..db7bbc8 100644 --- a/miniprogram/pages/redGrider/redGrider.wxml +++ b/miniprogram/pages/redGrider/redGrider.wxml @@ -1,2 +1,72 @@ - -pages/redGrider/redGrider.wxml + + + + + 红帆支部 + + + + + + + + 红帆领航 + + 在认真完成《中国共产党章··· + + + + + + + + + + 我要入党 + + “红帆支部”主要接受城市社··· + + + + + + + + + + 流动党员报到 + + 外来流动党员，一般指党员··· + + + + + + + + + + 我要转出 + + 填写身份信息以及转出事由 + + + + + + + + + + 我的支部 + + 我所在的支部信息 + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/redGrider/redGrider.wxss b/miniprogram/pages/redGrider/redGrider.wxss index b484bae..309a761 100644 --- a/miniprogram/pages/redGrider/redGrider.wxss +++ b/miniprogram/pages/redGrider/redGrider.wxss @@ -1 +1,113 @@ -/* pages/redGrider/redGrider.wxss */ \ No newline at end of file +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; + font-family: PingFang SC; +} + +.header { + + 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; */ + 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: 1; +} + +.w20 { + width: 20rpx; +} + +.flex1 { + flex: 1; +} + +.mtf80 { + margin-top: -80rpx; +} + +.back { + width: 20rpx; + height: 20rpx; + margin-left: 20rpx; + position: absolute; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 2; +} + +.list { + padding: 20rpx 35rpx; + +} + +.list .item { + padding: 40rpx 40rpx; + + display: flex; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 20rpx; +} + +.vcenter { + display: flex; + flex-direction: column; + justify-content: center; +} + +.list .item .icon { + width: 130rpx; + height: 130rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .go { + width: 20rpx; + height: 20rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .h1 { + font-size: 36rpx; + color: #333333; + line-height: 1rem; + margin-bottom: 5rpx; +} + +.list .item .h2 { + font-size: 28rpx; + color: #999; + line-height: 1rem; +} + +.list .item .h2 .time { + float: right; +} \ No newline at end of file diff --git a/miniprogram/pages/redSail/redSail.json b/miniprogram/pages/redSail/redSail.json index 0a7a91e..d518ddc 100644 --- a/miniprogram/pages/redSail/redSail.json +++ b/miniprogram/pages/redSail/redSail.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "红帆支部", + "navigationBarTitleText": "红帆支队", "navigationStyle": "custom", "navigationBarTextStyle": "white", "enablePullDownRefresh": true, diff --git a/miniprogram/pages/redSail/redSail.wxml b/miniprogram/pages/redSail/redSail.wxml index db7bbc8..50e52fc 100644 --- a/miniprogram/pages/redSail/redSail.wxml +++ b/miniprogram/pages/redSail/redSail.wxml @@ -1,6 +1,6 @@ - + 红帆支部 @@ -8,7 +8,7 @@ - + 红帆领航 @@ -16,11 +16,11 @@ - + - + 我要入党 @@ -28,11 +28,11 @@ - + - + 流动党员报到 @@ -40,11 +40,11 @@ - + - + 我要转出 @@ -52,11 +52,11 @@ - + - + 我的支部 @@ -64,7 +64,7 @@ - + diff --git a/miniprogram/pages/volunteer/volunteer.js b/miniprogram/pages/volunteer/volunteer.js index e7b4717..622ce5e 100644 --- a/miniprogram/pages/volunteer/volunteer.js +++ b/miniprogram/pages/volunteer/volunteer.js @@ -1,11 +1,13 @@ -// pages/volunteer/volunteer.js +// pages/redGrider/redGrider.js +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + statusHeight: app.globalData.deviceInfo.statusHeight, // 自定义头部状态栏高度 + navigationHeight: app.globalData.deviceInfo.navigationHeight, }, /** @@ -62,5 +64,12 @@ Page({ */ onShareAppMessage() { - } + }, + back() { + console.log("dddddddddd") + //返回上一级，关闭当前页面 + wx.navigateBack({ + delta: 1 + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/volunteer/volunteer.json b/miniprogram/pages/volunteer/volunteer.json index 3928faa..bd14ce0 100644 --- a/miniprogram/pages/volunteer/volunteer.json +++ b/miniprogram/pages/volunteer/volunteer.json @@ -1,3 +1,8 @@ { - "usingComponents": {} -} \ No newline at end of file + "navigationBarTitleText": "红色尖兵", + "navigationStyle": "custom", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" + } \ No newline at end of file diff --git a/miniprogram/pages/volunteer/volunteer.wxml b/miniprogram/pages/volunteer/volunteer.wxml index e75952e..db7bbc8 100644 --- a/miniprogram/pages/volunteer/volunteer.wxml +++ b/miniprogram/pages/volunteer/volunteer.wxml @@ -1,2 +1,72 @@ - -pages/volunteer/volunteer.wxml + + + + + 红帆支部 + + + + + + + + 红帆领航 + + 在认真完成《中国共产党章··· + + + + + + + + + + 我要入党 + + “红帆支部”主要接受城市社··· + + + + + + + + + + 流动党员报到 + + 外来流动党员，一般指党员··· + + + + + + + + + + 我要转出 + + 填写身份信息以及转出事由 + + + + + + + + + + 我的支部 + + 我所在的支部信息 + + + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/volunteer/volunteer.wxss b/miniprogram/pages/volunteer/volunteer.wxss index 6aa391f..309a761 100644 --- a/miniprogram/pages/volunteer/volunteer.wxss +++ b/miniprogram/pages/volunteer/volunteer.wxss @@ -1 +1,113 @@ -/* pages/volunteer/volunteer.wxss */ \ No newline at end of file +page { + width: 100%; + height: auto; + overflow-y: auto; + background: #f7f7f7; + font-family: PingFang SC; +} + +.header { + + 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; */ + 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: 1; +} + +.w20 { + width: 20rpx; +} + +.flex1 { + flex: 1; +} + +.mtf80 { + margin-top: -80rpx; +} + +.back { + width: 20rpx; + height: 20rpx; + margin-left: 20rpx; + position: absolute; + margin-top: 20rpx; + border-radius: 0rpx; + z-index: 2; +} + +.list { + padding: 20rpx 35rpx; + +} + +.list .item { + padding: 40rpx 40rpx; + + display: flex; + background-color: #fff; + border-radius: 10rpx; + margin-bottom: 20rpx; +} + +.vcenter { + display: flex; + flex-direction: column; + justify-content: center; +} + +.list .item .icon { + width: 130rpx; + height: 130rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .go { + width: 20rpx; + height: 20rpx; + margin-right: 20rpx; + border-radius: 0rpx; +} + +.list .item .h1 { + font-size: 36rpx; + color: #333333; + line-height: 1rem; + margin-bottom: 5rpx; +} + +.list .item .h2 { + font-size: 28rpx; + color: #999; + line-height: 1rem; +} + +.list .item .h2 .time { + float: right; +} \ No newline at end of file