From 7e7584f9515e4c770859913f60869e218ad81fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=B7=E6=B4=8B=E4=B9=8B=E5=A3=B0?= Date: Thu, 28 Mar 2019 18:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=AF=E4=BB=98=E6=8B=BC?= =?UTF-8?q?=E5=9B=A2=E9=87=8D=E6=96=B0=E6=94=AF=E4=BB=98=E5=9B=A2=E5=B7=B2?= =?UTF-8?q?=E6=BB=A1=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/spellGroup/paySpellGroup/index.js | 8 ++++ pages/spellGroup/paySpellGroup/index.wxml | 8 ++++ pages/spellGroup/paySpellGroup/index.wxss | 50 ++++++++++++++++++++++- pages/spellGroup/spellGroup.js | 21 ++++++---- 4 files changed, 79 insertions(+), 8 deletions(-) diff --git a/pages/spellGroup/paySpellGroup/index.js b/pages/spellGroup/paySpellGroup/index.js index fc53133..ce5fa44 100644 --- a/pages/spellGroup/paySpellGroup/index.js +++ b/pages/spellGroup/paySpellGroup/index.js @@ -14,6 +14,7 @@ Page({ position: imgurl.position.url, close03: imgurl.close03.url, home: imgurl.home.url, + orderGroupFail: imgurl.orderGroupFail.url, paramData: null, data: null, clock: "00", @@ -23,6 +24,7 @@ Page({ sec: "00", spellStatusList: spellStatus, isMyself: false, + showErr: false, showAlert: false }, gotoAgain() { @@ -117,6 +119,12 @@ Page({ }) .then(res => { wx.hideLoading() + if (res.data.orderStatus == 14) { + _this.setData({ + showErr: true + }) + return; + } if (orderGroupId==undefined){ wx.navigateTo({ url: '/pages/order/detail/index?orderId='+res.data.id, diff --git a/pages/spellGroup/paySpellGroup/index.wxml b/pages/spellGroup/paySpellGroup/index.wxml index ab741a0..b90b07a 100644 --- a/pages/spellGroup/paySpellGroup/index.wxml +++ b/pages/spellGroup/paySpellGroup/index.wxml @@ -30,4 +30,12 @@ + + + + + + 您的拼团未成功,退款将在24小时内返回到您的支付账号 + 返回首页 + diff --git a/pages/spellGroup/paySpellGroup/index.wxss b/pages/spellGroup/paySpellGroup/index.wxss index 6b774d1..620f0d5 100644 --- a/pages/spellGroup/paySpellGroup/index.wxss +++ b/pages/spellGroup/paySpellGroup/index.wxss @@ -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%); border-radius:47rpx; margin-top: 79rpx; - } \ No newline at end of file + } + .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/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index eb794fc..c5c628f 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -24,12 +24,14 @@ Page({ loading:true, content:'数据正在加载中', flag: 'spellList', + reloadIf:false }, onLoad: function (options) { let that = this; that.getBannerlist(); var todayDate = new Date().getTime(); that.setData({ + optionsData: options, todayDate: todayDate }) if(options&&options.from=='myhtml'){ @@ -48,13 +50,15 @@ Page({ }, onShow(){ 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(){ @@ -129,6 +133,9 @@ Page({ }, gotoPay(e){ console.log(e,333) + this.setData({ + reloadIf:true + }) let data = e.currentTarget.dataset.data wx.navigateTo({ url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}`,