Browse Source

支付页面更新

tags/2.2.4
Stormeye.Wu 6 years ago
parent
commit
ed592c44e2
7 changed files with 123 additions and 85 deletions
  1. +6
    -2
      config/config.js
  2. +116
    -82
      pages/coupons/details/index.js
  3. +1
    -1
      pages/coupons/details/index.wxml
  4. +0
    -0
      pages/phoneinput/phoneinput.js
  5. +0
    -0
      pages/phoneinput/phoneinput.json
  6. +0
    -0
      pages/phoneinput/phoneinput.wxml
  7. +0
    -0
      pages/phoneinput/phoneinput.wxss

+ 6
- 2
config/config.js View File

@@ -1,7 +1,7 @@
var config = {
name: "富茂",
url: "https://ciformall.youlane.cn/C/api",
//url: "http://dac6735a.ngrok.io/C/api",
//url: "https://ciformall.youlane.cn/C/api",
url: "http://0da722ce.ngrok.io/C/api",
api: {
/**
* 接口用途:login
@@ -19,6 +19,10 @@ var config = {
* 检查用户授权状态
*/
checkUserStatus: '/user/checkUserStatus',
/**
* 检查用户手机授权状态
*/
checkPhoneStatus: '/user/checkPhoneStatus',
/**
* 优惠券查询
*/


+ 116
- 82
pages/coupons/details/index.js View File

@@ -31,7 +31,8 @@ Page({
payOrderUpdate: (orderId, payOrderId, status, reason) => {
// 支付成功
return Http.post({
url: Http.config.api.payOrderUpdate, data: {
url: Http.config.api.payOrderUpdate,
data: {
payOrderId: payOrderId,
orderId: orderId,
status: status,
@@ -39,93 +40,126 @@ Page({
}
})
},
newOrderfunc() {
payment: (res) => {
var that = this;
var payOrderId = '' + res.payOrderId;
wx.requestPayment({
timeStamp: res.timeStamp,
nonceStr: res.nonceStr,
package: res.package,
signType: 'MD5',
paySign: res.paySign,
'success': (res) => {
that.payOrderUpdate(that.data.orderId, payOrderId, 1) // 支付成功
console.log(res);
console.log('支付成功');
wx.showToast({
title: '购买成功',
duration: 2500
})
wx.navigateBack({
delta: 2
})
},
'fail': (res) => {
that.payOrderUpdate(that.data.orderId, payOrderId, 2) // 支付失败
console.log(res)
console.log('支付失败');
return;
},
'complete': (res) => {
console.log(res);
console.log('支付完成');
var url = this.data.url;
console.log('get url', url)
if (res.errMsg == 'requestPayment:ok') {
wx.showModal({
title: '提示',
content: '支付成功'
});
if (url) {
setTimeout(function() {
wx.redirectTo({
url: '/pages' + url
});
}, 2000)
} else {
setTimeout(() => {
wx.navigateBack()
}, 2000)
}
} else {
wx.showModal({
title: '错误提示',
content: res.errMsg
});
}
return;
}
})
},
orderFunc() {
var that = this;
wx.showLoading({
title: '加载中...',
})
Http.post({
url: Http.config.api.orderSave,
data: {
couponId: this.data.couponId
}
}).then(res => {
const orderId = '' + res.id;
this.setData({
orderId: orderId
url: config.api.checkPhoneStatus,
data: {}
})
if (res.payment > 0) {
return Http.post({ url: Http.config.api.payOrderCreate, data: { orderId: orderId } })
} else {
// 免费券
this.payOrderUpdate(orderId, "0", 1) // 支付成功
.then(res => {
wx.showToast({
title: "支付成功",
duration: 3000
})
})
}
}).then(res => {
console.log(res)
if (res) {
var payOrderId = '' + res.payOrderId;
wx.hideLoading();
wx.requestPayment({
timeStamp: res.timeStamp,
nonceStr: res.nonceStr,
package: res.package,
signType: 'MD5',
paySign: res.paySign,
'success': (res) => {
this.payOrderUpdate(this.data.orderId, payOrderId, 1)// 支付成功
console.log(res);
console.log('支付成功');
wx.showToast({
title: '购买成功',
duration: 2500
})
wx.navigateBack({
delta: 2
})
},
'fail': (res) => {
this.payOrderUpdate(this.data.orderId, payOrderId, 2)// 支付失败
console.log(res)
console.log('支付失败');
return;
},
'complete': (res) => {
console.log(res);
console.log('支付完成');
var url = this.data.url;
console.log('get url', url)
if (res.errMsg == 'requestPayment:ok') {
wx.showModal({
title: '提示',
content: '支付成功'
});
if (url) {
setTimeout(function () {
wx.redirectTo({
url: '/pages' + url
});
}, 2000)
} else {
setTimeout(() => {
wx.navigateBack()
}, 2000)
}
} else {
wx.showModal({
title: '错误提示',
content: res.errMsg
});
}
return;
.then(res => {
return Http.post({
url: Http.config.api.orderSave,
data: {
couponId: that.data.couponId
}
})
}
})
}).catch(err => {
console.log(err)
if (err.code == 11005) {
// 用户手机未授权
wx.redirectTo({
url: '../../getphoneInfo/index',
})
}
if (err.code == 11006) {
// 用户手机已加密
wx.redirectTo({
url: '../../phoneinput/phoneinput',
})
}
})
.then(res => {
const orderId = '' + res.data.id;
that.setData({
orderId: orderId
})
if (res.data.payment > 0) {
// real pay
return Http.post({
url: Http.config.api.payOrderCreate,
data: {
orderId: orderId
}
})
} else {
// 免费券
that.payOrderUpdate(orderId, "0", 1) // 支付成功
.then(res => {
wx.showToast({
title: "支付成功",
duration: 3000
})
})
}
}).then(res => {
console.log(res)
if (res) {
var payOrderId = '' + res.payOrderId;
wx.hideLoading();
//payment(res);
that.payOrderUpdate(that.data.orderId, payOrderId, 1) // 支付成功
}
})
},
})

+ 1
- 1
pages/coupons/details/index.wxml View File

@@ -45,6 +45,6 @@
</view>
</view>
<view class="buy-view app-border-top">
<button bindtap='orderfunc' class='buy'>立即购买</button>
<button bindtap='orderFunc' class='buy'>立即购买</button>
</view>
</view>

pages/getphoneInfo/phoneinput/phoneinput.js → pages/phoneinput/phoneinput.js View File


pages/getphoneInfo/phoneinput/phoneinput.json → pages/phoneinput/phoneinput.json View File


pages/getphoneInfo/phoneinput/phoneinput.wxml → pages/phoneinput/phoneinput.wxml View File


pages/getphoneInfo/phoneinput/phoneinput.wxss → pages/phoneinput/phoneinput.wxss View File


Loading…
Cancel
Save