@@ -283,56 +283,56 @@ Page({ | |||||
if (err.code == 2011) { | if (err.code == 2011) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "商户信息没找到", | title: "商户信息没找到", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 2013) { | } else if (err.code == 2013) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "商户信息禁用", | title: "商户信息禁用", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 3000) { | } else if (err.code == 3000) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "库存不足", | title: "库存不足", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 3001) { | } else if (err.code == 3001) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "超过限购条件", | title: "超过限购条件", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 3002) { | } else if (err.code == 3002) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "订单失败", | title: "订单失败", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 3003) { | } else if (err.code == 3003) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "订单不存在", | title: "订单不存在", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 3004) { | } else if (err.code == 3004) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "订单不存在", | title: "订单不存在", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
} else if (err.code == 4003) { | } else if (err.code == 4003) { | ||||
wx.showToast({ | wx.showToast({ | ||||
title: "卡券已作废", | title: "卡券已作废", | ||||
image: './../../../assets/images/fail.png', | |||||
image: './../../assets/images/fail.png', | |||||
duration: 2000, | duration: 2000, | ||||
mask: false | mask: false | ||||
}); | }); | ||||
@@ -25,8 +25,7 @@ | |||||
padding: 0 30rpx; | padding: 0 30rpx; | ||||
} | } | ||||
.title{ | .title{ | ||||
position: absolute; | |||||
top: 503rpx; | |||||
position: relative; | |||||
background-color: #fff; | background-color: #fff; | ||||
z-index: 100; | z-index: 100; | ||||
width: 750rpx; | width: 750rpx; | ||||
@@ -34,6 +33,7 @@ | |||||
padding-left: 30rpx; | padding-left: 30rpx; | ||||
line-height: 50rpx; | line-height: 50rpx; | ||||
border-radius:20rpx 20rpx 0px 0px; | border-radius:20rpx 20rpx 0px 0px; | ||||
margin-top: -25rpx; | |||||
opacity: 1; | opacity: 1; | ||||
font-size:32rpx; | font-size:32rpx; | ||||
font-family:PingFang-SC-Bold; | font-family:PingFang-SC-Bold; | ||||
@@ -42,12 +42,11 @@ | |||||
box-sizing: border-box; | box-sizing: border-box; | ||||
} | } | ||||
.remark{ | .remark{ | ||||
margin-top: 48rpx; | |||||
font-size:24rpx; | font-size:24rpx; | ||||
font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
font-weight:500; | font-weight:500; | ||||
color:rgba(134,134,134,1); | color:rgba(134,134,134,1); | ||||
margin-bottom: 12rpx; | |||||
line-height: 48rpx; | |||||
} | } | ||||
.des{ | .des{ | ||||
width: 100%; | width: 100%; | ||||
@@ -204,7 +204,7 @@ Page({ | |||||
}) | }) | ||||
.then(res => { | .then(res => { | ||||
wx.hideLoading() | wx.hideLoading() | ||||
if (!orderGroupId){ | |||||
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, | ||||
}) | }) | ||||
@@ -25,8 +25,7 @@ | |||||
padding: 0 30rpx; | padding: 0 30rpx; | ||||
} | } | ||||
.title{ | .title{ | ||||
position: absolute; | |||||
top: 503rpx; | |||||
position: relative; | |||||
background-color: #fff; | background-color: #fff; | ||||
z-index: 100; | z-index: 100; | ||||
width: 750rpx; | width: 750rpx; | ||||
@@ -34,6 +33,7 @@ | |||||
padding-left: 30rpx; | padding-left: 30rpx; | ||||
line-height: 50rpx; | line-height: 50rpx; | ||||
border-radius:20rpx 20rpx 0px 0px; | border-radius:20rpx 20rpx 0px 0px; | ||||
margin-top: -25rpx; | |||||
opacity: 1; | opacity: 1; | ||||
font-size:32rpx; | font-size:32rpx; | ||||
font-family:PingFang-SC-Bold; | font-family:PingFang-SC-Bold; | ||||
@@ -42,12 +42,11 @@ | |||||
box-sizing: border-box; | box-sizing: border-box; | ||||
} | } | ||||
.remark{ | .remark{ | ||||
margin-top: 48rpx; | |||||
font-size:24rpx; | font-size:24rpx; | ||||
font-family:PingFang-SC-Medium; | font-family:PingFang-SC-Medium; | ||||
font-weight:500; | font-weight:500; | ||||
color:rgba(134,134,134,1); | color:rgba(134,134,134,1); | ||||
margin-bottom: 12rpx; | |||||
line-height: 48rpx; | |||||
} | } | ||||
.des{ | .des{ | ||||
width: 100%; | width: 100%; | ||||