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

## v1.3.1 更新列表

Browse Source 
1. 【修复】申请退款后积分等操作可能出现错误的问题
	2. 【修复】拼团支付可能出现支付错误的问题
	3. 【修复】退款申请后的订单流程优化和积分赠送的问题
	4. 【修复】回收站中的商品无法恢复的问题
	5. 【修复】一号通短信查询记录不完整的问题
	6. 【修复】用户管理批量加分组，标签的问题
	7. 【修复】积分日志搜索显示有误的问题
	8. 【修复】手动发送优惠券可能会出错的问题
	9. 【修复】核销订单创建在某种条件下会出错的问题
	10. 【修复】移动端商品详情，购物车等样式兼容问题
	11. 【修复】业务流程性的优化
This commit is contained in:
stivepeim
2021-01-19 10:16:45 +08:00
parent 4e42da0fc1
commit be34f57322
136 changed files with 19904 additions and 23329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,8 @@
<script>
import {
orderPay
orderPay,
wechatOrderPay
} from '@/api/order.js';
export default {
props: {
@@ -69,36 +70,23 @@
});
uni.showLoading({
title: '支付中'
});
orderPay({
uni: that.order_id,
paytype: paytype,
// #ifdef MP
'from': 'routine',
// #endif
// #ifdef H5 || APP-PLUS
'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
});
wechatOrderPay({
orderNo: that.order_id,
payChannel: this.$wechat.isWeixin() ? 'public' : 'weixinh5',
payType: paytype
}).then(res => {
switch (paytype) {
let jsConfig = res.data.jsConfig;
switch (res.data.payType) {
case 'weixin':
if (res.data.result === undefined) return that.$util.Tips({
title: '缺少支付参数'
});
// #ifdef MP || APP-PLUS
let jsConfig = res.data.jsConfig;
// let packages = 'prepay_id=' + jsConfig.prepayId;
// #ifdef MP
uni.requestPayment({
timeStamp: jsConfig.timeStamp.toString(),
timeStamp: jsConfig.timeStamp,
nonceStr: jsConfig.nonceStr,
package: jsConfig.package,
package: jsConfig.packages,
signType: jsConfig.signType,
paySign: jsConfig.paySign,
success: function(res) {
success: function(ress) {
uni.hideLoading();
return that.$util.Tips({
title: '支付成功',
@@ -129,21 +117,25 @@
});
});
},
});
})
// #endif
// #ifdef H5
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:jsConfig.package,
signType:jsConfig.signType,
paySign:jsConfig.paySign
};
that.$wechat.pay(datas)
.then(() => {
let datas = {
timestamp: jsConfig.timeStamp,
nonceStr: jsConfig.nonceStr,
package: jsConfig.packages,
signType: jsConfig.signType,
paySign: jsConfig.paySign
};
that.$wechat.pay(datas).then(res => {
if (res.errMsg == 'chooseWXPay:cancel') {
return that.$util.Tips({
title: '支付失败'
});
} else {
wechatQueryPayResult({
orderNo: that.order_id
}).then(res => {
return that.$util.Tips({
title: "支付成功",
icon: 'success'
@@ -152,24 +144,14 @@
action: 'pay_complete'
});
});
})
.catch(function() {
}).cache(errW => {
return that.$util.Tips({
title: '支付失败'
title: errW
});
});
} else {
uni.hideLoading();
location.replace(res.data.jsConfig.h5PayUrl);
return that.$util.Tips({
title: "支付成功",
icon: 'success'
}, () => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
});
}
})
}
})
// #endif
break;
case 'yue':
@@ -183,18 +165,132 @@
});
});
break;
case 'offline':
uni.hideLoading();
return that.$util.Tips({
title: '线下支付成功',
icon: 'success'
}, () => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
});
break;
case 'weixinh5':
uni.hideLoading();
location.replace(jsConfig.mwebUrl);
return that.$util.Tips({
title: "支付成功",
icon: 'success'
}, () => {
that.$emit('onChangeFun', {
action: 'pay_complete'
});
});
break;
}
// switch (paytype) {
// case 'weixin':
// if (res.data.result === undefined) return that.$util.Tips({
// title: '缺少支付参数'
// });
// // #ifdef MP || APP-PLUS
// let jsConfig = res.data.jsConfig;
// uni.requestPayment({
// timeStamp: jsConfig.timeStamp.toString(),
// nonceStr: jsConfig.nonceStr,
// package: jsConfig.package,
// signType: jsConfig.signType,
// paySign: jsConfig.paySign,
// success: function(res) {
// uni.hideLoading();
// return that.$util.Tips({
// title: '支付成功',
// icon: 'success'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// });
// },
// fail: function(e) {
// uni.hideLoading();
// return that.$util.Tips({
// title: '取消支付'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_fail'
// });
// });
// },
// complete: function(e) {
// uni.hideLoading();
// if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
// title: '取消支付'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_fail'
// });
// });
// },
// });
// // #endif
// // #ifdef H5
// 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:jsConfig.package,
// signType:jsConfig.signType,
// paySign:jsConfig.paySign
// };
// that.$wechat.pay(datas)
// .then(() => {
// return that.$util.Tips({
// title: "支付成功",
// icon: 'success'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// });
// })
// .catch(function() {
// return that.$util.Tips({
// 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;
// case 'yue':
// uni.hideLoading();
// return that.$util.Tips({
// title: '余额支付成功',
// icon: 'success'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// });
// break;
// case 'offline':
// uni.hideLoading();
// return that.$util.Tips({
// title: '线下支付成功',
// icon: 'success'
// }, () => {
// that.$emit('onChangeFun', {
// action: 'pay_complete'
// });
// });
// break;
// }
}).catch(err => {
uni.hideLoading();
return that.$util.Tips({