Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
55251512 by simon
Options

默认提交

1 parent 181c0ddf
Inline Side-by-side
Showing 6 changed files with 148 additions and 81 deletions
...@@ -28,7 +28,7 @@ module.exports = { ...@@ -28,7 +28,7 @@ module.exports = {
28 */ 28 */
29 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询 29 areaQuery: 'https://api.k.wxpai.cn/bizproxy/kdapi/area', // post 区域查询
30 30
31 wxacodeGet: "/mzcfsapi/qrcode/createV2", // 通用上传 ?path=/pages/index/index?pa=1 31 wxacodeGet: "/wx/create/wxacode", // 通用上传 ?path=/pages/index/index?pa=1
32 uploadFile: '/kdapi/file/upload', //上传图片通用接口 32 uploadFile: '/kdapi/file/upload', //上传图片通用接口
33 33
34 } 34 }
......
...@@ -58,6 +58,13 @@ Page({ ...@@ -58,6 +58,13 @@ Page({
58 options 58 options
59 } = this.data; 59 } = this.data;
60 let title = "亲爱的家人们新年快乐"; 60 let title = "亲爱的家人们新年快乐";
61 if (detailData.type == 0) {
62 // 单人 给您拜年啦！来看看是怎样特别的祝福
63 title = `${ownerMember.memberName}给您拜年啦！来看看是怎样特别的祝福`;
64 } else {
65 // 团队
66 title = `${ownerMember.memberName}携${ownerMember.memberName}${detailData.count}人给您拜年啦！看看这xx都是谁`;
67 }
61 let shareType = "" 68 let shareType = ""
62 // let imageUrl = detailData && detailData.thumbnail || ""; 69 // let imageUrl = detailData && detailData.thumbnail || "";
63 if (res.from === 'button') { 70 if (res.from === 'button') {
...@@ -143,7 +150,7 @@ Page({ ...@@ -143,7 +150,7 @@ Page({
143 } 150 }
144 }); 151 });
145 152
146 /** 153 /**q
147 * 显示加入房间条件 154 * 显示加入房间条件
148 * 1.已定制 155 * 1.已定制
149 * 2.类型为组队类型 156 * 2.类型为组队类型
...@@ -331,15 +338,18 @@ Page({ ...@@ -331,15 +338,18 @@ Page({
331 detailData 338 detailData
332 } = this.data; 339 } = this.data;
333 let memberCode = app.store.getItem("memberCode"); 340 let memberCode = app.store.getItem("memberCode");
334 let wxCodePath = `pages/blessing/blessing?c=${detailData.blessCode}&m=${memberCode}`; 341 // let wxCodePath = `pages/blessing/blessing?c=${detailData.blessCode}&m=${memberCode}`;
335 342
336 return new Promise((resolve, reject) => { 343 return new Promise((resolve, reject) => {
337 // 先获取小程序码 344 // 先获取小程序码
338 app.get({ 345 app.post({
339 mode: "common",
340 url: app.api.wxacodeGet, 346 url: app.api.wxacodeGet,
341 data: { 347 data: {
342 path: encodeURIComponent(wxCodePath) 348 page: "pages/blessing/blessing",
349 content: JSON.stringify({
350 blessCode: detailData.blessCode || "",
351 ownerMemberCode: memberCode || "",
352 })
343 } 353 }
344 }).then((result) => { 354 }).then((result) => {
345 this.setData({ 355 this.setData({
...@@ -441,6 +451,7 @@ Page({ ...@@ -441,6 +451,7 @@ Page({
441 { 451 {
442 width: 100, 452 width: 100,
443 height: 100, 453 height: 100,
454 borderRadius: 100,
444 x: 586, 455 x: 586,
445 y: 1198, 456 y: 1198,
446 url: wxCodeUrl, 457 url: wxCodeUrl,
...@@ -486,15 +497,6 @@ Page({ ...@@ -486,15 +497,6 @@ Page({
486 let wid = 160; 497 let wid = 160;
487 let startY = 800; 498 let startY = 800;
488 memberDrawList.forEach((element, idx) => { 499 memberDrawList.forEach((element, idx) => {
489 // blocks.push({
490 // x: endX - (idx * wid) - ((wid - 92)),
491 // y: startY,
492 // width: 92,
493 // height: 92,
494 // borderRadius: 92,
495 // zIndex: 90,
496 // borderColor: "#fee085",
497 // })
498 images.push({ 500 images.push({
499 x: endX - (idx * wid) - ((wid - 92) / 2) - 4, 501 x: endX - (idx * wid) - ((wid - 92) / 2) - 4,
500 y: startY + 2, 502 y: startY + 2,
...@@ -516,15 +518,17 @@ Page({ ...@@ -516,15 +518,17 @@ Page({
516 }) 518 })
517 }); 519 });
518 520
519 texts.push({ 521 if (detailData.count > 0) {
520 x: 686, 522 texts.push({
521 y: startY + 200, 523 x: 686,
522 fontSize: 48, 524 y: startY + 200,
523 color: "#fee085", 525 fontSize: 48,
524 textAlign: "right", 526 color: "#fee085",
525 zIndex: 11, 527 textAlign: "right",
526 text: `长按查看全部${detailData.count}人 >>`, 528 zIndex: 11,
527 }) 529 text: `长按查看祝福`,
530 })
531 }
528 } 532 }
529 533
530 let posterData = { 534 let posterData = {
...@@ -548,7 +552,6 @@ Page({ ...@@ -548,7 +552,6 @@ Page({
548 files: [] 552 files: []
549 }) 553 })
550 }); 554 });
551
552 }, 555 },
553 556
554 // 房主名字 557 // 房主名字
...@@ -727,11 +730,16 @@ Page({ ...@@ -727,11 +730,16 @@ Page({
727 */ 730 */
728 queryBlessDetail() { 731 queryBlessDetail() {
729 return new Promise((resolve, reject) => { 732 return new Promise((resolve, reject) => {
733 let {
734 options
735 } = this.data;
736 const scene = options.scene || "";
730 app.post({ 737 app.post({
731 url: app.api.blessDetail, 738 url: app.api.blessDetail,
732 data: { 739 data: {
733 blessCode: this.data.options.c, 740 blessCode: this.data.options.c || "",
734 ownerMemberCode: this.data.options.m ? this.data.options.m : app.store.getItem("memberCode") ? app.store.getItem("memberCode") : "", 741 ownerMemberCode: this.data.options.m ? this.data.options.m : app.store.getItem("memberCode") ? app.store.getItem("memberCode") : "",
742 scene: scene || ""
735 } 743 }
736 }).then((result) => { 744 }).then((result) => {
737 let blessContent = []; 745 let blessContent = [];
...@@ -811,30 +819,37 @@ Page({ ...@@ -811,30 +819,37 @@ Page({
811 * 加入房间 819 * 加入房间
812 */ 820 */
813 onBlessJoinHandler(e) { 821 onBlessJoinHandler(e) {
814 let { 822 this.checkAuthShowComp().then((result) => {
815 options, 823 let {
816 detailData 824 options,
817 } = this.data; 825 detailData
818 app.post({ 826 } = this.data;
819 url: app.api.blessJoin, 827 app.post({
820 data: { 828 url: app.api.blessJoin,
821 ownerMemberCode: options.m, 829 data: {
822 blessCode: detailData.blessCode 830 ownerMemberCode: options.m,
823 } 831 blessCode: detailData.blessCode
824 }).then((result) => { 832 }
825 this.setData({ 833 }).then((result) => {
826 isJoin: false 834 this.setData({
827 }) 835 isJoin: false
828 this.queryBlessDetail().then((result) => {
829 wx.showModal({
830 showCancel: false,
831 content: '加入成功',
832 success(res) {}
833 }) 836 })
837 this.queryBlessDetail().then((result) => {
838 wx.showModal({
839 showCancel: false,
840 content: '加入成功',
841 success(res) {}
842 })
843 });
844 }).catch((err) => {
845
834 }); 846 });
835 }).catch((err) => { 847 }).catch((err) => {
836 848
837 }); 849 });
850
851
852
838 }, 853 },
839 854
840 // 点击确认授权按钮 855 // 点击确认授权按钮
......
...@@ -21,18 +21,18 @@ $blessContentLabelWidth: 650px; ...@@ -21,18 +21,18 @@ $blessContentLabelWidth: 650px;
21 position: relative; 21 position: relative;
22 margin: 24px auto; 22 margin: 24px auto;
23 text-align: center; 23 text-align: center;
24 width: 216px; 24 // width: 216px;
25 @extend .fcc; 25 @extend .fcc;
26 26
27 &-inner { 27 &-inner {
28 width: 167px; 28 width: 190px;
29 height: 167px; 29 height: 190px;
30 border-radius: 167px; 30 border-radius: 190px;
31 } 31 }
32 32
33 &-border { 33 &-border {
34 width: 191px; 34 width: 216px;
35 height: 191px; 35 height: 216px;
36 position: absolute; 36 position: absolute;
37 } 37 }
38 } 38 }
...@@ -106,6 +106,9 @@ $blessContentLabelWidth: 650px; ...@@ -106,6 +106,9 @@ $blessContentLabelWidth: 650px;
106 height: 100%; 106 height: 100%;
107 } 107 }
108 108
109
110 .ebggif {}
111
109 .main { 112 .main {
110 position: relative; 113 position: relative;
111 114
...@@ -129,6 +132,8 @@ $blessContentLabelWidth: 650px; ...@@ -129,6 +132,8 @@ $blessContentLabelWidth: 650px;
129 font-weight: 500; 132 font-weight: 500;
130 text-align: center; 133 text-align: center;
131 color: #fee085; 134 color: #fee085;
135 width: $blessContentWidth;
136 margin: 0 auto;
132 } 137 }
133 138
134 // 用户 139 // 用户
...@@ -263,7 +268,7 @@ $blessContentLabelWidth: 650px; ...@@ -263,7 +268,7 @@ $blessContentLabelWidth: 650px;
263 } 268 }
264 } 269 }
265 270
266 .more2{ 271 .more2 {
267 margin-top: 0; 272 margin-top: 0;
268 } 273 }
269 274
...@@ -345,10 +350,38 @@ $blessContentLabelWidth: 650px; ...@@ -345,10 +350,38 @@ $blessContentLabelWidth: 650px;
345 margin-right: 40px; 350 margin-right: 40px;
346 margin-top: 24px; 351 margin-top: 24px;
347 352
353
348 .t1 { 354 .t1 {
349 text-decoration: underline; 355 text-decoration: underline;
350 } 356 }
351 } 357 }
358
359 &-item {
360 display: flex;
361 justify-content: flex-end;
362
363 .btn {
364 @extend .bb;
365 margin: 24px 45px 8px 0;
366 height: 76px;
367 line-height: 76px;
368 padding: 0 20px;
369 color: #fee085;
370 font-size: 36px;
371 border-radius: 8px;
372 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73);
373 // background-image: linear-gradient(to top, #b41d36, #bb2634);
374 background-image: linear-gradient(to top, #e65638, #dd784d);
375 }
376
377 .btn2 {
378 color: #940023;
379 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73);
380 background-image: linear-gradient(to top, #f4b44d, #e8b976, #ffebb5);
381 }
382 }
383
384
352 } 385 }
353 386
354 &-image-bot { 387 &-image-bot {
...@@ -358,7 +391,7 @@ $blessContentLabelWidth: 650px; ...@@ -358,7 +391,7 @@ $blessContentLabelWidth: 650px;
358 } 391 }
359 392
360 &-bot-space { 393 &-bot-space {
361 min-height: 156px; 394 min-height: 166px;
362 } 395 }
363 396
364 } 397 }
...@@ -384,7 +417,7 @@ $blessContentLabelWidth: 650px; ...@@ -384,7 +417,7 @@ $blessContentLabelWidth: 650px;
384 position: relative; 417 position: relative;
385 display: flex; 418 display: flex;
386 justify-content: center; 419 justify-content: center;
387 margin: 0px auto 42px; 420 margin: 0px auto 52px;
388 421
389 .btn { 422 .btn {
390 margin: 0 22px; 423 margin: 0 22px;
...@@ -395,6 +428,7 @@ $blessContentLabelWidth: 650px; ...@@ -395,6 +428,7 @@ $blessContentLabelWidth: 650px;
395 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73); 428 box-shadow: 5.9px 5.5px 18px 0 rgba(26, 36, 91, 0.73);
396 // background-image: linear-gradient(to top, #b41d36, #bb2634); 429 // background-image: linear-gradient(to top, #b41d36, #bb2634);
397 background-image: linear-gradient(to top, #e65638, #dd784d); 430 background-image: linear-gradient(to top, #e65638, #dd784d);
431 padding: 0;
398 } 432 }
399 433
400 .btn2 { 434 .btn2 {
......
1 <poster id="poster" hide-loading="{{true}}" preload="{{false}}" config="{{posterConfig}}" bind:success="onPosterSuccess" bind:fail="onPosterFail"></poster> 1 <poster id="poster" hide-loading="{{true}}" preload="{{false}}" config="{{posterConfig}}" bind:success="onPosterSuccess" bind:fail="onPosterFail"></poster>
2 <view class="page"> 2 <view class="page">
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> -->
5 <image mode="scaleToFill" class="ebg" src="{{detailData.backgroundImage}}" /> 4 <image mode="scaleToFill" class="ebg" src="{{detailData.backgroundImage}}" />
6 <image mode="aspectFill" class="ebg" src="{{detailData.backgroundGif}}" /> 5 <!-- <image mode="aspectFill" class="ebg" src="{{detailData.backgroundGif}}" /> -->
6 <view class="ebggif" style="background: url('{{detailData.backgroundGif}}');position: fixed;width: 100%;height: 100%; background-size: 100% 100%;background-size: contain;"></view>
7 <!-- <view class="ebggif" ></view> -->
7 <view class="app__content main"> 8 <view class="app__content main">
8 <!-- 顶部背景 --> 9 <!-- 顶部背景 -->
9 <image class="top-bg" mode="widthFix" src="{{detailData.headImage}}" /> 10 <image class="top-bg" mode="widthFix" src="{{detailData.headImage}}" />
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
27 <view wx:if="{{detailData.type == 1}}" class="edit"> 28 <view wx:if="{{detailData.type == 1}}" class="edit">
28 <view class="tt t1">{{isAuth ? '携' + detailData.familyName : '携家人'}}</view> 29 <view class="tt t1">{{isAuth ? '携' + detailData.familyName : '携家人'}}</view>
29 <image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateRoomDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" /> 30 <image wx:if="{{ownerMember.mySelf == 1}}" bindtap="showUpdateRoomDialog" class="name-edit" mode="widthFix" src="../../image/blessing/icon-edit.png" />
30 <view class="tt t2">{{detailData.count}}人</view> 31 <view wx:if="{{memberList.length > 0}}" class="tt t2">{{detailData.count}}人</view>
31 </view> 32 </view>
32 <!-- 用户组 --> 33 <!-- 用户组 -->
33 <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}} {{memberList.length >= 6 && !isMore ? 'six':''}}"> 34 <view wx:if="{{detailData.type == 1}}" class="group {{isMore ? 'all' : ''}} {{memberList.length >= 6 && !isMore ? 'six':''}}">
...@@ -40,12 +41,27 @@ ...@@ -40,12 +41,27 @@
40 </view> 41 </view>
41 <!-- 邀请 房主或组队模式显示 --> 42 <!-- 邀请 房主或组队模式显示 -->
42 <view class="group-item" wx:if="{{options.t || ownerMember.mySelf == 1}}"> 43 <view class="group-item" wx:if="{{options.t || ownerMember.mySelf == 1}}">
43 <button wx:if="{{isAuth}}" data-data="join" open-type="share" class="group-item-inv"> 44 <block wx:if="{{isAuth}}">
44 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" /> 45 <!-- 已授权 -->
45 </button> 46 <!-- 未定制 -->
46 <button wx:else open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="group-item-inv"> 47 <block wx:if="{{detailData.customMade == 0}}">
47 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" /> 48 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="group-item-inv">
48 </button> 49 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
50 </button>
51 </block>
52 <!-- 已定制 -->
53 <block wx:else>
54 <button data-data="join" open-type="share" class="group-item-inv">
55 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
56 </button>
57 </block>
58 </block>
59 <block wx:else>
60 <!-- 未授权 -->
61 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="group-item-inv">
62 <image class="icon-inv" mode="widthFix" src="../../image/icon/icon-inv.png" />
63 </button>
64 </block>
49 </view> 65 </view>
50 </view> 66 </view>
51 <!-- 更多 --> 67 <!-- 更多 -->
...@@ -86,14 +102,12 @@ ...@@ -86,14 +102,12 @@
86 <view class="tail-btn-wrap"> 102 <view class="tail-btn-wrap">
87 <!-- 分享团队图片 --> 103 <!-- 分享团队图片 -->
88 <image bindtap="onPosterHandler" wx:if="{{detailData.type == 1}}" mode="widthFix" class="tail-btn-wrap-item blessing-share-group-btn" src="../../image/blessing/blessing-share-group-btn.png" /> 104 <image bindtap="onPosterHandler" wx:if="{{detailData.type == 1}}" mode="widthFix" class="tail-btn-wrap-item blessing-share-group-btn" src="../../image/blessing/blessing-share-group-btn.png" />
89 <view wx:if="{{detailData.type == 0}}" bindtap="toReward" class="tail-btn-wrap-item more-template"> 105 <view wx:if="{{detailData.type == 0}}" bindtap="toReward" class="tail-btn-wrap-item more-template2">
90 <span class="t1">赞赏祝福</span> 106 <view class="btn btn2">赞赏祝福</view>
91 >>
92 </view> 107 </view>
93 <!-- 选择更多祝福模板 --> 108 <!-- 选择更多祝福模板 -->
94 <view bindtap="onMoreTemplateHandler" class="tail-btn-wrap-item more-template"> 109 <view bindtap="onMoreTemplateHandler" class="tail-btn-wrap-item more-template2 ">
95 <span class="t1">选择更多祝福模版</span> 110 <view class="btn btn2">选择更多祝福模版 >></view>
96 >>
97 </view> 111 </view>
98 </view> 112 </view>
99 <!-- 尾图 --> 113 <!-- 尾图 -->
...@@ -117,7 +131,7 @@ ...@@ -117,7 +131,7 @@
117 <!-- 已定制 --> 131 <!-- 已定制 -->
118 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap"> 132 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
119 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button> 133 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
120 <button open-type="share" class="btn btn2">送出我的祝福</button> 134 <button open-type="share" class="btn btn2">送祝福给亲友</button>
121 </view> 135 </view>
122 </block> 136 </block>
123 <!-- 组队 --> 137 <!-- 组队 -->
...@@ -127,7 +141,7 @@ ...@@ -127,7 +141,7 @@
127 <!-- 未授权 --> 141 <!-- 未授权 -->
128 <block wx:if="{{!isAuth}}"> 142 <block wx:if="{{!isAuth}}">
129 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1"> 143 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn1">
130 邀请家人加入 144 邀亲友组团拜年
131 </button> 145 </button>
132 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2"> 146 <button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
133 定制我的祝福 147 定制我的祝福
...@@ -135,7 +149,7 @@ ...@@ -135,7 +149,7 @@
135 </block> 149 </block>
136 <!-- 已授权 --> 150 <!-- 已授权 -->
137 <block wx:else> 151 <block wx:else>
138 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="btn btn1">邀请家人加入</button> 152 <button bindtap="showTips" data-data="请定制祝福后再邀请" class="btn btn1">邀亲友组团拜年</button>
139 <button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button> 153 <button bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</button>
140 </block> 154 </block>
141 </view> 155 </view>
...@@ -147,9 +161,9 @@ ...@@ -147,9 +161,9 @@
147 </block> 161 </block>
148 <!-- 不能加入状态 --> 162 <!-- 不能加入状态 -->
149 <block wx:else> 163 <block wx:else>
150 <button data-data="join" open-type="share" class="btn btn1">邀请家人加入</button> 164 <button data-data="join" open-type="share" class="btn btn1">邀亲友组团拜年</button>
151 </block> 165 </block>
152 <button open-type="share" class="btn btn2">送出我的祝福</button> 166 <button open-type="share" class="btn btn2">送祝福给亲友</button>
153 </view> 167 </view>
154 </block> 168 </block>
155 </view> 169 </view>
......
...@@ -78,16 +78,19 @@ ...@@ -78,16 +78,19 @@
78 &-bless-item { 78 &-bless-item {
79 display: flex; 79 display: flex;
80 justify-content: space-between; 80 justify-content: space-between;
81 border-bottom: solid 2px #dfdfdf; 81 padding: 8px 0 8px;
82 padding: 24px 0;
83 position: relative; 82 position: relative;
83 border-radius: 8px;
84 84
85 .desc-wrap { 85 .desc-wrap {
86 position: relative; 86 position: relative;
87 @extend .bb; 87 @extend .bb;
88 padding: 8px 14px; 88 padding: 8px 16px 8px 20px;
89 height: 180px; 89 height: 200px;
90 flex: 1; 90 flex: 1;
91 background-color: #ffffff;
92 @include border-right-radius(8px);
93
91 } 94 }
92 95
93 .tit { 96 .tit {
...@@ -106,9 +109,10 @@ ...@@ -106,9 +109,10 @@
106 } 109 }
107 110
108 .poster { 111 .poster {
109 width: 350px; 112 width: 300px;
110 height: 180px; 113 height: 200px;
111 border-radius: 8px; 114 border-radius: 8px;
115 @include border-left-radius(8px);
112 } 116 }
113 } 117 }
114 118
......
...@@ -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>
......