@@ -14,6 +14,7 @@ Page({ | |||||
position: imgurl.position.url, | position: imgurl.position.url, | ||||
close03: imgurl.close03.url, | close03: imgurl.close03.url, | ||||
home: imgurl.home.url, | home: imgurl.home.url, | ||||
orderGroupFail: imgurl.orderGroupFail.url, | |||||
paramData: null, | paramData: null, | ||||
data: null, | data: null, | ||||
clock: "00", | clock: "00", | ||||
@@ -23,6 +24,7 @@ Page({ | |||||
sec: "00", | sec: "00", | ||||
spellStatusList: spellStatus, | spellStatusList: spellStatus, | ||||
isMyself: false, | isMyself: false, | ||||
showErr: false, | |||||
showAlert: false | showAlert: false | ||||
}, | }, | ||||
gotoAgain() { | gotoAgain() { | ||||
@@ -117,6 +119,12 @@ Page({ | |||||
}) | }) | ||||
.then(res => { | .then(res => { | ||||
wx.hideLoading() | wx.hideLoading() | ||||
if (res.data.orderStatus == 14) { | |||||
_this.setData({ | |||||
showErr: true | |||||
}) | |||||
return; | |||||
} | |||||
if (orderGroupId==undefined){ | if (orderGroupId==undefined){ | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: '/pages/order/detail/index?orderId='+res.data.id, | url: '/pages/order/detail/index?orderId='+res.data.id, | ||||
@@ -30,4 +30,12 @@ | |||||
<view class='edit'> | <view class='edit'> | ||||
<button class='user-motto' bindtap='gotoPay'>去支付</button> | <button class='user-motto' bindtap='gotoPay'>去支付</button> | ||||
</view> | </view> | ||||
<view class='al-bg' wx:if='{{showErr}}'></view> | |||||
<view class='al-content' wx:if='{{showErr}}'> | |||||
<view class='al-top'> | |||||
<image src='{{orderGroupFail}}' mode="widthFix"></image> | |||||
</view> | |||||
<view class='al-center'>您的拼团未成功,退款将在24小时内返回到您的支付账号</view> | |||||
<view class='al-bottom' bindtap='gotoIndex'>返回首页</view> | |||||
</view> | |||||
</view> | </view> |
@@ -374,4 +374,52 @@ page { | |||||
background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); | background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); | ||||
border-radius:47rpx; | border-radius:47rpx; | ||||
margin-top: 79rpx; | margin-top: 79rpx; | ||||
} | |||||
} | |||||
.al-bg{ | |||||
position: fixed; | |||||
width: 100%; | |||||
height: 100vh; | |||||
top: 0; | |||||
left: 0; | |||||
background:rgba(0,0,0,1); | |||||
opacity:0.65; | |||||
z-index: 200; | |||||
} | |||||
.al-content{ | |||||
background: #fff; | |||||
position: fixed; | |||||
width: 545rpx; | |||||
z-index: 300; | |||||
top: 200rpx; | |||||
left: 102rpx; | |||||
border-radius: 15rpx; | |||||
} | |||||
.al-top{ | |||||
width: 100%; | |||||
} | |||||
.al-top image{ | |||||
position: relative; | |||||
height: 298rpx; | |||||
margin-top: -96rpx; | |||||
width: 545rpx; | |||||
} | |||||
.al-center{ | |||||
padding: 80rpx 30rpx; | |||||
font-size:30rpx; | |||||
font-family:PingFang-SC-Regular; | |||||
font-weight:400; | |||||
color:rgba(51,51,51,1); | |||||
} | |||||
.al-bottom{ | |||||
width:462rpx; | |||||
height:95rpx; | |||||
background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); | |||||
border-radius:47rpx; | |||||
font-size:30rpx; | |||||
font-family:PingFang-SC-Medium; | |||||
font-weight:500; | |||||
color:rgba(255,255,255,1); | |||||
text-align: center; | |||||
line-height: 95rpx; | |||||
margin: 0 auto 43rpx; | |||||
} |
@@ -24,12 +24,14 @@ Page({ | |||||
loading:true, | loading:true, | ||||
content:'数据正在加载中', | content:'数据正在加载中', | ||||
flag: 'spellList', | flag: 'spellList', | ||||
reloadIf:false | |||||
}, | }, | ||||
onLoad: function (options) { | onLoad: function (options) { | ||||
let that = this; | let that = this; | ||||
that.getBannerlist(); | that.getBannerlist(); | ||||
var todayDate = new Date().getTime(); | var todayDate = new Date().getTime(); | ||||
that.setData({ | that.setData({ | ||||
optionsData: options, | |||||
todayDate: todayDate | todayDate: todayDate | ||||
}) | }) | ||||
if(options&&options.from=='myhtml'){ | if(options&&options.from=='myhtml'){ | ||||
@@ -48,13 +50,15 @@ Page({ | |||||
}, | }, | ||||
onShow(){ | onShow(){ | ||||
let that=this; | let that=this; | ||||
that.getList(1, "spellList"); | |||||
that.setData({ | |||||
flag: "spellList", | |||||
spellList: true, | |||||
myspellList: false, | |||||
lists: null | |||||
}) | |||||
if (this.data.reloadIf){ | |||||
that.getList(1, "spellList"); | |||||
that.setData({ | |||||
flag: "spellList", | |||||
spellList: true, | |||||
myspellList: false, | |||||
lists: null | |||||
}) | |||||
} | |||||
}, | }, | ||||
//切换拼团列表 | //切换拼团列表 | ||||
getSpellList(){ | getSpellList(){ | ||||
@@ -129,6 +133,9 @@ Page({ | |||||
}, | }, | ||||
gotoPay(e){ | gotoPay(e){ | ||||
console.log(e,333) | console.log(e,333) | ||||
this.setData({ | |||||
reloadIf:true | |||||
}) | |||||
let data = e.currentTarget.dataset.data | let data = e.currentTarget.dataset.data | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}`, | url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}`, | ||||