|
|
@@ -90,50 +90,7 @@ |
|
|
|
}); |
|
|
|
} |
|
|
|
const savaHandle = (val) => { |
|
|
|
// console.log("vAL", val) |
|
|
|
// setItem("clientFee", val.clientFee); |
|
|
|
// setItem("promoteId", val.promoteId); |
|
|
|
// setItem("isValueCard", val.isValueCard); |
|
|
|
// state.isSign = val.isSign; |
|
|
|
// // 判断是几张卡 |
|
|
|
// console.log("val.cardTypeArr.split(", ")", val.cardTypeArr.split(",")) |
|
|
|
// // if (val.promoteName.indexOf('选装') != -1) { |
|
|
|
// // if (val.cardTypeArr.split(",")[0] == "记账卡") { |
|
|
|
// // state.isValueCard = 2 |
|
|
|
// // } else if (val.cardTypeArr.split(",")[0] == '储值卡') { |
|
|
|
// // state.isValueCard = 1 |
|
|
|
// // } else { |
|
|
|
// // state.isValueCard = 3 |
|
|
|
// // } |
|
|
|
// // uni.redirectTo({ |
|
|
|
// // url: `/subpackage/orders/verify/verify-phone/verify-phone?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`, |
|
|
|
// // }); |
|
|
|
// // return |
|
|
|
// // } |
|
|
|
|
|
|
|
// if (val.cardTypeArr.split(",").length == 1) { |
|
|
|
// if (val.cardTypeArr.split(",")[0] == "记账卡") { |
|
|
|
// state.isValueCard = 2 |
|
|
|
// } else if (val.cardTypeArr.split(",")[0] == '储值卡') { |
|
|
|
// state.isValueCard = 1 |
|
|
|
// } else { |
|
|
|
// state.isValueCard = 3 |
|
|
|
// } |
|
|
|
// uni.redirectTo({ |
|
|
|
// url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`, |
|
|
|
// }); |
|
|
|
// } else { |
|
|
|
// state.radiolist1 = []; |
|
|
|
// // 处理卡的数据 |
|
|
|
// for (var i = 0; i < val.cardTypeArr.split(",").length; i++) { |
|
|
|
// const obj = {}; |
|
|
|
// obj["name"] = val.cardTypeArr.split(",")[i]; |
|
|
|
// obj["disabled"] = false; |
|
|
|
// state.radiolist1.push(obj) |
|
|
|
// } |
|
|
|
// state.choiceCardShow = true; |
|
|
|
// console.log("state.radiolist1", state.radiolist1) |
|
|
|
// } |
|
|
|
|
|
|
|
if (val.payStatus === 'UNPAY') { |
|
|
|
// #ifdef MP-ALIPAY |
|
|
|
|
|
|
@@ -188,12 +145,81 @@ |
|
|
|
}); |
|
|
|
|
|
|
|
// #endif |
|
|
|
// #ifdef MP-WEIXIN |
|
|
|
// if (!state.openid) { |
|
|
|
// getOpenID(); |
|
|
|
|
|
|
|
// } |
|
|
|
uni.login({ |
|
|
|
provider: "weixin", |
|
|
|
success: function (e) { |
|
|
|
uni.request({ |
|
|
|
url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`, |
|
|
|
success: (res: any) => { |
|
|
|
const options = { |
|
|
|
type: 2, |
|
|
|
data: { |
|
|
|
orderId:state.orderId, |
|
|
|
wxOpenid: res.data.openid, |
|
|
|
payType:val.payType |
|
|
|
}, |
|
|
|
method: "POST", |
|
|
|
showLoading: true, |
|
|
|
}; |
|
|
|
request(PAYMENTORDERAPPLY, options).then((res) => { |
|
|
|
const data = stringToJson(res.bizContent); |
|
|
|
uni.requestPayment({ |
|
|
|
provider: "wxpay", |
|
|
|
orderInfo: "", |
|
|
|
timeStamp: data.timestamp, |
|
|
|
nonceStr: data.noncestr, |
|
|
|
package: data.wxPackage ?data.wxPackage: "", |
|
|
|
signType: data.signType, |
|
|
|
paySign: data.sign, |
|
|
|
success: function (e) { |
|
|
|
console.log("支付成功", res); |
|
|
|
refresh(); |
|
|
|
}, |
|
|
|
fail: function (err) { |
|
|
|
confirm(err, () => {}, "支付失败", false); |
|
|
|
}, |
|
|
|
}); |
|
|
|
}); |
|
|
|
}, |
|
|
|
}); |
|
|
|
}, |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
// #endif |
|
|
|
} |
|
|
|
}; |
|
|
|
const getOpenID = () => { |
|
|
|
uni.login({ |
|
|
|
provider: "weixin", |
|
|
|
success: function (e) { |
|
|
|
uni.request({ |
|
|
|
url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`, |
|
|
|
success: (res: any) => { |
|
|
|
state.openid = res.data.openid; |
|
|
|
}, |
|
|
|
}); |
|
|
|
}, |
|
|
|
}); |
|
|
|
}; |
|
|
|
const refresh = () =>{ |
|
|
|
let source = "" |
|
|
|
// #ifdef MP-ALIPAY |
|
|
|
source ="ALI" |
|
|
|
// #endif |
|
|
|
// #ifdef MP-WEIXIN |
|
|
|
source ="WECHAT" |
|
|
|
// getOpenID(); |
|
|
|
// #endif |
|
|
|
|
|
|
|
var data = { |
|
|
|
orderId: state.orderId, |
|
|
|
source: 'ALI' //请求方来源 |
|
|
|
source: source //请求方来源 |
|
|
|
}; |
|
|
|
const options = { |
|
|
|
type: 2, |