From 9dfbbaf6b27f2ed34e032afa2135be6099c55e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Fri, 8 Mar 2019 16:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=AF=A6=E6=83=85=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/spellDetail/index.js | 6 ++++ pages/spellDetail/index.wxml | 49 +++++++++++++++++--------------- pages/spellDetail/index.wxss | 13 +++++++++ pages/spellGroup/spellGroup.js | 6 ++-- pages/spellGroup/spellGroup.wxml | 4 +-- 5 files changed, 51 insertions(+), 27 deletions(-) diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js index f790856..0df56e4 100644 --- a/pages/spellDetail/index.js +++ b/pages/spellDetail/index.js @@ -13,6 +13,7 @@ Page({ spellBg: imgurl.spellBg.url, position: imgurl.position.url, close03: imgurl.close03.url, + home: imgurl.home.url, paramData: null, data: null, clock: "00", @@ -30,6 +31,11 @@ Page({ url: `/pages/spellGroup/mySpellGroup/index?couponId=${data.couponId}&couponChannelId=${data.couponChannelId}`, }) }, + gotoIndex(){ + wx.reLaunch({ + url: '/pages/index/index', + }) + }, gotoshare() { wx.navigateTo({ url: `/pages/spellGroup/mySpellGroup/index?orderId=${this.data.paramData.orderId}&couponId=${this.data.paramData.couponId}&orderGroupId=${this.data.paramData.orderGroupId}&couponChannelId=${this.data.paramData.couponChannelId}`, diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml index 3718978..c39533e 100644 --- a/pages/spellDetail/index.wxml +++ b/pages/spellDetail/index.wxml @@ -1,7 +1,32 @@ + + + + + + + + + + + {{data.title}} + {{data.subTitle}} + + + {{data.salePrice}}元 + 拼团价 + + + + + {{data.salePrice}} + 实付款 + + + - + {{data.statustext}} 结束 @@ -45,28 +70,6 @@ - - - - - - - - {{data.title}} - {{data.subTitle}} - - - {{data.salePrice}}元 - 拼团价 - - - - - {{data.salePrice}} - 实付款 - - - diff --git a/pages/spellDetail/index.wxss b/pages/spellDetail/index.wxss index 18721d9..efc908c 100644 --- a/pages/spellDetail/index.wxss +++ b/pages/spellDetail/index.wxss @@ -137,6 +137,7 @@ page { line-height: 72rpx; } .detail{ + position: relative; width: 690rpx; padding:0 28rpx; margin: 30rpx auto 0; @@ -144,6 +145,18 @@ page { background:rgba(255,255,255,1); border-radius:15rpx; } +.return-index{ + position: absolute; + right: 30rpx; + top: 30rpx; + width: 50rpx; + height: 50rpx; +} +.return-index image{ + display: block; + width: 50rpx; + height: 50rpx; +} .detail-top{ width: 100%; height: auto; diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 3b2eca1..6aa7d12 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -34,7 +34,8 @@ Page({ that.setData({ flag: "spellList", spellList: true, - myspellList: false + myspellList: false, + lists: null }) }, //切换拼团列表 @@ -73,7 +74,8 @@ Page({ this.setData({ flag: "myspellList", page: 1, - allow_load: true + allow_load: true, + lists:null }) this.getList(1, "myspellList") }, diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml index 49f24eb..14f2bd4 100644 --- a/pages/spellGroup/spellGroup.wxml +++ b/pages/spellGroup/spellGroup.wxml @@ -1,10 +1,10 @@ - + - +