jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

圣诞快乐

Browse Source 
# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
stivepeim
2020-12-23 15:56:45 +08:00
parent f3975936c2
commit 0d32da772d
768 changed files with 40200 additions and 46123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/components/payment/index.vue
View File

@@ -77,8 +77,12 @@
'from': 'routine',
// #endif
// #ifdef H5 || APP-PLUS
'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
'from': this.$wechat.isWeixin() ? 'public' : 'weixinh5'
// #endif
// // #ifdef H5
// quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location.port + '/pages/users/order_details/index?order_id=' + this.order_id : location.protocol + '//' + location.hostname +
// '/pages/users/order_details/index?order_id=' + that.order_id
// // #endif
}).then(res => {
switch (paytype) {
case 'weixin':
@@ -87,11 +91,11 @@
});
// #ifdef MP || APP-PLUS
let jsConfig = res.data.jsConfig;
let packages = 'prepay_id=' + jsConfig.prepayId;
// let packages = 'prepay_id=' + jsConfig.prepayId;
uni.requestPayment({
timeStamp: jsConfig.timeStamp.toString(),
nonceStr: jsConfig.nonceStr,
package: packages,
package: jsConfig.package,
signType: jsConfig.signType,
paySign: jsConfig.paySign,
success: function(res) {
@@ -128,30 +132,18 @@
});
// #endif
// #ifdef H5
let data = res.data;
if (data.status == "WECHAT_H5_PAY") {
uni.hideLoading();
location.replace(data.result.jsConfig.h5PayUrl);
return that.$util.Tips({
title: "支付成功",
icon: 'success'
}, () => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
});
} else {
let jsConfig = data.result.jsConfig;
let packages = 'prepay_id=' + jsConfig.prepayId;
let data = {
if (res.data.status === "WECHAT_PAY") {
let jsConfig = res.data.jsConfig;
//let packages = 'prepay_id=' + jsConfig.prepayId;
let datas = {
timestamp:jsConfig.timeStamp,
nonceStr:jsConfig.nonceStr,
package:packages,
package:jsConfig.package,
signType:jsConfig.signType,
paySign:jsConfig.paySign
};
that.$wechat.pay(data)
.finally(() => {
that.$wechat.pay(datas)
.then(() => {
return that.$util.Tips({
title: "支付成功",
icon: 'success'
@@ -166,6 +158,17 @@
title: '支付失败'
});
});
} else {
uni.hideLoading();
location.replace(res.data.jsConfig.h5PayUrl);
return that.$util.Tips({
title: "支付成功",
icon: 'success'
}, () => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
});
}
// #endif
break;