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}}
+
+
+
+
+
@@ -35,9 +44,24 @@
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+ 微信好友
+
+
+
+ 生成海报
+
+
+
+
diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss
index ec6913c..9a94c5c 100644
--- a/pages/radetail/index.wxss
+++ b/pages/radetail/index.wxss
@@ -21,24 +21,9 @@ page{
.banner image {
width: 750rpx;
- /* height: 280rpx; */
}
-.act {
- position: relative;
- background: #fff;
- border-radius: 12rpx;
- width: 705rpx;
- /* height: 212rpx; */
- margin: 24rpx auto 0;
- padding-bottom: 20rpx;
-}
-/* .act text {
- display: block;
- padding-left: 4.8%;
- padding-right: 4.8%;
-} */
.txt001 {
display: block;
@@ -60,7 +45,6 @@ page{
.proct {
position: relative;
- /* height: 60rpx; */
margin-top: 20rpx;
}
@@ -71,17 +55,10 @@ page{
letter-spacing: 0;
line-height: 32rpx;
margin-bottom: 20rpx;
- /* width: 60rpx; */
- /* height: 64rpx; */
}
.proct text:nth-of-type(2) {
display: block;
- /* width: 498rpx; */
- /* height: 63rpx; */
- /* overflow: hidden; */
- word-wrap:break-word;
- /* text-overflow: ellipsis; */
font-size: 22rpx;
color: #6f6f6f;
letter-spacing: 0;
@@ -342,15 +319,6 @@ navigator:nth-of-type(2n+1) {
height: 486rpx;
}
-/* .coupons1-border {
- height: 1rpx;
- left: 30rpx;
- right: 30rpx;
- background: #f5f5f5;
- position: absolute;
- bottom: 0;
-} */
-
.coupons1-img {
width: 344rpx;
height: 258rpx;
@@ -575,20 +543,17 @@ button::after{ border: none; }
.coupons-body {
flex: 1;
- /* overflow: auto; */
}
.banner {
position: relative;
width: 750rpx;
- /* height: 280rpx; */
overflow: hidden;
box-shadow:0px 14px 26px 0px rgba(199,203,211,1);
}
.banner image {
width: 750rpx;
- /* height: 280rpx; */
border-radius: 16rpx;
}
.box{
@@ -599,16 +564,12 @@ button::after{ border: none; }
background: #fff;
border-radius: 12rpx;
width:94%;
- /* margin: 44rpx auto 0; */
padding-bottom: 20rpx;
padding:0 3%;
}
.act text {
display: block;
- /* text-align: center;
- padding-left: 4.8%;
- padding-right: 4.8%; */
}
.txt001 {
@@ -660,7 +621,6 @@ button::after{ border: none; }
.proct {
position: relative;
- /* height: 60rpx; */
margin-top: 20rpx;
}
@@ -671,17 +631,11 @@ button::after{ border: none; }
letter-spacing: 0;
line-height: 32rpx;
margin-bottom: 20rpx;
- /* width: 60rpx; */
- /* height: 64rpx; */
}
.proct text:nth-of-type(2) {
display: block;
- /* width: 498rpx; */
- /* height: 63rpx; */
- /* overflow: hidden; */
word-wrap:break-word;
- /* text-overflow: ellipsis; */
font-size: 22rpx;
color: #6f6f6f;
letter-spacing: 0;
@@ -808,7 +762,7 @@ navigator:nth-of-type(2n+1) {
line-height: 87rpx;
}
.content{
- padding: 0 20rpx 160rpx;
+ padding: 0 40rpx 160rpx;
}
.posi>view:nth-child(2) text:nth-child(1) {
font-size: 30rpx;
@@ -1129,8 +1083,7 @@ scroll-view {
.signUp{
position: fixed;
bottom: 22rpx;
- /* left: 0; */
- right: 22rpx;
+ left: 110rpx;
margin: auto;
width:556rpx;
height: 92rpx;
@@ -1141,13 +1094,11 @@ scroll-view {
font-size: 30rpx;
text-align: center;
border:1rpx solid rgba(227,227,227,1);
- /* box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); */
}
.signUpHr{
position: fixed;
bottom: 22rpx;
- /* left: 0; */
- right: 22rpx;
+ left: 100rpx;
margin: auto;
width:556rpx;
height: 92rpx;
@@ -1158,7 +1109,6 @@ scroll-view {
font-size: 30rpx;
text-align: center;
border:1rpx solid rgba(227,227,227,1);
- /* box-shadow: 0 0 10px 0 rgba(211,211,211,0.50); */
}
.opacity{
opacity: .8;
@@ -1185,4 +1135,64 @@ scroll-view {
margin-bottom: 20rpx;
color: #666;
padding-left: 2%;
+}
+
+
+.fenxiang image {
+ width:48rpx;
+ height: 48rpx;
+ position: absolute;
+ top: 2.5%;
+ right: 36rpx;
+}
+.gift{
+ color: #3C3C3C;
+ font-size: 20rpx;
+ position: absolute;
+ top: 65rpx;
+ right: 24rpx;
+}
+.modal {
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ top: 0;
+ left: 0;
+ background: rgba(0, 0, 0, 0.5);
+ overflow: hidden;
+ z-index: 10000;
+ color: #fff;
+}
+
+.modal-content {
+ width: 540rpx;
+ height: 233rpx;
+ line-height: 60rpx;
+ overflow: hidden;
+ position: fixed;
+ top: 50%;
+ left: 0;
+ z-index: 11;
+ background: #f9f9f9;
+ margin: -130rpx 105rpx;
+ border-radius: 36rpx;
+ display: flex;
+}
+
+.modal-content view {
+ display: inline-block;
+ flex: 1;
+ text-align: center;
+}
+
+.modal-content view>text {
+ color: #000;
+ display: block;
+ font-size: 30rpx;
+}
+
+.modal-content view>image {
+ margin-top: 40rpx;
+ width: 90rpx;
+ height: 90rpx;
}
\ No newline at end of file
diff --git a/pages/radetail/joinActivity/edit.js b/pages/radetail/joinActivity/edit.js
index 83fc53e..8007854 100644
--- a/pages/radetail/joinActivity/edit.js
+++ b/pages/radetail/joinActivity/edit.js
@@ -1,3 +1,4 @@
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const util = require("../../../utils/util.js");
const Http = require("../../../utils/HttpBasics");
const config = require("../../../config/config");
@@ -7,6 +8,7 @@ Page({
* 页面的初始数据
*/
data: {
+ navigationBarHeight,
date: '1988-03-12',
flag: 1,
answerflag: "",
diff --git a/pages/radetail/joinActivity/edit.json b/pages/radetail/joinActivity/edit.json
index 717f5de..e72cff9 100644
--- a/pages/radetail/joinActivity/edit.json
+++ b/pages/radetail/joinActivity/edit.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "活动调查"
+ "navigationBarTitleText": "活动调查",
+ "usingComponents": {
+ "navbar": "../../../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/radetail/joinActivity/edit.wxml b/pages/radetail/joinActivity/edit.wxml
index 179b6e9..840710a 100644
--- a/pages/radetail/joinActivity/edit.wxml
+++ b/pages/radetail/joinActivity/edit.wxml
@@ -1,46 +1,49 @@
-
+
\ No newline at end of file
diff --git a/pages/radetail/success/index.js b/pages/radetail/success/index.js
index 18a61bc..c360108 100644
--- a/pages/radetail/success/index.js
+++ b/pages/radetail/success/index.js
@@ -1,3 +1,4 @@
+const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px'
const util = require("../../../utils/util.js");
const Http = require("../../../utils/HttpBasics");
const config = require("../../../config/config");
@@ -6,6 +7,7 @@ Page({
* 页面的初始数据
*/
data: {
+ navigationBarHeight,
date: '1988-03-12',
flag: 1,
flagsex: 0,
diff --git a/pages/radetail/success/index.json b/pages/radetail/success/index.json
index ecbc12f..a536b72 100644
--- a/pages/radetail/success/index.json
+++ b/pages/radetail/success/index.json
@@ -1,3 +1,6 @@
{
- "navigationBarTitleText": "报名成功"
+ "navigationBarTitleText": "报名成功",
+ "usingComponents": {
+ "navbar": "../../../../components/navbar/navbar"
+ }
}
\ No newline at end of file
diff --git a/pages/radetail/success/index.wxml b/pages/radetail/success/index.wxml
index 3e1b263..a9bcd89 100644
--- a/pages/radetail/success/index.wxml
+++ b/pages/radetail/success/index.wxml
@@ -1,14 +1,17 @@
-您已扣除{{credit}}积分
-
- 报名成功
- 请您在我的活动中查看您的报名状态
-
+
+
+ 您已扣除{{credit}}积分
+
+ 报名成功
+ 请您在我的活动中查看您的报名状态
+
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/pages/user/myactivity/index.wxml b/pages/user/myactivity/index.wxml
index f5d5edf..4946c18 100644
--- a/pages/user/myactivity/index.wxml
+++ b/pages/user/myactivity/index.wxml
@@ -1,4 +1,4 @@
-
+