From 4097f8090e591414ea00273fb4352f9da8aeffcd Mon Sep 17 00:00:00 2001
From: meo <958484406@qq.com>
Date: Wed, 29 Aug 2018 19:53:05 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD=20?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=20=E7=AB=8B=E5=8D=B3?=
=?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B4=AD=E4=B9=B0?=
=?UTF-8?q?=E6=97=B6=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=9A=84=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?][=E4=BF=AE=E6=94=B9]:=E4=BF=AE=E6=94=B9=E9=99=90=E6=97=B6?=
=?UTF-8?q?=E6=8A=A2=E8=B4=AD=E5=88=97=E8=A1=A8=E7=9A=84=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B4=AD=E4=B9=B0=E6=97=B6=E6=89=8B?=
=?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 2 +-
pages/coupon/detail/index.js | 157 +++++++++++++++-------------
pages/coupon/detail/index.wxss | 3 +-
pages/couponorder/detail/index.js | 2 +-
pages/couponorder/detail/index.wxml | 11 --
pages/getphoneInfo/index.js | 8 +-
pages/rushToBuy/index.js | 2 +-
7 files changed, 96 insertions(+), 89 deletions(-)
diff --git a/app.json b/app.json
index 2fdf307..50a22c9 100644
--- a/app.json
+++ b/app.json
@@ -3,7 +3,6 @@
"pages/index/index",
"pages/bannerdetail/index",
"pages/getuserinfo/index",
- "pages/getphoneInfo/index",
"pages/phoneinput/phoneinput",
"pages/market/index",
"pages/user/index",
@@ -19,6 +18,7 @@
"pages/login/index",
"pages/park/park",
"pages/passCar/passCar",
+ "pages/getphoneInfo/index",
"pages/addPark/addPark",
"pages/youhuiquanma/index"
],
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index aa4fb21..7670e18 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -35,70 +35,75 @@ Page({
title: "加载中..."
});
- if (options.flag) {
- this.orderFunc();
- } else {
- if (options.couponChannelId == "iambannercoupon") {
- that.setData({
- couponId: options.couponId
- });
- /**
- * 待解决
- */
- var parmer = {
- url: config.api.bannercoupondetai,
- data: {
- couponId: options.couponId
- }
- };
- } else {
- that.setData({
- couponChannelId: options.couponChannelId,
+ /**
+ * 暂时注销
+ * this.orderFunc()
+ */
+ // if (options.flag) {
+ // // this.orderFunc();
+ // }
+ // else {
+ if (options.couponChannelId == "iambannercoupon") {
+ that.setData({
+ couponId: options.couponId
+ });
+ /**
+ * 待解决
+ */
+ var parmer = {
+ url: config.api.bannercoupondetai,
+ data: {
couponId: options.couponId
- });
- var parmer = {
- url: config.api.couponDetail,
- data: {
- couponChannelId: options.couponChannelId
- }
- };
- }
-
- Http.get(parmer).then(res => {
- console.log(res);
- console.log("details");
- //当前时间与优惠券下架时间做计算
- var startTime = util.fmtDate(res.data.endTime);
- console.log(startTime);
- var s1 = new Date(startTime.replace(/-/g, "/"));
- var s2 = new Date();
- var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000);
- var year = Math.floor(runTime / 86400 / 365);
- var runTime = runTime % (86400 * 365);
- var month = Math.floor(runTime / 86400 / 30);
- var runTime = runTime % (86400 * 30);
- var day = Math.floor(runTime / 86400);
- var runTime = runTime % 86400;
- var hour = Math.floor(runTime / 3600);
- var runTime = runTime % 3600;
- var minute = Math.floor(runTime / 60);
- var runTime = runTime % 60;
- var second = runTime;
- console.log(year, month, day, hour, minute, second);
- that.setData({
- year: year,
- month: month,
- day: day,
- hour: hour,
- minute: minute
- });
- console.log(that.data.day);
- wx.hideLoading();
- that.setData({
- data: res.data
- });
+ }
+ };
+ } else {
+ that.setData({
+ couponChannelId: options.couponChannelId,
+ couponId: options.couponId
});
+ var parmer = {
+ url: config.api.couponDetail,
+ data: {
+ couponChannelId: options.couponChannelId
+ }
+ };
}
+
+ Http.get(parmer).then(res => {
+ console.log(res);
+ console.log("details");
+ //当前时间与优惠券下架时间做计算
+ var startTime = util.fmtDate(res.data.endTime);
+ console.log(startTime);
+ var s1 = new Date(startTime.replace(/-/g, "/"));
+ var s2 = new Date();
+ var runTime = parseInt((s1.getTime() - s2.getTime()) / 1000);
+ var year = Math.floor(runTime / 86400 / 365);
+ var runTime = runTime % (86400 * 365);
+ var month = Math.floor(runTime / 86400 / 30);
+ var runTime = runTime % (86400 * 30);
+ var day = Math.floor(runTime / 86400);
+ var runTime = runTime % 86400;
+ var hour = Math.floor(runTime / 3600);
+ var runTime = runTime % 3600;
+ var minute = Math.floor(runTime / 60);
+ var runTime = runTime % 60;
+ var second = runTime;
+ console.log(year, month, day, hour, minute, second);
+ that.setData({
+ year: year,
+ month: month,
+ day: day,
+ hour: hour,
+ minute: minute
+ });
+ console.log(that.data.day);
+ wx.hideLoading();
+ that.setData({
+ data: res.data
+ });
+ });
+ // }
},
/**
* 支付订单更新
@@ -143,12 +148,13 @@ Page({
})
.then(res => {
console.log(res);
+ console.log("姐姐在检查手机号是否授权的情况");
var data = {
couponChannelId: "" + that.data.couponChannelId,
couponId: "" + that.data.couponId
};
if (that.data.couponChannelId == null) {
- data = {
+ var data = {
couponId: "" + that.data.couponId
};
}
@@ -162,11 +168,18 @@ Page({
})
.catch(err => {
console.log(err);
+ console.log(that.data.couponChannelId);
+ console.log(that.data.couponId);
+ console.log("我即将要跳转到用户手机号授权的页面");
if (err.code == 11005) {
// 用户手机未授权
+ /**
+ * 将值传到用户手机号授权的页面
+ *
+ */
wx.redirectTo({
url:
- "../../getphoneInfo/index?couponChannelId=" +
+ "/pages/getphoneInfo/index?couponChannelId=" +
that.data.couponChannelId +
"&couponId=" +
that.data.couponId
@@ -176,9 +189,9 @@ Page({
// 用户手机已加密
wx.redirectTo({
url:
- "../../phoneinput/phoneinput?couponChannelId=" +
+ "/pages/phoneinput/phoneinput?couponChannelId=" +
that.data.couponChannelId +
- "& couponId=" +
+ "&couponId=" +
that.data.couponId
});
}
@@ -187,7 +200,8 @@ Page({
console.log(res);
console.log("点击领取卡券一直在loading");
if (res != "undefined") {
- const orderId = "" + res.data.id;
+ console.log(res);
+ let orderId = "" + res.data.id;
that.setData({
orderId: orderId
});
@@ -203,7 +217,6 @@ Page({
}
}).then(res => {
console.log(res);
-
/// Begin payment ----
var payOrderId = "" + res.data.payOrderId;
wx.hideLoading();
@@ -223,11 +236,13 @@ Page({
title: "购买成功",
duration: 2500
});
+ /**
+ * 用户支付成功以后跳转到券包列表
+ */
+ wx.redirectTo({
+ url: '/pages/couponorder/index/index',
+ })
}
-
- wx.navigateBack({
- delta: 2
- });
},
fail: res => {
diff --git a/pages/coupon/detail/index.wxss b/pages/coupon/detail/index.wxss
index e092d0c..3eedffd 100644
--- a/pages/coupon/detail/index.wxss
+++ b/pages/coupon/detail/index.wxss
@@ -162,12 +162,11 @@
.notes view:nth-child(2) {
width: 92%;
- padding: 0 4%;
+ padding: 2% 4%;
background: #fff;
border-bottom: 1rpx solid #f5f5f5;
display: flex;
flex-direction: column;
- padding-top: 2%;
}
.notes view:nth-child(2)>text {
diff --git a/pages/couponorder/detail/index.js b/pages/couponorder/detail/index.js
index cf9bd9c..ce55a80 100644
--- a/pages/couponorder/detail/index.js
+++ b/pages/couponorder/detail/index.js
@@ -48,7 +48,7 @@ Page({
console.log(that.data);
if (that.data.data.merchantLinkPhone) {
wx.makePhoneCall({
- phoneNumber: that.data.data.merchantLinkPhone //仅为示例,并非真实的电话号码
+ phoneNumber: that.data.data.merchantLinkPhone
});
}
}
diff --git a/pages/couponorder/detail/index.wxml b/pages/couponorder/detail/index.wxml
index a603f71..dc50ff3 100644
--- a/pages/couponorder/detail/index.wxml
+++ b/pages/couponorder/detail/index.wxml
@@ -16,18 +16,7 @@
有效期至:
{{expiredTime}}
-
-
-
diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js
index 5cc3912..f7148e3 100755
--- a/pages/getphoneInfo/index.js
+++ b/pages/getphoneInfo/index.js
@@ -4,8 +4,8 @@ var app = getApp();
Page({
data: {
canIUse: wx.canIUse('button.open-type.getPhoneNumber'),
- couponChannelId: null,
- couponId: null
+ couponChannelId: "",
+ couponId:""
},
onLoad: function(options) {
var that = this;
@@ -28,6 +28,10 @@ Page({
})
.then(function(res) {
console.log(res);
+ console.log("这是用户授权手机号的结果")
+ console.log(that.data.couponChannelId)
+ console.log(that.data.couponId)
+ console.log("这是从立即支付传回来的值 因为用户没有授权手机号")
app.globalData.phone = res.data.phone;
wx.showToast({
title: res.data.msg,
diff --git a/pages/rushToBuy/index.js b/pages/rushToBuy/index.js
index a35705a..68779ff 100644
--- a/pages/rushToBuy/index.js
+++ b/pages/rushToBuy/index.js
@@ -118,7 +118,7 @@ Page({
wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${
e.currentTarget.dataset.couponchannelid
- }&couponId=${e.currentTarget.dataset.couponId}`,
+ }&couponId=${e.currentTarget.dataset.couponid}`,
success: function(res) {
// success
},