Skip to content

dev / home-with-kids-mp

Go to a project
Toggle navigation
Toggle navigation pinning
5711f7e1 by simon
Options

默认提交

1 parent f69c73a6
Inline Side-by-side
Showing 5 changed files with 53 additions and 27 deletions

537 KB | W: | H:

385 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -996,8 +996,6 @@ Page({ ...@@ -996,8 +996,6 @@ Page({
996 name, 996 name,
997 data 997 data
998 } = evt.detail; 998 } = evt.detail;
999 console.log("evt:", evt);
1000 console.log("data:", data);
1001 if (data && data.evttype && data.evttype == "join") { 999 if (data && data.evttype && data.evttype == "join") {
1002 console.log("55555"); 1000 console.log("55555");
1003 } 1001 }
......
...@@ -348,10 +348,9 @@ $blessContentLabelWidth: 650px; ...@@ -348,10 +348,9 @@ $blessContentLabelWidth: 650px;
348 .more-template { 348 .more-template {
349 font-size: 36px; 349 font-size: 36px;
350 color: #dfa244; 350 color: #dfa244;
351 text-align: right; 351 // text-align: right;
352 margin-right: 40px; 352 // margin-right: 40px;
353 margin-top: 24px; 353 // margin-top: 48px;
354
355 354
356 .t1 { 355 .t1 {
357 text-decoration: underline; 356 text-decoration: underline;
...@@ -360,11 +359,12 @@ $blessContentLabelWidth: 650px; ...@@ -360,11 +359,12 @@ $blessContentLabelWidth: 650px;
360 359
361 &-item { 360 &-item {
362 display: flex; 361 display: flex;
363 justify-content: flex-end; 362 justify-content: center;
364 363
365 .btn { 364 .btn {
366 @extend .bb; 365 @extend .bb;
367 margin: 24px 45px 8px 0; 366 margin: 32px auto;
367 width: 480px;
368 height: 76px; 368 height: 76px;
369 line-height: 76px; 369 line-height: 76px;
370 padding: 0 20px; 370 padding: 0 20px;
......
...@@ -123,19 +123,26 @@ ...@@ -123,19 +123,26 @@
123 <!-- 分情况显示btn-wrap --> 123 <!-- 分情况显示btn-wrap -->
124 <!-- 单人 --> 124 <!-- 单人 -->
125 <block wx:if="{{detailData.type == 0}}"> 125 <block wx:if="{{detailData.type == 0}}">
126 <!-- 未定制 --> 126 <!-- 自己 -->
127 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap"> 127 <block wx:if="{{ownerMember.mySelf == 1}}">
128 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button> 128 <!-- 未定制 -->
129 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2"> 129 <view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
130 定制我的祝福 130 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
131 </button> 131 <button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
132 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view> 132 定制我的祝福
133 </view> 133 </button>
134 <!-- 已定制 --> 134 <view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
135 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap"> 135 </view>
136 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button> 136 <!-- 已定制 -->
137 <view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
138 <button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
139 <button open-type="share" class="btn btn2">送祝福给亲友</button>
140 </view>
141 </block>
142 <block wx:else>
143 <view bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
137 <button open-type="share" class="btn btn2">送祝福给亲友</button> 144 <button open-type="share" class="btn btn2">送祝福给亲友</button>
138 </view> 145 </block>
139 </block> 146 </block>
140 <!-- 组队 --> 147 <!-- 组队 -->
141 <block wx:if="{{detailData.type == 1}}"> 148 <block wx:if="{{detailData.type == 1}}">
...@@ -220,4 +227,4 @@ ...@@ -220,4 +227,4 @@
220 <image bindtap="onPreviewImageHandler" class="poster" mode="widthFix" src="{{imageUrl}}" /> 227 <image bindtap="onPreviewImageHandler" class="poster" mode="widthFix" src="{{imageUrl}}" />
221 <view bindtap="saveImageToPhotosAlbum" class="save-btn">一键保存</view> 228 <view bindtap="saveImageToPhotosAlbum" class="save-btn">一键保存</view>
222 </van-popup> 229 </van-popup>
223 <shortcut2 types="{{[]}}" pics="{{['red-package2']}}"></shortcut2>
...\ No newline at end of file ...\ No newline at end of file
230 <shortcut2 types="{{[]}}" pics="{{['red-package2']}}"></shortcut2>
......
...@@ -18,8 +18,7 @@ Page({ ...@@ -18,8 +18,7 @@ Page({
18 queueCode: "", // 队列标识，每次请求，会返回一个队列标识，用户加载更多时候请携带queueCode参数 18 queueCode: "", // 队列标识，每次请求，会返回一个队列标识，用户加载更多时候请携带queueCode参数
19 active: 0, 19 active: 0,
20 curBanner: {}, 20 curBanner: {},
21 blessContent: [ 21 blessContent: [{
22 {
23 type: "text", 22 type: "text",
24 content: "文本内容", 23 content: "文本内容",
25 color: "0xffffff", 24 color: "0xffffff",
...@@ -29,7 +28,8 @@ Page({ ...@@ -29,7 +28,8 @@ Page({
29 type: "image", 28 type: "image",
30 content: "url", 29 content: "url",
31 }, 30 },
32 ] 31 ],
32 options: {}
33 }, 33 },
34 onShareAppMessage(res) { 34 onShareAppMessage(res) {
35 if (res.from === 'button') { 35 if (res.from === 'button') {
...@@ -49,13 +49,34 @@ Page({ ...@@ -49,13 +49,34 @@ Page({
49 }) 49 })
50 }, 50 },
51 onLoad(options) { 51 onLoad(options) {
52 this.setData({
53 options
54 })
52 this.initData(); 55 this.initData();
53 }, 56 },
54 initData() { 57 initData() {
55 this.queryTabList().then((result) => { 58 this.queryTabList().then((result) => {
56 this.setData({ 59 let {
57 curTab: this.data.tabList[0] 60 options,
58 }) 61 tabList
62 } = this.data;
63 if (options.t == "bless") {
64 let tabIndex = 0;
65 tabList.forEach((element, idx) => {
66 if (element.type == 2) {
67 tabIndex = idx;
68 }
69 });
70 this.setData({
71 curTab: tabList[tabIndex],
72 active: tabIndex
73 })
74 } else {
75 this.setData({
76 curTab: tabList[0]
77 })
78 }
79
59 this.resetPage(); 80 this.resetPage();
60 this.queryBannerList(); 81 this.queryBannerList();
61 this.queryVideoList(); 82 this.queryVideoList();
......