diff --git a/images/空.png b/images/空.png new file mode 100755 index 0000000..036e607 Binary files /dev/null and b/images/空.png differ diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js index 5af373b..101ea79 100644 --- a/pages/activity_detail/activity_detail.js +++ b/pages/activity_detail/activity_detail.js @@ -8,45 +8,85 @@ Page({ * 页面的初始数据 */ data: { - bottomBGColor: '#21BE8D',// - buttomText: '我要开团', - rule_image_height:0,//活动规则图片高度 + activityNo: "", + groupNo: "", + memberList: [], + activityDetail: {}, + currentMemberType: -1,//参与人角色，-1游客，0发起者，10参与者 + groupStatus:0,//团状态，0发起拼团，10正在拼团，20拼团成功，90拼团失败 + rule_image_height: 0,//活动规则图片高度 detail_image_height: 0,//活动详情图片高度 bannerImage: '/images/activity_banner.png', ruleImage: '/images/banner1.png', countDownDay: 0, countDownHour: 0, countDownMinute: 0, - countDownSecond: 0, - memberList:[], - activityDetail:{}, - grounpInfo:"block", - activityNo:"", - groupNo: "", + countDownSecond: 0, + //根据状态切换样式 + grounpInfo: "block", + grounpInfo2: "none", + one_content: "block", + two_content: "none", + bottomBGColor: '#F36619', + buttomText: '我要开团', + tagColor: "#F8B551", + remark: "none", + remarkText:"已退款", + //分享 + show: false, + cancelWithMask: true, + actions: [{ + name: '微信好友', + icon: '../../images/wechat_ico.png', + openType: 'share' + }, { + name: '朋友圈', + icon: '../../images/moments_ico.png' + }], }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.setData({ activityNo: options.activityNo == undefined ? "" : options.activityNo, groupNo: options.groupNo == undefined ? "" : options.groupNo, }); - console.log("activityNo1231" + this.data.activityNo); - this.getActivityDetail() + + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + //this.countActivityTime(1527609600); + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + //获取活动详情 + this.getActivityDetail(); }, - getActivityDetail: function (){ - let that = this; - wx.showNavigationBarLoading() //在标题栏中显示加载 + getActivityDetail: function () { + let that = this; + wx.showNavigationBarLoading(); //在标题栏中显示加载 + var url = ""; + var data = {}; + if (that.data.groupNo != "") { + url = "/mall/wxa/activity/group/detail"; + } else { + url = "/mall/wxa/activity/detail"; + } + wx.request({ - url: app.gw.hostUrl + '/mall/wxa/activity/detail', + url: app.gw.hostUrl + url, method: 'get', data: { activityNo: that.data.activityNo, - + groupNo: that.data.groupNo, }, header: { 'Content-Type': 'application/x-www-form-urlencoded' @@ -56,13 +96,106 @@ Page({ var status = data.code; console.log(res); if (status == 0) { + that.setData({ activityDetail: data.response, - grounpInfo: "none", - }); + activityNo: data.response.activityNo, + groupNo: data.response.groupNo == undefined ? "" : data.response.groupNo, + memberList: data.response.memberList, + groupStatus: data.response.status, + currentMemberType: data.response.currentMemberType == undefined ? -1 : data.response.currentMemberType, + }); let activityContent = data.response.activityContent; WxParse.wxParse('activityContent', 'html', activityContent, that); + //根据状态切换样式 + if (that.data.groupNo !=""){ + //开团后页面变化 + if (that.data.status == 10){ + //团倒计时时 + countActivityTime() + //正在拼团 + that.setData({ + grounpInfo: "block", + grounpInfo2: "none", + tagColor: "#F8B551", + }); + if (that.data.currentMemberTyp == -1){ + //游客 + that.setData({ + one_content: "none", + two_content: "block", + buttomText: '我要开团', + }); + } else if (that.data.currentMemberType == 0 || that.data.currentMemberType == 10){ + //发起人和邀请人 + that.setData({ + one_content: "block", + two_content: "none", + bottomBGColor: '#21BE8D', + buttomText: '邀请好友拼团', + }); + } + } else if (that.data.status == 20){ + //拼团成功 + if (that.data.currentMemberTyp == -1) { + //游客 + that.setData({ + one_content: "block", + two_content: "none", + bottomBGColor: '#F36619', + buttomText: '我要开团', + grounpInfo: "none", + grounpInfo2: "block", + + }); + } else if (that.data.currentMemberType == 0 || that.data.currentMemberType == 10) { + //发起人和邀请人 + that.setData({ + tagColor: "#21BE8D", + one_content: "block", + two_content: "none", + bottomBGColor: '#21BE8D', + buttomText: '立即预约', + grounpInfo: "block", + grounpInfo2: "none", + remarkText: "", + }); + } + } else if (that.data.status == 90){ + //拼团失败 + if (that.data.currentMemberTyp == -1) { + //游客 + that.setData({ + one_content: "block", + two_content: "none", + bottomBGColor: '#F36619', + buttomText: '我要开团', + grounpInfo: "none", + grounpInfo2: "block", + + }); + } else if (that.data.currentMemberType == 0 || that.data.currentMemberType == 10) { + //发起人和邀请人 + that.setData({ + tagColor: "#999999", + one_content: "block", + two_content: "none", + bottomBGColor: '#F36619', + buttomText: '重新开团', + grounpInfo: "block", + grounpInfo2: "none", + remarkText: "已退款", + }); + } + } + + }else{ + that.setData({ + grounpInfo: "none", + grounpInfo2: "none", + }); + } } else { wx.showToast({ title: data.msg, @@ -88,7 +221,7 @@ Page({ /** *活动倒计时方法 */ - countActivityTime: function (timeStamp){ + countActivityTime: function (timeStamp) { var totalSecond = timeStamp - Date.parse(new Date()) / 1000; var interval = setInterval(function () { // 秒数 @@ -133,7 +266,7 @@ Page({ countDownSecond: '00', }); } - }.bind(this), 1000); + }.bind(this), 1000); }, // 图片加载 ruleImageLoad: function (image) { @@ -153,19 +286,57 @@ Page({ }) }, - groupTap:function(e){ +//点击团按钮操作 + groupTap: function (e) { + var url = ""; + if (that.data.groupNo == ""){ + url = '/mall/wxa/activity/group/group'; + //首次开团 + this.groupOpenOrJoin(url); + }else{ + if (that.data.status == 10) { + //正在拼团 + if (that.data.currentMemberTyp == -1) { + //游客 + url = '/mall/wxa/activity/group/join'; + this.groupOpenOrJoin(url); + }else{ + //团长与参与人点击分享 + + } + } else if (that.data.status == 20) { + //拼团成功 + if (that.data.currentMemberTyp == -1) { + //游客 + url = '/mall/wxa/activity/group/group'; + this.groupOpenOrJoin(url); + } else { + //团长与参与人立即预约 + + } + } else if (that.data.status == 90){ + //拼团失败 + url = '/mall/wxa/activity/group/group'; + this.groupOpenOrJoin(url); + } + } + }, + +//开团与参团 + groupOpenOrJoin: function (url) { let that = this; - + wx.showToast({ title: '正在调起支付', icon: 'loading' }) wx.request({//获取微信支付想要的数据 - url: app.gw.hostUrl + '/mall/wxa/activity/group/open', + url: app.gw.hostUrl + url, method: 'get', data: { openid: app.globalData.openid, - activityNo: that.data.activityNo + activityNo: that.data.activityNo, + groupNo: that.data.groupNo, }, header: { 'Content-Type': 'application/x-www-form-urlencoded', @@ -199,15 +370,10 @@ Page({ icon: 'success', duration: 2000 }) - // wx.switchTab({//跳转到订单页面 - // url: '../order/order', - // success: function (e) { - // var page = getCurrentPages().pop(); - // if (page == undefined || page == null) return; - // console.log(page); - // page.onShow(); - // } - // }) + wx.navigateTo({ + url: '../pay_result/pay_result?activityNo=' + that.data.activityNo + '&groupNo=' + that.data.groupNo + }) + }, "fail": function (res) { console.log(res); @@ -236,53 +402,41 @@ Page({ }, }); }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - //this.countActivityTime(1527609600); - }, - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - - }, + /** * 生命周期函数--监听页面隐藏 */ onHide: function () { - + }, /** * 生命周期函数--监听页面卸载 */ onUnload: function () { - + }, /** * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh: function () { - + }, /** * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - + }, /** * 用户点击右上角分享 */ onShareAppMessage: function () { - + } }) \ No newline at end of file diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml index a78c9ac..feefdcc 100644 --- a/pages/activity_detail/activity_detail.wxml +++ b/pages/activity_detail/activity_detail.wxml @@ -29,16 +29,19 @@ - 拼团中 - 还差 - 4人拼团成功 + 拼团中 + 还差 + {{activityDetail.limitNum - memberList.length}}人拼团成功 - + {{countDownDay}}天 {{countDownHour}}时 {{countDownMinute}}分 {{countDownSecond}}秒 + + {{remarkText}} + @@ -51,16 +54,26 @@ + + + + 你来晚了 + + 176****6411发起的拼团已结束 +