diff --git a/images/u273.png b/images/u273.png
new file mode 100644
index 0000000..75274a1
Binary files /dev/null and b/images/u273.png differ
diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 3611708..1ee3951 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -2,7 +2,6 @@
const app = getApp()
let interval
var WxParse = require('../../wxParse/wxParse.js');//主要为了能够显示获取的html代码
-
Page({
/**
* 页面的初始数据
@@ -29,13 +28,14 @@ Page({
one_content: "none",
two_content: "none",
bottomBGColor: '#F36619',
- buttomText: '我要开团',
+ buttomText: '我要拼团',
tagColor: "#F8B551",
remark: "none",
remarkText: "已退款",
//分享
show: false,
cancelWithMask: true,
+ img1: '/images/u273.png',
actions: [{
name: '微信好友',
icon: '../../images/wechat_ico.png',
@@ -139,7 +139,7 @@ Page({
one_content: "block",
two_content: "none",
bottomBGColor: '#F36619',
- buttomText: '我要开团',
+ buttomText: '我要拼团',
grounpInfo: "none",
grounpInfo2: "block",
@@ -165,7 +165,7 @@ Page({
one_content: "block",
two_content: "none",
bottomBGColor: '#F36619',
- buttomText: '我要开团',
+ buttomText: '我要拼团',
grounpInfo: "none",
grounpInfo2: "block",
@@ -177,7 +177,7 @@ Page({
one_content: "block",
two_content: "none",
bottomBGColor: '#F36619',
- buttomText: '重新开团',
+ buttomText: '重新拼团',
grounpInfo: "block",
grounpInfo2: "none",
remark: "none",
@@ -493,4 +493,9 @@ Page({
path: '/pages/activity_detail/activity_detail?activityNo=' + this.data.activityNo + '&groupNo=' + this.data.groupNo,
};
},
+ openGroup: function (e) {
+ wx.switchTab({
+ url: '../index/index'
+ })
+ },
})
\ No newline at end of file
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index de827d6..9a63f31 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -6,8 +6,8 @@
{{activityDetail.activityName}}
- {{activityDetail.countdownDesc}}
-
+ {{activityDetail.countdownDesc}}
+
{{countDownDay}}天
{{countDownHour}}时
{{countDownMinute}}分
@@ -62,6 +62,7 @@
团长
+
@@ -77,11 +78,20 @@
-
-
- {{buttomText}}
+
+
+
+
+
+
+
+ 首页
+
+
+
+ {{buttomText}}
-
+
¥{{activityDetail.participantPrice / 100}}
{{buttomText}}
diff --git a/pages/activity_detail/activity_detail.wxss b/pages/activity_detail/activity_detail.wxss
index 4a6598f..2d9ff03 100644
--- a/pages/activity_detail/activity_detail.wxss
+++ b/pages/activity_detail/activity_detail.wxss
@@ -255,15 +255,53 @@ image{
height: 50px;
position:fixed;
bottom:0;
+ background: #fff;
+
+}
+.buttom_img{
+ width:15%;
+ height: 50px;
+ position:fixed;
+ bottom:0;
+ z-index: 999;
+ text-align: center;
+ border-right: 1px solid #ccc;
+}
+.buttom_img .buttom_imgs_top{
+ height: 22px;
+}
+.buttom_img .buttom_imgs_buttom{
+margin-bottom: 3px;
+display: inline-block;
+}
+.buttom_img .imgs{
+width: 40rpx;
+height: 34rpx;
+display: inline-block;
+margin-top: 5px;
+}
+.buttom_img .imgs_text{
+ color:#333333;
+ font-size:15px;
+ padding-bottom: 5px;
+
}
.bottom_view .one_content{
- width:100%;
+ /* width:100%;
line-height: 50px;
color: white;
text-align: center;
font-size: 16px;
- font-weight: bold;
+ font-weight: bold; */
+ width:85%;
+line-height:50px;
+color:white;
+text-align:center;
+font-size:16px;
+font-weight:bold;
+float:right;
+
}
@@ -279,7 +317,7 @@ image{
font-size: 23px;
color: #F44054;
font-weight: bold;
- margin-left: 0px;
+ margin-left: 28px;
background-color: white;
text-align: center;
float: left;
diff --git a/pages/at_present/at_present.js b/pages/at_present/at_present.js
index 9ff7347..d5ad20e 100644
--- a/pages/at_present/at_present.js
+++ b/pages/at_present/at_present.js
@@ -26,9 +26,6 @@ Page({
// key: 'C5KBZ-RISKD-INW4P-PWYQJ-QC6C7-BQBGC'//测试
key: 'JN7BZ-MJBK5-52SIH-QOKGH-FJE5F-IWFGG'//正式
});
- // this.setData({
- // groupNo: options.groupNo == undefined ? "" : options.groupNo,
- // });
},
onReady: function() {
var that = this;
diff --git a/pages/at_present/at_present.wxml b/pages/at_present/at_present.wxml
index 8202273..c538d5d 100644
--- a/pages/at_present/at_present.wxml
+++ b/pages/at_present/at_present.wxml
@@ -5,7 +5,6 @@
{{city}}{{district}}
{{lists}}
-
手动切换地址
确定