5711f7e1 by simon

默认提交

1 parent f69c73a6

537 KB | W: | H:

385 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -996,8 +996,6 @@ Page({
name,
data
} = evt.detail;
console.log("evt:", evt);
console.log("data:", data);
if (data && data.evttype && data.evttype == "join") {
console.log("55555");
}
......
......@@ -348,10 +348,9 @@ $blessContentLabelWidth: 650px;
.more-template {
font-size: 36px;
color: #dfa244;
text-align: right;
margin-right: 40px;
margin-top: 24px;
// text-align: right;
// margin-right: 40px;
// margin-top: 48px;
.t1 {
text-decoration: underline;
......@@ -360,11 +359,12 @@ $blessContentLabelWidth: 650px;
&-item {
display: flex;
justify-content: flex-end;
justify-content: center;
.btn {
@extend .bb;
margin: 24px 45px 8px 0;
margin: 32px auto;
width: 480px;
height: 76px;
line-height: 76px;
padding: 0 20px;
......
......@@ -123,19 +123,26 @@
<!-- 分情况显示btn-wrap -->
<!-- 单人 -->
<block wx:if="{{detailData.type == 0}}">
<!-- 未定制 -->
<view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
<button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
<button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
定制我的祝福
</button>
<view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
</view>
<!-- 已定制 -->
<view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
<button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
<!-- 自己 -->
<block wx:if="{{ownerMember.mySelf == 1}}">
<!-- 未定制 -->
<view wx:if="{{detailData.customMade == 0}}" class="btn-wrap">
<button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
<button wx:if="{{!isAuth}}" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" class="btn btn2">
定制我的祝福
</button>
<view wx:else bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
</view>
<!-- 已定制 -->
<view wx:if="{{detailData.customMade == 1}}" class="btn-wrap">
<button bindtap="onPosterHandler" class="btn btn1">分享图片祝福</button>
<button open-type="share" class="btn btn2">送祝福给亲友</button>
</view>
</block>
<block wx:else>
<view bindtap="onBlessMakeHandler" class="btn btn2">定制我的祝福</view>
<button open-type="share" class="btn btn2">送祝福给亲友</button>
</view>
</block>
</block>
<!-- 组队 -->
<block wx:if="{{detailData.type == 1}}">
......@@ -220,4 +227,4 @@
<image bindtap="onPreviewImageHandler" class="poster" mode="widthFix" src="{{imageUrl}}" />
<view bindtap="saveImageToPhotosAlbum" class="save-btn">一键保存</view>
</van-popup>
<shortcut2 types="{{[]}}" pics="{{['red-package2']}}"></shortcut2>
\ No newline at end of file
<shortcut2 types="{{[]}}" pics="{{['red-package2']}}"></shortcut2>
......
......@@ -18,8 +18,7 @@ Page({
queueCode: "", // 队列标识,每次请求,会返回一个队列标识,用户加载更多时候请携带queueCode参数
active: 0,
curBanner: {},
blessContent: [
{
blessContent: [{
type: "text",
content: "文本内容",
color: "0xffffff",
......@@ -29,7 +28,8 @@ Page({
type: "image",
content: "url",
},
]
],
options: {}
},
onShareAppMessage(res) {
if (res.from === 'button') {
......@@ -49,13 +49,34 @@ Page({
})
},
onLoad(options) {
this.setData({
options
})
this.initData();
},
initData() {
this.queryTabList().then((result) => {
this.setData({
curTab: this.data.tabList[0]
})
let {
options,
tabList
} = this.data;
if (options.t == "bless") {
let tabIndex = 0;
tabList.forEach((element, idx) => {
if (element.type == 2) {
tabIndex = idx;
}
});
this.setData({
curTab: tabList[tabIndex],
active: tabIndex
})
} else {
this.setData({
curTab: tabList[0]
})
}
this.resetPage();
this.queryBannerList();
this.queryVideoList();
......