From cc79c804ceeb9d6ac3f5ff2f73e190e7088329d2 Mon Sep 17 00:00:00 2001 From: hurui Date: Fri, 2 Aug 2019 15:12:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/coupon/detail/index.js | 2 +- pages/coupon/detail/index.wxml | 4 - pages/integralmall/index.js | 2 +- pages/integralmall/index.wxml | 2 +- pages/radetail/index.js | 7 +- pages/radetail/index.wxml | 66 ++++++++++----- pages/radetail/index.wxss | 116 ++++++++++++++------------ pages/radetail/joinActivity/edit.js | 2 + pages/radetail/joinActivity/edit.json | 5 +- pages/radetail/joinActivity/edit.wxml | 87 +++++++++---------- pages/radetail/success/index.js | 2 + pages/radetail/success/index.json | 5 +- pages/radetail/success/index.wxml | 27 +++--- pages/user/myactivity/index.wxml | 2 +- 14 files changed, 189 insertions(+), 140 deletions(-) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index dfd2721..07b8b17 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -88,7 +88,7 @@ Page({ dispressEndDate:false, barTitle:"" }, - /** + /** * 显示分享弹框 */ showshare: function() { diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 591172f..b842f49 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -220,8 +220,4 @@ - - - - \ No newline at end of file diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index ddeb269..55ddd6e 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -1,4 +1,4 @@ -const navigationBarHeight = (getApp().statusBarHeight + 50) + 'px' +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' var config = require("../../config/config.js"); const Http = require("../../utils/HttpBasics"); const imgurl = require("../../utils/imgurl"); diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index c6503a0..7d28528 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 4a041ae..077b78a 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -9,6 +9,8 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let configUrls = extConfig.attr.configUrl; Page({ data: { + fenxiang: imgurl.fenxiang.url, + isshowposter: false,//是否显示分享弹框 navigationBarHeight, data: {}, status: 1, @@ -21,7 +23,7 @@ Page({ homeSelectedO: imgurl.homeSelectedO.url, wmhome: imgurl.wmhome.url, minute: "", - nodes: '' + nodes: '', }, onLoad(options) { let that = this; @@ -106,5 +108,6 @@ Page({ wx.navigateTo({ url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`, }) - } + }, + }); \ No newline at end of file diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 9e1be09..c093bd1 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -10,24 +10,33 @@ - - - - {{data.title}} - {{data.subTitle}} - - 活动说明 - {{data.detail}} - - - 1、活动人数:{{data.personLimit}}人 - 消耗积分:{{data.credit}} 积分 + + + + + 分享有礼 + + {{data.title}} + {{data.subTitle}} + + 活动说明 + {{data.detail}} + + + 1、活动人数:{{data.personLimit}}人 + 消耗积分:{{data.credit}} 积分 + + 2、报名有效日期 + {{startTime}}--{{endTime}} + 3、活动有效日期 + {{activityStartTime}}--{{activityEndTime}} - 2、报名有效日期 - {{startTime}}--{{endTime}} - 3、活动有效日期 - {{activityStartTime}}--{{activityEndTime}} + + + + +