Browse Source

Merge branch 'master' of 202.165.179.86:FumaoPublic/C

tags/2.2.4
batman 6 years ago
parent
commit
b1473f24fa
4 changed files with 96 additions and 41 deletions
  1. +25
    -24
      common/common.js
  2. +16
    -8
      config/config.js
  3. +54
    -8
      pages/coupons/details/index.js
  4. +1
    -1
      pages/coupons/details/index.wxml

+ 25
- 24
common/common.js View File

@@ -17,29 +17,6 @@ const func = {
})
})
},
userLogin: function (code, source) {
return new Promise((resolve, reject) => {
wx.request({
url: config.api.login,
data: {
appId: app.globalData.appId,
code: code,
scene: scene,
sceneAddress: sceneAddress
},
method: "POST",
success: function (res) {
resolve(res)
},
fail: function (err) {
reject(err)
},
complete: function (res) {
//console.log("userLogin complete:" + res)
}
})
})
},
/**
* 授权后获取用户的昵称,unionId等信息
*/
@@ -75,7 +52,7 @@ const func = {
getUserPhone: function (encryptedData, iv) {
return new Promise((resolve, reject) => {
wx.request({
url: config.api.getUserPhone + "?token=" + app.globalData.token,
url: config.api.getUserPhone,
data: {
encryptedData: encryptedData,
iv: iv,
@@ -179,5 +156,29 @@ const func = {
})
})
},
payOrderCreate: function (orderId) {
return new Promise((resolve, reject) => {
wx.request({
url: config.api.payOrderCreate,
header: {
"token": app.globalData.token
},
method: "Post",
data: {
orderId: orderId,
token: app.globalData.token
},
success: function (res) {
resolve(res)
},
fail: function (err) {
reject(err)
},
complete: function (res) {
console.log(res)
}
})
})
},
}
module.exports = func;

+ 16
- 8
config/config.js View File

@@ -1,33 +1,41 @@
var url = 'https://ciformall.youlane.cn'
//var url = 'http://localhost:8001'
var apiPrefix = url + '/C/';
var apiPrefix = url + '/C/api';
var config = {
name: "富茂",
api: {
/**
* 接口用途:login
*/
login: '/api/user/login',
login: '/user/login',
/**
* 授权后获取用户的昵称,unionId等信息
*/
getUserInfo: '/api/user/getUserInfo',
getUserInfo: '/user/getUserInfo',
/**
* 接口用途:授权后获取用户的手机号
*/
getUserPhone: '/api/user/getUserPhone',
getUserPhone: '/user/getUserPhone',
/**
* 优惠券查询
*/
couponList: '/wxCoupon/list',
couponList: '/coupon/list',
/**
* 优惠券详情
*/
couponDetail: '/wxCoupon/findById',
couponDetail: '/coupon/findById',
/**
* 下单
* 下
*/
orderSave: '/wxOrder/save',
orderSave: '/order/save',
/**
* 支付订单
*/
payOrderCreate: '/pay/create',
/**
* 订单列表
*/
orderSave: '/order/list',
},

weapp: {


+ 54
- 8
pages/coupons/details/index.js View File

@@ -16,7 +16,7 @@ Page({
})
})
},
aaa(){
orderfunc(){
wx.showLoading({
title: '加载中...',
})
@@ -26,15 +26,61 @@ Page({
wx.hideLoading();
console.log(res)
if (res.data.code == 200) {
wx.showToast({
title: '购买成功',
Common.payOrderCreate(res.data.data.id)
.then(res =>{
wx.requestPayment({
timeStamp: res.data.data.timeStamp,
nonceStr: res.data.data.nonceStr,
package: res.data.data.package,
signType: 'MD5',
paySign: res.data.data.paySign,
'success': function (res) {
console.log('支付成功');
wx.showToast({
title: '购买成功',
duration: 2500
})
wx.navigateBack({
delta: 2
})
},
'fail': function (res) {
console.log('支付失败');
console.log(res)
return;
},
'complete': function (res) {
console.log('支付完成');
var url = that.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)
}
}
return;
}
})
})
wx.navigateBack({
delta: 2
} else {
wx.showToast({
title: res.data.message,
duration: 3000
})
setTimeout(() => {
wx.hideToast();
}, 2000)
}
})
}

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

@@ -42,5 +42,5 @@
<text><text class='spot'></text>每桌限用2张</text>
</view>
</view>
<button bindtap='aaa' class='buy'>立即购买</button>
<button bindtap='orderfunc' class='buy'>立即购买</button>
</view>

Loading…
Cancel
Save