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..e4f2b71 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({ /** * 页面的初始数据 @@ -28,14 +27,16 @@ Page({ grounpInfo2: "none", one_content: "none", two_content: "none", + // two_content: "block", 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 +140,7 @@ Page({ one_content: "block", two_content: "none", bottomBGColor: '#F36619', - buttomText: '我要开团', + buttomText: '我要拼团', grounpInfo: "none", grounpInfo2: "block", @@ -165,7 +166,7 @@ Page({ one_content: "block", two_content: "none", bottomBGColor: '#F36619', - buttomText: '我要开团', + buttomText: '我要拼团', grounpInfo: "none", grounpInfo2: "block", @@ -177,7 +178,7 @@ Page({ one_content: "block", two_content: "none", bottomBGColor: '#F36619', - buttomText: '重新开团', + buttomText: '重新拼团', grounpInfo: "block", grounpInfo2: "none", remark: "none", @@ -493,4 +494,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..0db0876 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,15 +78,24 @@