fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit ec3406693378816d50de9e7f5dc514e9073c94c3 2 parents c6c1371e f7c72ba9

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

Inline Side-by-side
Showing 9 changed files with 77 additions and 24 deletions
... ... @@ -62,7 +62,7 @@ export default {
},
addQueue({uid, activityId, unionId}) {
return api.post({
return api.get({
url: '',
data: {
method: 'app.drawline.addQueue',
... ...
Component({
properties: {
// 这里定义了innerText属性，属性值可以在组件使用时指定
innerText: {
type: String,
value: 'default value',
}
},
data: {
// 这里是一些组件内部数据
someData: {}
},
methods: {
// 这里是一个自定义方法
customMethod: function() {}
cancel() {
this.triggerEvent('cancel');
}
}
});
... ...
<view class="modal-mask"></view>
<view class="modal-mask" catchtap="cancel"></view>
<view class="modal-dialog">
<image class="modal-icon"src="../../../../../static/images/gou@2x.png"></image>
<slot></slot>
... ...
... ... @@ -8,7 +8,7 @@
padding-right: 30rpx;
left: 0;
right: 0;
height: 70rpx;
min-height: 70rpx;
font-size: 26rpx;
background-color: rgba(0, 0, 0, 0.7);
text-align: center;
... ... @@ -23,10 +23,13 @@
width: 240rpx;
align-items: center;
justify-content: flex-end;
flex-wrap: wrap;
}
.bottom-assis-list .avatar-item {
margin-left: 10rpx;
margin-top: 10rpx;
display: inline-block;
}
.avatar-image {
... ...
... ... @@ -97,6 +97,7 @@ Page(Object.assign({
queueSuccess: QUEUE_SUCCESS.unknown,
error: false,
activityId: '',
modal: false,
actionSheet: {
componentId: 'shareActionSheet',
... ... @@ -404,7 +405,7 @@ Page(Object.assign({
} else {
this.showError();
}
this.showAlert();
}).catch(this.showError.bind(this));
},
... ... @@ -438,6 +439,7 @@ Page(Object.assign({
} else {
this.showError();
}
this.showAlert();
}).catch(this.showError.bind(this));
},
queueCancel() {
... ... @@ -464,6 +466,7 @@ Page(Object.assign({
assisSuccess: ASSIS_SUCCESS.unknown,
error: false
});
this.hideAlert();
},
goQueueList() {
router.go('queueIndex', Object.assign({
... ... @@ -514,5 +517,15 @@ Page(Object.assign({
refreshText: '下拉刷新'
});
});
},
hideAlert() {
this.setData({
modal: false
});
},
showAlert() {
this.setData({
modal: true
});
}
}, Actionsheet));
... ...
... ... @@ -83,7 +83,7 @@
</view>
</action-bar>
<action-bar wx:elif="{{assisStatus === 2}}">
<action-bar wx:elif="{{assisStatus === 4}}">
<view class="bottom1-action">
<view class="action-btn">已助力</view>
<view class="help">?</view>
... ... @@ -285,10 +285,12 @@
</block>
<block wx:elif="{{queueStatus === 5}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn">已助力</view>
<view class="help">?</view>
</view>
</action-bar>
</block>
<action-bar wx:else>
... ... @@ -302,7 +304,8 @@
</block>
</block>
<yoho-alert wx:if="{{assisSuccess === 1}}">
<block wx:if="{{modal}}">
<yoho-alert wx:if="{{assisSuccess === 1}}" bindcancel="hideAlert">
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力成功</view>
... ... @@ -315,7 +318,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{assisSuccess === 2}}">
<yoho-alert wx:if="{{assisSuccess === 2}}" bindcancel="hideAlert">
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">重复助力</view>
... ... @@ -327,7 +330,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{queueSuccess === 1}}">
<yoho-alert wx:if="{{queueSuccess === 1}}" bindcancel="hideAlert">
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力成功</view>
... ... @@ -349,7 +352,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{queueSuccess === 2}}">
<yoho-alert wx:if="{{queueSuccess === 2}}" bindcancel="hideAlert">
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">重复助力</view>
... ... @@ -371,7 +374,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{error}}">
<yoho-alert wx:if="{{error}}" bindcancel="hideAlert">
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力失败</view>
... ... @@ -385,5 +388,6 @@
</view>
</view>
</yoho-alert>
</block>
<template is="zan-actionsheet" data="{{...actionSheet}}" />
\ No newline at end of file
... ...
<!--pages/snapshootShare/snapshootShare.wxml-->
<view class="snapshoot-container" >
<view class="snapshoot-page" >
<view class="snapshoot-container">
<view class="snapshoot-content">
<view class="snapshoot">
... ...
/* pages/snapshootShare/snapshootShare.wxss */
.snapshoot-container {
position: absolute;
top: 50%;
transform: translateY(-50%);
}
.snapshoot-page {
position: fixed;
left: 0rpx;
top: 0rpx;
width: 750rpx;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
background-color: rgba(0, 0, 0, 0.6);
flex-direction: column;
z-index: 9999;
}
... ...
... ... @@ -33,7 +33,7 @@
"list": []
},
"miniprogram": {
"current": 0,
"current": 8,
"list": [
{
"id": 0,
... ... @@ -73,9 +73,42 @@
},
{
"id": 6,
"name": "分享卡片进入小程序",
"name": "分享卡片进入小程序-好友助力-发起者进入",
"pathName": "pages/product/detail/detail",
"query": "limitProductCode=2018062815591248&originUid=500031864",
"query": "limitProductCode=2018062815591248&originUid=500031864&originUnionID=oGUyct62W4m92LotgrNcDo0dGXC4",
"scene": "1037",
"referrerInfo": {
"appId": "wx084ab813d88c594b",
"extraData": "{}"
}
},
{
"id": 7,
"name": "分享卡片进入小程序-好友助力-被分享者进入",
"pathName": "pages/product/detail/detail",
"query": "limitProductCode=2018062815591248&originUid=349709&originUnionID=oGUyct-gABtEJt3aq2TF03NkNPp0",
"scene": "1037",
"referrerInfo": {
"appId": "wx084ab813d88c594b",
"extraData": "{}"
}
},
{
"id": 8,
"name": "分享卡片进入小程序-好友排队-发起者进入",
"pathName": "pages/product/detail/detail",
"query": "limitProductCode=2018062910190973&originUid=349709&originUnionID=oGUyct-gABtEJt3aq2TF03NkNPp0",
"scene": "1037",
"referrerInfo": {
"appId": "wx084ab813d88c594b",
"extraData": "{}"
}
},
{
"id": 9,
"name": "分享卡片进入小程序-好友排队-被发起者进入",
"pathName": "pages/product/detail/detail",
"query": "limitProductCode=2018062910190973&originUid=500031864&originUnionID=oGUyct62W4m92LotgrNcDo0dGXC4",
"scene": "1037",
"referrerInfo": {
"appId": "wx084ab813d88c594b",
... ...