diff --git a/app.js b/app.js index cbc6508..1f6d6a6 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ gw: { - hostUrl: 'https://www.1hjz.cn', + hostUrl: 'https://test.1hjz.cn', mapUrl:'https://api.map.baidu.com', systemInfo : null,//系统信息 }, diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js index ff98285..3d75621 100644 --- a/pages/activity_detail/activity_detail.js +++ b/pages/activity_detail/activity_detail.js @@ -72,8 +72,8 @@ Page({ var url = ""; var data = {}; if (that.data.groupNo != "") { - url = "/mall/wxa/activity/group/detail"; - } else { + url = "/mall/wxa/activity/group/detail";//接口 + } else { url = "/mall/wxa/activity/detail"; } wx.request({ @@ -243,7 +243,7 @@ Page({ interval = setInterval(function () { // 秒数 var second = totalSecond; - // 天数位 + // 天数位 var day = Math.floor(second / 3600 / 24); var dayStr = day.toString(); if (dayStr.length == 1) dayStr = '0' + dayStr; @@ -267,20 +267,20 @@ Page({ countDownSecond: secStr, }); totalSecond--; - if (totalSecond < 0) { + if (totalSecond < 0) {//活动结束时 this.stopInterval(); this.getActivityDetail(); } }.bind(this), 1000); }, // 图片加载 - ruleImageLoad: function (image) { + ruleImageLoad: function (image) {//拼团失败时的图片加载 var imageHeight = getApp().gw.systemInfo.windowWidth / image.detail.width * image.detail.height; this.setData({ rule_image_height: imageHeight }) }, - detailImageLoad: function (image) { + detailImageLoad: function (image) {//暂时不清楚是做什么的 var imageHeight = getApp().gw.systemInfo.windowWidth / image.detail.width * image.detail.height; this.setData({ detail_image_height: imageHeight @@ -377,12 +377,12 @@ Page({ let dr = data.response.weixinTransParameters; console.log(dr); wx.requestPayment({//微信支付 - "timeStamp": dr.timeStamp, - "nonceStr": dr.nonceStr, - "package": dr.package, - "signType": dr.signType, - "paySign": dr.paySign, - "success": function (res) { + "timeStamp": dr.timeStamp,//时间戳 + "nonceStr": dr.nonceStr,//随机字符串 + "package": dr.package,//单接口返回的prepay_id参数值 + "signType": dr.signType,//签名算法 + "paySign": dr.paySign,//签名 + "success": function (res) {//成功时回调 console.log(res); wx.showToast({ title: '支付成功', @@ -394,7 +394,7 @@ Page({ url: '../pay_result/pay_result?activityNo=' + that.data.activityNo + '&groupNo=' + that.data.groupNo + '&shareTitle=' + that.data.activityDetail.shareTitle + '&sharePhoto=' + that.data.activityDetail.sharePhoto }) }, - "fail": function (res) { + "fail": function (res) {//接口调用失败的回调 console.log(res); if (res.errMsg == 'requestPayment:fail cancel') { wx.showToast({ diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml index 8b2214a..3dea652 100644 --- a/pages/activity_detail/activity_detail.wxml +++ b/pages/activity_detail/activity_detail.wxml @@ -77,14 +77,15 @@