diff --git a/pages/activity_detail/activity_detail.js b/pages/activity_detail/activity_detail.js
index 4157b99..6fadc56 100644
--- a/pages/activity_detail/activity_detail.js
+++ b/pages/activity_detail/activity_detail.js
@@ -4,7 +4,6 @@ const app = getApp()
var WxParse = require('../../wxParse/wxParse.js');//主要为了能够显示获取的html代码
Page({
-
/**
* 页面的初始数据
*/
@@ -21,14 +20,72 @@ Page({
countDownSecond: 0,
memberList:[],
activityDetail:{},
+ grounpInfo:"none",
+ activityNo:"",
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ this.getActivityDetail(options.activityNo)
},
+ getActivityDetail: function (activityNo){
+ let that = this;
+ that.setData({
+ activityNo: activityNo,
+ });
+ wx.showNavigationBarLoading() //在标题栏中显示加载
+ wx.request({
+ url: app.gw.hostUrl + '/mall/wxa/activity/detail',
+ method: 'get',
+ data: {
+ activityNo: activityNo,
+ grounpInfo: "none",
+ },
+ header: {
+ 'Content-Type': 'application/x-www-form-urlencoded'
+ },
+ success: function (res) {
+ var data = res.data;
+ var status = data.code;
+ console.log(res);
+ if (status == 0) {
+ that.setData({
+ activityDetail: data.response,
+ });
+ let activityContent = data.response.activityContent;
+ WxParse.wxParse('activityContent', 'html', activityContent, that);
+
+ } else {
+ wx.showToast({
+ title: data.msg,
+ icon: 'none',
+ duration: 3000
+ });
+ return;
+ }
+ },
+ fail: function (res) {
+ wx.showToast({
+ title: '加载数据失败',
+ });
+ },
+ complete: function (res) {
+ // complete
+ wx.hideNavigationBarLoading() //完成停止加载
+ wx.stopPullDownRefresh() //停止下拉刷新
+ },
+
+ })
+ },
/**
*活动倒计时方法
*/
countActivityTime: function (timeStamp){
var totalSecond = timeStamp - Date.parse(new Date()) / 1000;
-
var interval = setInterval(function () {
// 秒数
var second = totalSecond;
@@ -91,18 +148,95 @@ Page({
detail_image_height: imageHeight
})
},
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
-
- },
+ groupTap:function(e){
+ let that = this;
+ wx.showToast({
+ title: '正在调起支付',
+ icon: 'loading'
+ })
+ wx.request({//获取微信支付想要的数据
+ url: app.gw.hostUrl + '/mall/wxa/activity/group/open',
+ method: 'get',
+ data: {
+ openid: app.globalData.openid,
+ activityNo: that.data.activityNo
+ },
+ header: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'sessionId': wx.getStorageSync('sessionId')
+ },
+ success: function (res) {
+ //--init data
+ let data = res.data;
+ let status = data.code;
+ if (status != 0) {
+ wx.showToast({
+ title: data.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ return;
+ }
+ console.log(data.response);
+ 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) {
+ console.log(res);
+ wx.showToast({
+ title: '支付成功',
+ 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();
+ // }
+ // })
+ },
+ "fail": function (res) {
+ console.log(res);
+ if (res.errMsg == 'requestPayment:fail cancel') {
+ wx.showToast({
+ title: '取消支付',
+ icon: 'none',
+ duration: 2000
+ })
+ } else {
+ wx.showToast({
+ title: '支付出错',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ }
+ })
+ },
+ fail: function (e) {
+ wx.showToast({
+ title: '网络异常！err:authlogin',
+ icon: 'none',
+ duration: 2000
+ })
+ },
+ });
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
- this.countActivityTime(1527609600);
+ //this.countActivityTime(1527609600);
},
/**
diff --git a/pages/activity_detail/activity_detail.wxml b/pages/activity_detail/activity_detail.wxml
index 4900a19..a78c9ac 100644
--- a/pages/activity_detail/activity_detail.wxml
+++ b/pages/activity_detail/activity_detail.wxml
@@ -6,7 +6,7 @@
{{activityDetail.activityName}}
{{activityDetail.limitNum}}人团
- {{activityDetail.typeDesc}}
+ {{activityDetail.limitTypeDesc}}
拼团成功人均获得一张
@@ -15,19 +15,19 @@
原价：
- {{activityDetail.originalPrice}}元
+ {{activityDetail.originalPrice / 100}}元
团长价：
- {{activityDetail.originatorPrice}}
+ {{activityDetail.originatorPrice / 100}}
团员价：
- {{activityDetail.participantPrice}}
+ {{activityDetail.participantPrice / 100}}
-
+
拼团中
-
+
- {{buttomText}}
+ {{buttomText}}
￥499
- {{buttomText}}
+ {{buttomText}}
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index d845f64..41f1e44 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -19,16 +19,26 @@ Page({
{ name: '砍价', disabled: true, className: 'gray_button' }
],
nowDate: new Date().getTime(),
- cityId: 440100000,
- addrArray: { id: [440100000, 430426000], name: ['广州', '祁东'] },
- addrIndex: 0,
activityList: [],
pageNum: 1,
pageSize: 20,
hasMoreData: true,
- img1: '/images/activity_banner.png',
+ img1: '/images/title-icon.png',
+ cityId: 440100000,
+ typeNum: 10,
+ addrArray: { id: [440100000, 430426000], name: ['广州', '深圳', '上海', '长沙', '武汉', '杭州', '北京'] },
+ addrIndex: 0,
+ },
+ /**
+ * 城市选择
+ */
+ bindAddrChange: function (e) {
+ this.setData({
+ _num: e.detail.value + 1,
+ addrIndex: e.detail.value
+ }),
+ this.getActivityList();
},
-
/**
* 生命周期函数--监听页面加载
*/
@@ -70,15 +80,16 @@ Page({
}),
this.getActivityList();
},
-
+
getActivityList: function(){
let that = this;
wx.showNavigationBarLoading() //在标题栏中显示加载
+ console.log('addrIndex:' + that.data.addrIndex)
wx.request({
url: app.gw.hostUrl + '/mall/wxa/activity/list',
method: 'get',
data: {
- merchantNo: 2,
+ selectedCityId: that.data.addrArray.id[that.data.addrIndex] == undefined ? 0 : that.data.addrArray.id[that.data.addrIndex],
pageNum: that.data.pageNum,
pageSize: that.data.pageSize
},
@@ -131,6 +142,15 @@ Page({
})
},
+ /**
+ * 点击去开团
+ */
+ openGroup:function(e){
+ console.log('activityNo：' + e.currentTarget.dataset.item);
+ wx.navigateTo({
+ url: '../activity_detail/activity_detail?activityNo=' + e.currentTarget.dataset.item,
+ })
+ },
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/index/index.json b/pages/index/index.json
index 642f7c8..19f6c96 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,5 +1,5 @@
{
"navigationBarTitleText": "活动中心",
"enablePullDownRefresh": true,
- "backgroundColor": "#26AE76"
+ "backgroundColor": "#F7F7F7"
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 28766e1..1c29e7f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,16 @@
+
@@ -25,7 +36,7 @@
¥{{item.participantPrice / 100}}
原价:{{item.originalPrice / 100}}
-
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index beb2bf8..828e5c5 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,6 +1,38 @@
.content{
width: 100%;
height: 100%;
+ background-color: #F7F7F7;
+}
+.header{
+ width: 100%;
+ background-color: #26ae76;
+}
+.title_img{
+ width: 24%;
+ margin: 10rpx 10%;
+ display: inline-block;
+}
+.top-left,.top-right{
+ width: 28%;
+ display: inline-block;
+ vertical-align:super;
+}
+.address{
+ font-size: 30rpx;
+ color:#fff;
+ margin-left:44rpx;
+}
+.middle{
+ background: #fff;
+ margin-bottom: 20rpx;
+}
+.middle_left,.middle_right{
+ width: 27%;
+ display: inline-block;
+ font-size: 32rpx;
+ padding: 20rpx 0;
+ text-align: center;
+ margin: 10rpx 11% 0;
}
image{
width: 100%;
diff --git a/pages/jz/jz.wxss b/pages/jz/jz.wxss
index bf511fa..30c91de 100644
--- a/pages/jz/jz.wxss
+++ b/pages/jz/jz.wxss
@@ -22,8 +22,8 @@ image{
height: 80rpx;
line-height: 80rpx;
}
-.top-left,.top-right{
- width: 40%;v
+.top-left .top-right{
+ width: 40%;
display: inline-block;
}
.addressBox{