From 04fae6f73297ee37b9dc3bcc1fe0c335efec130c Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Wed, 19 Jun 2019 18:04:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1001765=E3=80=91dev=20version:.1456.?=
=?UTF-8?q?1925=EF=BC=9AC=E7=AB=AF=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?=
=?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=BC=80=E5=90=AF=E7=A7=AF?=
=?UTF-8?q?=E5=88=86=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E6=89=A3?=
=?UTF-8?q?=E9=99=A4=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
【ID1001766】dev version:.1456.1925:A端创建活动报名自由图文设置格式,但是C端没有显示
---
pages/radetail/index.js | 15 +--------------
pages/radetail/index.wxss | 1 -
pages/radetail/success/index.js | 3 ++-
pages/radetail/success/index.wxml | 2 +-
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/pages/radetail/index.js b/pages/radetail/index.js
index 369d767..97c0451 100644
--- a/pages/radetail/index.js
+++ b/pages/radetail/index.js
@@ -53,20 +53,7 @@ Page({
endTime: util.formatTime(res.data.activity.endTime, "yyyy-MM-dd hh:mm:ss")
})
if (res.data.activity.type == 2) {
- wx.request({
- url: configUrls + config.api.acPrintHtmlById,
- data: {
- id: options.id,
- date: new Date(),
- token: app.globalData.token,
- },
- header: {
- 'content-type': 'application/html'
- },
- success: function(res) {
- var temp = WxParse.wxParse('article', 'html', res.data, that, 5);
- }
- })
+ var temp = WxParse.wxParse('article', 'html', res.data.activity.html, that, 5);
}
}
}).catch(err => {
diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss
index 054e015..0889ac8 100644
--- a/pages/radetail/index.wxss
+++ b/pages/radetail/index.wxss
@@ -555,7 +555,6 @@ button::after{ border: none; }
.coupons {
width: 100%;
position: relative;
- margin-bottom: 160rpx;
}
.coupons-body {
diff --git a/pages/radetail/success/index.js b/pages/radetail/success/index.js
index f172bcf..18a61bc 100644
--- a/pages/radetail/success/index.js
+++ b/pages/radetail/success/index.js
@@ -18,7 +18,8 @@ Page({
array1: ['附近住户', '距离2km', '距离3km', '更远'],
index: 0,
index1: 0,
- showPage:false
+ showPage:false,
+ credit:""
},
gotomyAc(){
wx.navigateTo({
diff --git a/pages/radetail/success/index.wxml b/pages/radetail/success/index.wxml
index da33a37..3e1b263 100644
--- a/pages/radetail/success/index.wxml
+++ b/pages/radetail/success/index.wxml
@@ -1,4 +1,4 @@
-您已扣除{{credit}}积分
+您已扣除{{credit}}积分
报名成功
请您在我的活动中查看您的报名状态