From f25baee820f6fe9d97fd1d2844449b841b1c32d7 Mon Sep 17 00:00:00 2001 From: zhaoyongnian <541231643@qq.com> Date: Tue, 26 May 2020 18:00:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/volunteer/volunteer.js | 23 ++ .../components/volunteer/volunteer.json | 4 + .../components/volunteer/volunteer.wxml | 18 ++ .../components/volunteer/volunteer.wxss | 48 +++++ pages/heartNew/heartNew.js | 34 +++ pages/heartNew/heartNew.json | 3 +- pages/heartNew/heartNew.wxml | 53 ++++- pages/heartNew/heartNew.wxss | 199 +++++++++++++++++- pages/indexNew/indexNew.js | 2 +- subpages/discussion/images/edit.png | Bin 0 -> 2333 bytes .../discussion/pages/addIssue/addIssue.js | 11 +- .../discussion/pages/addIssue/addIssue.wxml | 7 +- .../discussion/pages/addIssue/addIssue.wxss | 12 +- 13 files changed, 399 insertions(+), 15 deletions(-) create mode 100644 pages/heartNew/components/volunteer/volunteer.js create mode 100644 pages/heartNew/components/volunteer/volunteer.json create mode 100644 pages/heartNew/components/volunteer/volunteer.wxml create mode 100644 pages/heartNew/components/volunteer/volunteer.wxss create mode 100644 subpages/discussion/images/edit.png diff --git a/pages/heartNew/components/volunteer/volunteer.js b/pages/heartNew/components/volunteer/volunteer.js new file mode 100644 index 0000000..14600d0 --- /dev/null +++ b/pages/heartNew/components/volunteer/volunteer.js @@ -0,0 +1,23 @@ +// pages/indexNew/components/volunteer/volunteer.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + + }, + + /** + * 组件的初始数据 + */ + data: { + + }, + + /** + * 组件的方法列表 + */ + methods: { + + } +}) diff --git a/pages/heartNew/components/volunteer/volunteer.json b/pages/heartNew/components/volunteer/volunteer.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/pages/heartNew/components/volunteer/volunteer.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/heartNew/components/volunteer/volunteer.wxml b/pages/heartNew/components/volunteer/volunteer.wxml new file mode 100644 index 0000000..4281bc2 --- /dev/null +++ b/pages/heartNew/components/volunteer/volunteer.wxml @@ -0,0 +1,18 @@ + + + + 李先生 + 我志愿我骄傲 + + + + 李先生 + 我志愿我骄傲 + + + + 李先生 + 我志愿我骄傲 + + +*按姓氏拼音排序 \ No newline at end of file diff --git a/pages/heartNew/components/volunteer/volunteer.wxss b/pages/heartNew/components/volunteer/volunteer.wxss new file mode 100644 index 0000000..a2c7a15 --- /dev/null +++ b/pages/heartNew/components/volunteer/volunteer.wxss @@ -0,0 +1,48 @@ +.box { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + padding: 0rpx 40rpx 19rpx 40rpx; +} + +.box .item { + width: 320rpx; + height: 282rpx; + margin-top: 20rpx; + background: #fff; + border-radius: 20rpx; + display: flex; + flex-direction: column; + align-items: center; +} + +.box .item image { + width: 110rpx; + height: 110rpx; + border-radius: 50%; + margin-top: 40rpx; +} + +.box .item .name { + margin-top: 11rpx; + font-size: 30rpx; + font-weight: bold; + color: rgba(51, 51, 51, 1); +} + +.box .item .autograph { + margin-top: 18rpx; + font-size:26rpx; + font-weight:500; + color:rgba(193,193,193,1); +} + +.show { + padding: 0rpx 40rpx; + height: 24rpx; + font-size: 24rpx; + line-height: 24rpx; + font-weight: 500; + color: #C5C5C5; +} \ No newline at end of file diff --git a/pages/heartNew/heartNew.js b/pages/heartNew/heartNew.js index 25767b2..1756c67 100644 --- a/pages/heartNew/heartNew.js +++ b/pages/heartNew/heartNew.js @@ -9,6 +9,22 @@ Page({ statusHeight: 0, // 自定义头部状态栏高度 navigationHeight: 0, // 自定义头部导航栏高度 selectedTab: 'tab0', + // banner 相关 + banner: [{ + actId:'1', + bannerImg:'https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/B2/rBAAM16W7SqAY1XjAAMWUuGo2D4654.jpg', + }, + { + actId:'2', + bannerImg:'https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/B2/rBAAM16W7SqAY1XjAAMWUuGo2D4654.jpg', + }], + indicatorDots: false, //指示点 + autoplay: true, //true false,//自动播放 + circular: true, //衔接滑动 + interval: 4000, //自动播放间隔时长(ms) + duration: 500, //幻灯片切换时长(ms) + currentSwiper: 0 + // banner 相关end }, /** @@ -22,10 +38,28 @@ Page({ }, // tab 切换 tabBarChange(e) { + console.log(e.currentTarget.dataset.tab) + if (e.currentTarget.dataset.tab == 'tab3') { + wx.navigateTo({ + url: `/subpages/heart/pages/leaderboardNew/leaderboardNew` + }) + } this.setData({ selectedTab: e.currentTarget.dataset.tab }) }, + //返回上一级 + goback() { + wx.navigateBack({ + delta: 1 + }) + }, + // banner 切换 + swiperChange: function(e) { + this.setData({ + currentSwiper: e.detail.current + }) + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/pages/heartNew/heartNew.json b/pages/heartNew/heartNew.json index 37a163a..5cb8d09 100644 --- a/pages/heartNew/heartNew.json +++ b/pages/heartNew/heartNew.json @@ -7,7 +7,8 @@ "wux-tab": "/dist/tab/index", "activity": "../../components/activity/activity", "load-more": "../../components/loadMore/loadMore", - "no-data": "../../components/nodata/nodata" + "no-data": "../../components/nodata/nodata", + "volunteer-list":"./components/volunteer/volunteer" }, "enablePullDownRefresh": true, "backgroundColor": "#f8f8f8", diff --git a/pages/heartNew/heartNew.wxml b/pages/heartNew/heartNew.wxml index 03b993f..5de1df4 100644 --- a/pages/heartNew/heartNew.wxml +++ b/pages/heartNew/heartNew.wxml @@ -1,7 +1,15 @@ + - 志愿者去哪儿 + + + + + + 志愿者去哪儿 + + @@ -17,7 +25,38 @@ - + @@ -34,4 +73,12 @@ - \ No newline at end of file + + + 2222 + + + + + + \ No newline at end of file diff --git a/pages/heartNew/heartNew.wxss b/pages/heartNew/heartNew.wxss index 0d14c6b..4963dca 100644 --- a/pages/heartNew/heartNew.wxss +++ b/pages/heartNew/heartNew.wxss @@ -22,18 +22,46 @@ page { top: 0; } + + .header .navigation { - width: 100%; + /* width: calc(100% - 46rpx); + margin-left: 46rpx; */ + display: flex; + align-items: center; + /* justify-content: center; */ + position: relative; + z-index: 100; +} + +.header .navigation .goback { + width: 16rpx; + margin-left: 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + +.header .navigation .goback image { + width: 16rpx; + height: 28rpx; +} + +.header .navigation .title { display: flex; align-items: center; justify-content: center; + width: calc(100% - 46rpx); + margin-left: 46rpx; color: rgba(255, 255, 255, 0.9); font-size: 32rpx; - position: relative; - z-index: 100; letter-spacing: 2rpx; } +.header .navigation .title .title-right { + margin-right: 46rpx; +} + .home { width: 100%; } @@ -94,18 +122,173 @@ page { } /* banner 样式 */ -.banner { +.banner-main { position: absolute; width: calc(100% - 60rpx); height: 300rpx; margin-left: 30rpx; - background-color: royalblue; + background-color: #fff; z-index: 999; margin-top: -36rpx; box-shadow: 0px 6px 21px 0px rgba(122, 122, 122, 0.23); border-radius: 14rpx; } + +.page-body { + /* padding-top: 30rpx; */ + /* background: #fff; */ +} + +.page-section { + width: 100%; + margin-bottom: 60rpx; +} + +.page-section_center { + display: flex; + flex-direction: column; + align-items: center; +} + +.page-section:last-child { + margin-bottom: 0; +} + +.page-section-gap { + box-sizing: border-box; + padding: 0 30rpx; +} + +.page-section-spacing { + box-sizing: border-box; + /* padding: 0 20rpx; */ + height: 300rpx; +} + +swiper { + height: 300rpx; +} + +.page-section-title { + font-size: 28rpx; + color: #999; + margin-bottom: 10rpx; + padding-left: 30rpx; + padding-right: 30rpx; +} + +.page-section-gap .page-section-title { + padding-left: 0; + padding-right: 0; +} + +.demo-text-1 { + position: relative; + align-items: center; + justify-content: center; + background-color: #1aad19; + color: #fff; + font-size: 36rpx; +} + +.demo-text-1:before { + content: 'A'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.demo-text-2 { + position: relative; + align-items: center; + justify-content: center; + background-color: #2782d7; + color: #fff; + font-size: 36rpx; +} + +.demo-text-2:before { + content: 'B'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.demo-text-3 { + position: relative; + align-items: center; + justify-content: center; + background-color: #f1f1f1; + color: #353535; + font-size: 36rpx; +} + +.demo-text-3:before { + content: 'C'; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +button { + margin-bottom: 30rpx; +} + +button:last-child { + margin-bottom: 0; +} + +.page-section-title { + padding: 0; +} + +.swiper-item { + display: block; + height: 300rpx; +} + +.banner { + overflow: hidden; + height: 300rpx; + display: flex; + width: 100%; + border-radius: 16rpx; +} + +.dots { + display: flex; + justify-content: center; + margin-top: -23rpx; + z-index: 999; + position: relative; + + /* padding-bottom: 10rpx; */ +} + +.dots .dot { + width: 20rpx; + height: 6rpx; + margin-left: 8rpx; + background: rgba(247, 247, 247, 1); + opacity: 0.38; + border-radius: 3rpx; + transition: all 0.3s; +} + +.dots .dot.active { + width: 20rpx; + background: rgba(247, 247, 247, 1); + border-radius: 3rpx; + opacity: 1; + /* background-image: linear-gradient(90deg, #fc5555 58%, #fc5555 100%); */ +} + +/* banner end */ + .tab-all { position: absolute; width: 100%; @@ -177,4 +360,10 @@ page { .tab-bar .hover-tab { background: #f7f7f7; +} + + +/* 内容 */ +.details-top { + margin-top: 370rpx; } \ No newline at end of file diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index 2383b1b..91a7c6c 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -400,7 +400,7 @@ Page({ // 志愿者去哪 goheart() { wx.navigateTo({ - url: `../heart/heart` + url: `../heartNew/heartNew` }) }, // 跳转我的 diff --git a/subpages/discussion/images/edit.png b/subpages/discussion/images/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..bd1e0c19b6ebe5f653fe985b24a45eb1bb4bbba0 GIT binary patch literal 2333 zcmV+&3F7vNP)3pmmfm;jKak3Jp>!0n8A#^Yi9#7XRIwj>gVV_??gzM6 zs~qKCgJHnoQFJC$xuXu)!`t{CgQ4jlK=-u)#mVG-qGYt`R4AZD6|g=#xCgU$9|+yr zgF(Pm7R14aMjQXBHMFPzmbHrw<+Yv%A!0X!y2ylJ2lK#^amEue?PZxo1+c!GIK^vh z`VRoBtg3DrIZ5RHhbCy(X;A@8s{hgL?lBD7p%9pK`*e}O8HdLhk1O>JWFIxaB=L`I zZOR7mJ1Ppd3(P|gO)wr&;oHI`Vu3xnoh_p1d7Bu!4o@_0_o;q(TVp1e-c?b!i$xkz zniEr^!q@K-k-&bkj!o8B&u7f|WwTP^5v3DMdwi-N+S-^+Olmsqx+o&!Xs)qTEwqRO zcK8jk$2uq^^JuPVx6kGm zo82P;enVODYGMJ)Xc@<-}mdoa2*C zugkG*Z4*{ty^Gl_dOZ6GieUL_5SfvEV#>|Sv-bvfE`v990OGjGZR}f;PxVm+tXC1o z8)6%!G3#+P!u>u>Sts&LfARhP`TB+&0Gk8FB*Iy*LCp9v*IcePXLvfy#=_4mjnboo zlFP8o8i^?L)=rb4G2aI5f(Y^PlX>P#YGH+C43lOa&RuDg9vub*BfOO_gDCUMyqhpvh7lO^HYln5+$+1b*4SQKzSpG2$%+H^kZuVcEy;j%TAmBGm zUK)BjKejAbSh{vtR~yGBCN_KkLWUN?+ls-&*{7zN{qLGRH`G}FJvp&TtDL%Z*iTp0 z?+5UtR>IqhLxk}?eh|C!-E8t|oiFsjY%DyG(C|LML$ns(Ry+bOlNi_ihar?op3T){AuUAab zx6IaaS?z}e4AK!+B^ksgPR~p@9m<^AcNjDETw3=Y2+xF4c&pfzBw*l~+3}jp+qZi| z(Xyz1HtuxAR3}Zn=n1RB3k)hNh}U#Et(_Z+M#yX|bT`%R1!Jg25#@w&iA4SNf~Dz$ z>wSx_?*;I*oGLZ4sSyS0f4(68m`3qrh0$aT>$b3VH-SgU%BYP|4U;(d{M^Jt+JuuI zB{*O<7P<-7rPmNWVYvuAr0liCpq9(zBWh_G6tEu`UfTo4vucy8@T(){0q1S{ca~49 zYG6OIU6VR1Q$^8gT^b}m^AS(u;o<%Cv?5^l&a2V;GW39H(8WdJ?<~b**bnDczYWmyvQI_u zhF%Eb;QtjSOY>+EbI9tjE_18j1mguARlAum{L-Q%X;mqrj&^}{wK-;;{a{_o+`O=h8KINTfy9$V)>U#tk)iX0^URj>v z|G-3sPgqO>1AE1_7>rkmvEp)3@~m5-0h&W&2C}a%Pxh}ThJ}R8q=A9Wbbi4^&EIJe zu=Gk%a)B@2_h(km1973u_#K-OvZ4i6z(K$B4ClQfL0Tp5bhBDo{LPBwxqfJ~oC}!o zTE{dxuwZ`So0XQgf{vqOfZIAOeTH)+fIwgL6;`ZFneWq*A?^p)L z><(cukF~F{{=Or-Nd9{ZVAg4lIRF;P6#Qz{8p{%&t!0{{h=7@G`7-l3$6Bl6y+Sgz z=w{Xu*wm^60QHxhol#J=&a%{JpPJ`f$;A1s{Rupwa;+6dZ6{!?iWto<%$V-lXqCDP_e}pfuFhkA#<9Vw>IA6O zpoiZLU|DQPPIr`n&^4H(#3*v6S?0o~e1}CadG+*d29`Lf@*yIq-V*n%U@r(~h{RE@ z_365N7@{XAU#@0gNx78;P&ajRiGWYRbkHk^UtHUmb`BFb23yG!j$-u4*$gZpxAGtX zzmk!#37`@%e@0CIs5aMqj@4aMZ9$QdDK4@Awmy@ zzTYWxW}L0xmcE|Mx^tIQc>3-DQwZ$;LfraoPR)5500000NkvXXu0mjf D|5SxD literal 0 HcmV?d00001 diff --git a/subpages/discussion/pages/addIssue/addIssue.js b/subpages/discussion/pages/addIssue/addIssue.js index f968aab..f022698 100644 --- a/subpages/discussion/pages/addIssue/addIssue.js +++ b/subpages/discussion/pages/addIssue/addIssue.js @@ -13,7 +13,8 @@ Page({ uploadImageList: [], imageId: 1, dialogVisible: false, - publishIssuePrevious: 0 + publishIssuePrevious: 0, + focus: false }, onLoad () { this.data.qqMapWX = new QQMapWX({ @@ -250,5 +251,11 @@ Page({ wx.navigateBack({ delta: 1 }) - } + }, + // Textarea获取焦点 + clickTextarea() { + this.setData({ + focus: true + }) + }, }) \ No newline at end of file diff --git a/subpages/discussion/pages/addIssue/addIssue.wxml b/subpages/discussion/pages/addIssue/addIssue.wxml index b367be7..83aede9 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxml +++ b/subpages/discussion/pages/addIssue/addIssue.wxml @@ -23,10 +23,13 @@ - + + + + - 议题定位 + 若地址不符，可点击编辑文字 diff --git a/subpages/discussion/pages/addIssue/addIssue.wxss b/subpages/discussion/pages/addIssue/addIssue.wxss index bbd8f7d..1ff3f27 100644 --- a/subpages/discussion/pages/addIssue/addIssue.wxss +++ b/subpages/discussion/pages/addIssue/addIssue.wxss @@ -86,11 +86,21 @@ page { align-items: center; } .add-issue .issue-location textarea { - width:100%; + width:calc(100% - 70rpx); height: 88rpx; color: #333; font-size: 34rpx; line-height: 46rpx; + float: left; +} +.add-issue .issue-location .edit{ + width:70rpx; + height: 88rpx; + float: left; +} +.add-issue .issue-location .edit image{ + width: 38rpx; + height: 36rpx; } .add-issue .issue-location .address-placeholder { font-size: 32rpx;