From 9ffa27dcf46b90b1a4975832d52d93b880208864 Mon Sep 17 00:00:00 2001 From: lfs3 Date: Thu, 31 May 2018 17:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E7=BC=96=E5=86=99=EF=BC=8C=E6=8E=A5=E5=8F=A3=E6=9C=AA?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/空.png | Bin 0 -> 7494 bytes pages/activity_detail/activity_detail.js | 258 ++++++++++++++++----- pages/activity_detail/activity_detail.wxml | 31 ++- pages/activity_detail/activity_detail.wxss | 49 +++- pages/index/index.wxss | 5 +- pages/mcenter/mcenter.js | 2 +- 6 files changed, 280 insertions(+), 65 deletions(-) create mode 100755 images/空.png diff --git a/images/空.png b/images/空.png new file mode 100755 index 0000000000000000000000000000000000000000..036e60706c2aba0d0b4b0c9c69aa97a0ede5cd4f GIT binary patch literal 7494 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 QQ2+n{07*qoM6N<$f(8^Mj{pDw literal 0 HcmV?d00001 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发起的拼团已结束 +