fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit a4475cd4124f00343993950dfe8c819d3a04ad67 2 parents 06403019 b1462189

Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

Inline Side-by-side
Showing 6 changed files with 23 additions and 30 deletions
... ... @@ -33,5 +33,5 @@
border-radius: 70rpx;
background-color: white;
left: 50%;
transform: translate(-50%, -45%);
transform: translate(-50%, -42%);
}
... ...
... ... @@ -77,7 +77,6 @@ const QUEUE_SUCCESS = {
FULL: 3
};
const YB_SHARE_RESULT_L = 'YB_SHARE_RESULT_L';
const YB_TO_ASSIST_C = 'YB_TO_ASSIST_C';
const YB_ASSIST_SUCCESS_L = 'YB_ASSIST_SUCCESS_L';
const YB_INVITE_ASSIST_C = 'YB_INVITE_ASSIST_C';
... ... @@ -195,8 +194,6 @@ Page(Object.assign({
},
onShareAppMessage: function(res) {
let params = {
FROM: res.from,
SHARE_RESULT: 0,
TITLE: this.data.productName,
DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！'
};
... ... @@ -209,12 +206,8 @@ Page(Object.assign({
path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}`,
imageUrl: this.data.snapData.default_image,
success: function() {
params.SHARE_RESULT = 1;
yas.report(YB_SHARE_RESULT_L, params);
},
fail: function() {
params.SHARE_RESULT = 2;
yas.report(YB_SHARE_RESULT_L, params);
}
};
} else if (res.from === 'button') {
... ... @@ -226,12 +219,8 @@ Page(Object.assign({
path: `/pages/product/detail/detail?limitProductCode=${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`,
imageUrl: this.data.snapData.default_image,
success: function() {
params.SHARE_RESULT = 1;
yas.report(YB_SHARE_RESULT_L, params);
},
fail: function() {
params.SHARE_RESULT = 2;
yas.report(YB_SHARE_RESULT_L, params);
}
};
}
... ...
... ... @@ -73,8 +73,8 @@
<view class="top-assist-action">
<view class="top-title" >你的好友邀请你为ta助力</view>
<view class="top-action">
<view class="as-bottom ok width200" bindtap="assistAction">帮ta助力</view>
<view class="as-bottom cancel width200" bindtap="assistCancel">取消</view>
<view class="as-bottom ok width130" bindtap="assistAction">帮ta助力</view>
<view class="as-bottom cancel width130" bindtap="assistCancel">取消</view>
</view>
</view>
</action-bar>
... ... @@ -199,7 +199,7 @@
<block wx:if="{{productSourceType === 1}}">
<action-bar wx:if="{{queueStatus === 1}}">
<view class="bottom1-action">
<view class="as-bottom cancel">即将开售</view>
<view class="as-bottom cancel">活动尚未开始</view>
<view class="help-wrapper" bindtap="goHelp">
<image class="help" src="../../../static/images/XD_q_ic@3x.png"></image>
</view>
... ... @@ -244,7 +244,7 @@
<block wx:if="{{productSourceType === 2}}">
<action-bar wx:if="{{queueStatus === 1}}">
<view class="bottom1-action">
<view class="as-bottom cancel">即将开售</view>
<view class="as-bottom cancel">活动尚未开始</view>
<view class="help-wrapper" bindtap="goHelp">
<image class="help" src="../../../static/images/XD_q_ic@3x.png"></image>
</view>
... ... @@ -255,8 +255,8 @@
<view class="top-assist-action">
<view class="top-title" >你的好友邀请你为ta助力排队</view>
<view class="top-action">
<view class="as-bottom ok width150" bindtap="queueAction">帮ta助力</view>
<view class="as-bottom cancel width150" bindtap="queueCancel">取消</view>
<view class="as-bottom ok width130" bindtap="queueAction">帮ta助力</view>
<view class="as-bottom cancel width130" bindtap="queueCancel">取消</view>
</view>
</view>
</action-bar>
... ... @@ -347,11 +347,11 @@
</view>
<view class="modal-btn">
<view class="modal-ok" bindtap="restartSelfShare">
<view class="modal-ok btn-info" bindtap="restartSelfShare">
我也要参加
</view>
<view class="modal-cancel" bindtap="goQueueList">
<view class="modal-cancel btn-info" bindtap="goQueueList">
查看详情
</view>
</view>
... ... @@ -369,11 +369,11 @@
</view>
<view class="modal-btn">
<view class="modal-ok" bindtap="restartSelfShare">
<view class="modal-ok btn-info" bindtap="restartSelfShare">
我也要参加
</view>
<view class="modal-cancel" bindtap="goQueueList">
<view class="modal-cancel btn-info" bindtap="goQueueList">
查看详情
</view>
</view>
... ... @@ -391,11 +391,11 @@
</view>
<view class="modal-btn">
<view class="modal-ok" bindtap="restartSelfShare">
<view class="modal-ok btn-info" bindtap="restartSelfShare">
我也要参加
</view>
<view class="modal-cancel" bindtap="goQueueList">
<view class="modal-cancel btn-info" bindtap="goQueueList">
查看详情
</view>
</view>
... ...
... ... @@ -157,6 +157,11 @@
width: 250rpx;
}
.width130 {
width: 130rpx;
padding: 0 0 !important;
}
.as-bottom {
font-size: 28rpx;
height: 50rpx;
... ... @@ -237,3 +242,8 @@
width:750rpx;
height:234rpx;
}
.modal-content .btn-info {
padding: 0 0;
width: 200rpx;
}
\ No newline at end of file
... ...
... ... @@ -256,8 +256,6 @@ Page(Object.assign({
IMG: decodeURIComponent(this.data.shareInfo.default_image)
};
params.SHARE_RESULT = 1;
yas.report('YB_SHARE_RESULT_L', params);
// 用户点击右上角分享
return {
... ... @@ -266,10 +264,8 @@ Page(Object.assign({
path: params.PATH, // 分享路径
imageUrl: params.IMG,
success: function() {
params.SHARE_RESULT = 1;
},
fail: function() {
params.SHARE_RESULT = 2;
}
};
},
... ...
... ... @@ -155,8 +155,6 @@ Page(Object.assign({
IMG: decodeURIComponent(this.data.shareInfo.default_image)
};
params.SHARE_RESULT = 1;
yas.report('YB_SHARE_RESULT_L', params);
// 用户点击右上角分享
return {
... ...