diff --git a/app.json b/app.json
index cb2afa4..79327d0 100644
--- a/app.json
+++ b/app.json
@@ -1,6 +1,7 @@
{
"pages": [
"pages/index/index",
+ "pages/joinFrDpell/index",
"pages/spellDetail/index",
"pages/spellTimeout/index",
"pages/spellGroup/mySpellGroup/index",
@@ -51,8 +52,7 @@
"pages/paySuccess/paySuccess",
"pages/ConsumeDetail/ConsumeDetail",
"pages/externallinks/index",
- "pages/czdetail/czdetail",
- "pages/joinFrDpell/index"
+ "pages/czdetail/czdetail"
],
"navigateToMiniProgramAppIdList": [
"wx192b7d2e8dcbefd0",
diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js
index 5dbd05c..75fb674 100644
--- a/pages/joinFrDpell/index.js
+++ b/pages/joinFrDpell/index.js
@@ -11,6 +11,7 @@ Page({
data: {
teljpgUrl: imgurl.teljpg.url,
home: imgurl.home.url,
+ orderGroupFail: imgurl.orderGroupFail.url,
couponChannelId: '',
couponId: '',
data: [],
@@ -22,7 +23,8 @@ Page({
hour: "00",
min: "00",
sec: "00",
- paramData:null
+ paramData:null,
+ showErr:false
},
/**
@@ -204,9 +206,15 @@ Page({
}
})
.then(res => {
- wx.reLaunch({
- url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}`
- });
+ if(res.code=200){
+ wx.reLaunch({
+ url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}`
+ });
+ } else if (res.code == 28001){
+ _this.setData({
+ showErr:true
+ })
+ }
})
.catch(err => {
console.log(err);
diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml
index 8def326..74be753 100644
--- a/pages/joinFrDpell/index.wxml
+++ b/pages/joinFrDpell/index.wxml
@@ -64,10 +64,12 @@
-
-
-
-
-
+
+
+
+
+
+ 好友的拼团已完成,您的退款将在24小时内返回到您的支付账号
+ 返回首页
\ No newline at end of file
diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss
index 6448dde..fba2dc4 100644
--- a/pages/joinFrDpell/index.wxss
+++ b/pages/joinFrDpell/index.wxss
@@ -410,4 +410,52 @@
color: #fff;
font-weight: bold;
background: #ff4949;
+}
+.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;
}
\ No newline at end of file
diff --git a/utils/imgurl.js b/utils/imgurl.js
index 2061840..9c36beb 100644
--- a/utils/imgurl.js
+++ b/utils/imgurl.js
@@ -392,4 +392,8 @@ module.exports = {
'url': baseUrl + 'nodata.png',
'name': '拼团暂无数据'
},
+ 'orderGroupFail': {
+ 'url': baseUrl + 'orderGroupFail.png',
+ 'name': '拼团失败'
+ },
}
\ No newline at end of file