From 168bb1a47e75f6b965fc854796d490ae04959eea Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Mon, 26 Nov 2018 14:55:02 +0800
Subject: [PATCH] =?UTF-8?q?[banner=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/actdetail/actdetail.js | 1 +
pages/bannerdetail/index.js | 2 ++
pages/bannerdetail/index.wxml | 4 ++--
pages/bannerdetail/index.wxss | 24 +++++++++++++-----------
4 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/pages/actdetail/actdetail.js b/pages/actdetail/actdetail.js
index 3e2f8f2..30be395 100644
--- a/pages/actdetail/actdetail.js
+++ b/pages/actdetail/actdetail.js
@@ -13,6 +13,7 @@ Page({
*/
onLoad: function (options) {
let that = this;
+ console.log(options);
that.setData({
detail:options.detail
})
diff --git a/pages/bannerdetail/index.js b/pages/bannerdetail/index.js
index 35ff90f..c980ac7 100644
--- a/pages/bannerdetail/index.js
+++ b/pages/bannerdetail/index.js
@@ -33,6 +33,8 @@ Page({
},
gotoactdetail:function(){
let that = this;
+ console.log(that.data.data.detail)
+
wx.navigateTo({
url: `/pages/actdetail/actdetail?detail=${that.data.data.detail}`,
})
diff --git a/pages/bannerdetail/index.wxml b/pages/bannerdetail/index.wxml
index 010c2cd..b259f55 100644
--- a/pages/bannerdetail/index.wxml
+++ b/pages/bannerdetail/index.wxml
@@ -5,13 +5,13 @@
-
+
{{data.title}}
{{data.subTitle}}
活动说明
{{data.detail}}
-
+
diff --git a/pages/bannerdetail/index.wxss b/pages/bannerdetail/index.wxss
index 33560cf..89e9648 100644
--- a/pages/bannerdetail/index.wxss
+++ b/pages/bannerdetail/index.wxss
@@ -40,9 +40,11 @@ page {
.act text {
display: block;
padding-left: 4.8%;
+ padding-right: 4.8%;
}
.txt001 {
+ display: block;
font-size: 34rpx;
color: #363636;
letter-spacing: 0;
@@ -66,27 +68,27 @@ page {
}
.proct text:nth-of-type(1) {
+ display: block;
font-size: 30rpx;
color: #ff4949;
letter-spacing: 0;
line-height: 32rpx;
- display: inline-block;
- width: 60rpx;
- height: 64rpx;
- padding-right: 20rpx;
- border-right: 2px solid #e5e5e5;
+ margin-bottom: 20rpx;
+ /* width: 60rpx; */
+ /* height: 64rpx; */
}
.proct text:nth-of-type(2) {
- display: inline-block;
- width: 498rpx;
- height: 63rpx;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
+ display: block;
+ /* width: 498rpx; */
+ /* height: 63rpx; */
+ /* overflow: hidden; */
+ word-wrap:break-word;
+ /* text-overflow: ellipsis; */
font-size: 22rpx;
color: #6f6f6f;
letter-spacing: 0;
+ margin: 0 auto;
}
.orbg {