Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
6d8c72fe by simon
Options

默认提交

1 parent e34d816f
Inline Side-by-side
Showing 5 changed files with 41 additions and 23 deletions
...@@ -52,7 +52,7 @@ Page({ ...@@ -52,7 +52,7 @@ Page({
52 ownerMember, 52 ownerMember,
53 isAuth 53 isAuth
54 } = this.data; 54 } = this.data;
55 let title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式`; 55 let title = "亲爱的家人们新年快乐";
56 let shareType = "" 56 let shareType = ""
57 // let imageUrl = detailData && detailData.thumbnail || ""; 57 // let imageUrl = detailData && detailData.thumbnail || "";
58 if (res.from === 'button') { 58 if (res.from === 'button') {
...@@ -60,7 +60,9 @@ Page({ ...@@ -60,7 +60,9 @@ Page({
60 // shareType == join 分享给家人,能加入 组队模式 60 // shareType == join 分享给家人,能加入 组队模式
61 shareType = res.target.dataset.data || ""; 61 shareType = res.target.dataset.data || "";
62 console.log("shareType:", shareType); 62 console.log("shareType:", shareType);
63 title 63 if (shareType) {
64 title = `${ownerMember.memberName}邀请您组队发祝福！体验今年最火爆的拜年方式`
65 } else {}
64 } else {} 66 } else {}
65 67
66 // 已经定制会提供房主的memberCode 68 // 已经定制会提供房主的memberCode
...@@ -69,7 +71,7 @@ Page({ ...@@ -69,7 +71,7 @@ Page({
69 console.log("share path:", path); 71 console.log("share path:", path);
70 72
71 return { 73 return {
72 // title, 74 title,
73 path, 75 path,
74 // imageUrl 76 // imageUrl
75 } 77 }
...@@ -202,6 +204,13 @@ Page({ ...@@ -202,6 +204,13 @@ Page({
202 }) 204 })
203 }, 205 },
204 206
207 onHideMoreHandler() {
208 this.setData({
209 isMore: false
210 })
211 },
212
213
205 showTips(evt) { 214 showTips(evt) {
206 let tips = getBindtapData(evt); 215 let tips = getBindtapData(evt);
207 wx.showModal({ 216 wx.showModal({
...@@ -710,7 +719,7 @@ Page({ ...@@ -710,7 +719,7 @@ Page({
710 } catch (error) {} 719 } catch (error) {}
711 let memberList = result.memberList; 720 let memberList = result.memberList;
712 // hardcode数据 721 // hardcode数据
713 // for (let index = 0; index < 4; index++) { 722 // for (let index = 0; index < 6; index++) {
714 // memberList.push({ 723 // memberList.push({
715 // blessCode: "4144feba2b904ba89585d90e8618a863", 724 // blessCode: "4144feba2b904ba89585d90e8618a863",
716 // blessMemberCode: "747e8e314d0e46679be17fb495975439", 725 // blessMemberCode: "747e8e314d0e46679be17fb495975439",
......
...@@ -96,7 +96,7 @@ $blessContentLabelWidth: 650px; ...@@ -96,7 +96,7 @@ $blessContentLabelWidth: 650px;
96 } 96 }
97 97
98 .page { 98 .page {
99 padding-bottom: 200px; 99 // padding-bottom: 200px;
100 100
101 .bgc {} 101 .bgc {}
102 102
...@@ -183,15 +183,16 @@ $blessContentLabelWidth: 650px; ...@@ -183,15 +183,16 @@ $blessContentLabelWidth: 650px;
183 .group { 183 .group {
184 width: 660px; 184 width: 660px;
185 display: flex; 185 display: flex;
186 justify-content: flex-start; 186 // justify-content: flex-start;
187 justify-content: center;
187 flex-wrap: wrap; 188 flex-wrap: wrap;
188 margin: 36px auto 0; 189 margin: 36px auto 0;
189 height: 450px; 190 // height: 450px;
190 overflow: hidden; 191 overflow: hidden;
191 192
192 // 193 //
193 &-item { 194 &-item {
194 align-self: flex-start; 195 // align-self: flex-start;
195 width: 33.33%; 196 width: 33.33%;
196 text-align: center; 197 text-align: center;
197 margin-bottom: 32px; 198 margin-bottom: 32px;
...@@ -204,7 +205,7 @@ $blessContentLabelWidth: 650px; ...@@ -204,7 +205,7 @@ $blessContentLabelWidth: 650px;
204 border-image-slice: 1; 205 border-image-slice: 1;
205 border-width: 4px; 206 border-width: 4px;
206 border-image-source: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5); 207 border-image-source: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
207 background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5); 208 // background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
208 } 209 }
209 210
210 &-name { 211 &-name {
...@@ -237,15 +238,12 @@ $blessContentLabelWidth: 650px; ...@@ -237,15 +238,12 @@ $blessContentLabelWidth: 650px;
237 } 238 }
238 } 239 }
239 240
240 .fc { 241 .six {
241 display: flex; 242 height: 458px;
242 justify-content: center;
243 } 243 }
244 244
245
246 .all { 245 .all {
247 height: auto; 246 height: auto;
248 // overflow: auto;
249 overflow: visible; 247 overflow: visible;
250 } 248 }
251 249
...@@ -256,7 +254,7 @@ $blessContentLabelWidth: 650px; ...@@ -256,7 +254,7 @@ $blessContentLabelWidth: 650px;
256 font-weight: 500; 254 font-weight: 500;
257 text-align: center; 255 text-align: center;
258 color: #e16e6e; 256 color: #e16e6e;
259 padding-top: 32px; 257 margin-top: 24px;
260 258
261 .icon-down { 259 .icon-down {
262 width: 32px; 260 width: 32px;
...@@ -265,6 +263,10 @@ $blessContentLabelWidth: 650px; ...@@ -265,6 +263,10 @@ $blessContentLabelWidth: 650px;
265 } 263 }
266 } 264 }
267 265
266 .more2{
267 margin-top: 0;
268 }
269
268 // 句子 270 // 句子
269 .sentence { 271 .sentence {
270 margin: 64px auto 0; 272 margin: 64px auto 0;
...@@ -350,9 +352,13 @@ $blessContentLabelWidth: 650px; ...@@ -350,9 +352,13 @@ $blessContentLabelWidth: 650px;
350 } 352 }
351 353
352 &-image-bot { 354 &-image-bot {
355 margin: 48px auto 0;
356 width: 750px;
357 display: block;
358 }
353 359
354 margin: 48px auto; 360 &-bot-space {
355 width: $blessContentWidth; 361 min-height: 156px;
356 } 362 }
357 363
358 } 364 }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <view class="app__bgc bgc" style="background-color: {{detailData.background}};"></view> 3 <view class="app__bgc bgc" style="background-color: {{detailData.background}};"></view>
4 <!-- <view class="app__bg bg " style="background: url('{{detailData.backgroundImage}}')"></view> --> 4 <!-- <view class="app__bg bg " style="background: url('{{detailData.backgroundImage}}')"></view> -->
5 <image mode="scaleToFill" class="ebg" src="{{detailData.backgroundImage}}" /> 5 <image mode="scaleToFill" class="ebg" src="{{detailData.backgroundImage}}" />
6 <image mode="aspectF" class="ebg" src="{{detailData.backgroundGif}}" /> 6 <image mode="aspectFill" class="ebg" src="{{detailData.backgroundGif}}" />
7 <view class="app__content main"> 7 <view class="app__content main">
8 <!-- 顶部背景 --> 8 <!-- 顶部背景 -->
9 <image class="top-bg" mode="widthFix" src="{{detailData.headImage}}" /> 9 <image class="top-bg" mode="widthFix" src="{{detailData.headImage}}" />
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <view class="tt t2">{{detailData.count}}人</view> 30 <view class="tt t2">{{detailData.count}}人</view>
31 </view> 31 </view>
32 <!-- 用户组 --> 32 <!-- 用户组 -->
33 <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}} {{memberList.length < 1 ? 'fc':''}}"> 33 <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}} {{memberList.length >= 6 && !isMore ? 'six':''}}">
34 <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item"> 34 <view wx:for="{{memberList}}" wx:key="{{index}}" class="group-item">
35 <image class="group-item-portrait" mode="scaleToFill" src="{{item.memberHead}}" /> 35 <image class="group-item-portrait" mode="scaleToFill" src="{{item.memberHead}}" />
36 <view class="group-item-name"> 36 <view class="group-item-name">
...@@ -53,6 +53,10 @@ ...@@ -53,6 +53,10 @@
53 查看更多 53 查看更多
54 <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-down-arrow.png" /> 54 <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-down-arrow.png" />
55 </view> 55 </view>
56 <view bindtap="onHideMoreHandler" wx:if="{{memberList.length >= 6 && isMore}}" class="more more2">
57 收起
58 <image class="icon-down" mode="widthFix" src="../../image/blessing/icon-up-arrow.png" />
59 </view>
56 <!-- 自定义句子 --> 60 <!-- 自定义句子 -->
57 <view class="sentence">{{detailData.blessTitle}}</view> 61 <view class="sentence">{{detailData.blessTitle}}</view>
58 </view> 62 </view>
...@@ -93,13 +97,12 @@ ...@@ -93,13 +97,12 @@
93 </view> 97 </view>
94 </view> 98 </view>
95 <!-- 尾图 --> 99 <!-- 尾图 -->
96 <image class="tail-image-bot" mode="scaleToFill" src="{{detailData.tailImage}}" /> 100 <image wx:if="{{detailData.tailImage}}" class="tail-image-bot" mode="widthFix" src="{{detailData.tailImage}}" />
101 <view wx:else class="tail-bot-space"></view>
97 </view> 102 </view>
98 </view> 103 </view>
99 <!-- fix底部 --> 104 <!-- fix底部 -->
100 <view class="bottom"> 105 <view class="bottom">
101 <!-- <image class="bottom-bg" mode="scaleToFill" src="{{detailData.tailImage}}" /> -->
102 <!-- <image class="bottom-bg" mode="widthFix" src="{{detailData.tailImage}}" /> -->
103 <!-- 分情况显示btn-wrap --> 106 <!-- 分情况显示btn-wrap -->
104 <!-- 单人 --> 107 <!-- 单人 -->
105 <block wx:if="{{detailData.type == 0}}"> 108 <block wx:if="{{detailData.type == 0}}">
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 <image class="poster" src="{{item.thumbnail}}" /> 30 <image class="poster" src="{{item.thumbnail}}" />
31 <view class="desc-wrap"> 31 <view class="desc-wrap">
32 <view class="tit">{{item.blessTitle}}</view> 32 <view class="tit">{{item.blessTitle}}</view>
33 <view class="scene">{{item.type == 0 ? '单人祝福 >> 送' : '单团队祝福 >> 送'}}{{item.scene}}</view> 33 <view class="scene">{{item.type == 0 ? '单人祝福 >> 送' : '团队祝福 >> 送'}}{{item.scene}}</view>
34 </view> 34 </view>
35 </view> 35 </view>
36 </block> 36 </block>
......