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 @@
-
+
+
{{buttomText}}
+
¥{{activityDetail.participantPrice / 100}}
{{buttomText}}
-
\ No newline at end of file
diff --git a/pages/activity_list/activity_list.js b/pages/activity_list/activity_list.js
index bea9d0c..7992831 100644
--- a/pages/activity_list/activity_list.js
+++ b/pages/activity_list/activity_list.js
@@ -1,4 +1,5 @@
// pages/activity_list/activity_list.js
+// 引用数据请求的 公共函数
const util = require('../../utils/util.js')
Page({
diff --git a/pages/index/index.js b/pages/index/index.js
index 446bf51..67f63c9 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -40,7 +40,7 @@ Page({
this.getActivityList();
},
/**
- * 生命周期函数--监听页面加载
+ * 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let that = this;
@@ -87,7 +87,7 @@ Page({
wx.request({
url: app.gw.hostUrl + '/mall/wxa/activity/list',
method: 'get',
- data: {
+ data: {
merchantNo: 'SH180331153109966163',
// selectedCityId: that.data.addrArray.id[that.data.addrIndex] == undefined ? 0 : that.data.addrArray.id[that.data.addrIndex],
pageNum: that.data.pageNum,
diff --git a/pages/login/login.js b/pages/login/login.js
index 25d9413..c70138c 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -11,7 +11,7 @@ Page({
mobile_count:60,
isLogin:false
},
- //事件处理函数
+ //事件处理函数
inputMobile:function(e){//输入手机号事件监听
this.setData({
mobile: e.detail.value
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index e323f0d..799efaf 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -10,7 +10,7 @@
- 动态码:
+ 动态码:
@@ -20,4 +20,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index eb88a16..a2b0222 100644
--- a/project.config.json
+++ b/project.config.json
@@ -10,7 +10,7 @@
"compileType": "miniprogram",
"appid": "wx2c28390f4f2c0888",
"libVersion": "2.0.9",
- "projectname": "%E5%AE%B6%E6%94%BF%E5%B0%8F%E7%A8%8B%E5%BA%8F%EF%BC%88%E4%BA%8C%E5%8F%B7%EF%BC%89",
+ "projectname": "%E4%BA%8C%E5%8F%B7%E5%AE%B6%E6%94%BF%EF%BC%88%E4%BA%8C%E5%8F%B7%EF%BC%89",
"condition": {
"search": {
"current": -1,
diff --git a/wxParse/wxParse.wxml b/wxParse/wxParse.wxml
index 00fa568..88e36ac 100644
--- a/wxParse/wxParse.wxml
+++ b/wxParse/wxParse.wxml
@@ -18,8 +18,7 @@
-
+