msb-mca
/
shop-app
2.1k
2
Code Issues Pull Requests Projects Releases Wiki Activity

支付

Browse Source
msb_beta
ch 2 years ago
parent 4650f597dd
commit 66eb0d74d6
25 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File

6
common/api/order.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-29 17:38:17
* @LastEditors: ch
* @LastEditTime: 2022-04-22 22:22:51
* @LastEditTime: 2022-04-27 11:41:20
* @Description: file content
*/
import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@ -74,8 +74,8 @@ export const ApiPutCancelOrder = (data) =>
* @param {*} data
*/
export const ApiPostWxPay = (data) =>
// ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/app`, data));
ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/pay/payTest`, data));
ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/pay/wxPay/h5`, data));
// ToAsyncAwait(MsbRequestTk.get(`${BASE_URL}/pay/payTest`, data));
/**
* 获取订单统计数据

8
common/utils/requset.js
Unescape View File

@ -2,17 +2,17 @@
* @Author: ch
* @Date: 2022-03-17 17:42:32
* @LastEditors: ch
* @LastEditTime: 2022-04-26 18:13:01
* @LastEditTime: 2022-04-27 11:45:52
* @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
*/
import MsbUniRequest from '@/common/plugins/msbUniRequest';
import $store from '@/common/store';
const ENV = 'prod';
const ENV = 'test';
const BASE_URL = {
'test' : 'https://like-app.mashibing.com/test',
// 'test' : '',
// 'test' : 'https://k8s-horse-gateway.mashibing.cn',
'test' : '',
'release' : '',
'prod' : '//like-gateway.mashibing.com'
};

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.07ea43cf.js></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.398c803a.js></script></body></html>

2
h5/static/js/index.07ea43cf.js → h5/static/js/index.398c803a.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-create~pages-account-address-edit.c39c5cf7.js → h5/static/js/pages-account-address-create~pages-account-address-edit.3da73d95.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-address-list.ee618747.js → h5/static/js/pages-account-address-list.1ec8244f.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-index.4869bf25.js → h5/static/js/pages-account-index.7ed4c145.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-setting-setName.1fff9f3e.js → h5/static/js/pages-account-setting-setName.4e5f3271.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-setting-setUserInfo.b33a9151.js → h5/static/js/pages-account-setting-setUserInfo.2860700e.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-detail-in~2e94cc65.2672f27f.js → h5/static/js/pages-cart-cart~pages-cart-tabBarCart~pages-goods-list-index~pages-index-index~pages-order-detail-in~2e94cc65.b77c6fc0.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-goods-category.22b3470b.js → h5/static/js/pages-goods-category.69ddb962.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-goods-detail-index.8314c1b6.js → h5/static/js/pages-goods-detail-index.34b6e3fb.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-login.24d0bbb0.js → h5/static/js/pages-login.fe9f3fd5.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-detail-index~pages-order-list~pages-order-saleAfter-saleAfterApply~pages-order-saleAfter~19502a08.6f132527.js → h5/static/js/pages-order-detail-index~pages-order-list~pages-order-saleAfter-saleAfterApply~pages-order-saleAfter~19502a08.b42c69b6.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-logisitcsInfo.74912037.js → h5/static/js/pages-order-logisitcsInfo.7c1535ac.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterApply.335e584c.js → h5/static/js/pages-order-saleAfter-saleAfterApply.01610b7f.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterDetail-index.8ec3bd29.js → h5/static/js/pages-order-saleAfter-saleAfterDetail-index.532f7043.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterEdit.6fc38b20.js → h5/static/js/pages-order-saleAfter-saleAfterEdit.af51ae6d.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterList.632f8890.js → h5/static/js/pages-order-saleAfter-saleAfterList.d10bae8b.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterSelect.a7bdc387.js → h5/static/js/pages-order-saleAfter-saleAfterSelect.b537998d.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.3266c066.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-submit.f61b5384.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-seckill.4284525d.js → h5/static/js/pages-seckill.d74df031.js
View File

File diff suppressed because one or more lines are too long

8
manifest.json
Unescape View File

@ -77,16 +77,16 @@
"devServer" : {
"proxy" : {
"/uc/" : {
"target" : "http://192.168.10.109:8090/"
"target" : "http://192.168.10.9:8090/"
},
"/mall/" : {
"target" : "http://192.168.10.109:8090/"
"target" : "http://192.168.10.9:8090/"
},
"/pay/" : {
"target" : "http://192.168.10.109:8090/"
"target" : "http://192.168.10.9:8090/"
},
"/oss/" : {
"target" : "http://192.168.10.109:8090/"
"target" : "http://192.168.10.9:8090/"
}
}
}

59
pages/order/submit.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
* @LastEditTime: 2022-04-26 14:17:01
* @LastEditTime: 2022-04-27 11:56:07
* @Description: file content
-->
<template>
@ -172,25 +172,50 @@ export default {
uni.$u.toast(error.message);
return false;
}
this.wxpay(result.orderId);
if(this.payType === 'wxpay'){
this.wxpay(result.orderId);
}else{
uni.$u.toast('暂不支持支付宝支付');
}
},
wxpay(orderId){
this.$msb.confirm({
content : '您确定要支付吗？',
cancelText : '暂不支付',
confirmText : '立即支付',
confirm : async () => {
const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
if(error){
this.$Router.replace(`/payFail?ordId=${orderId}`)
}else{
async wxpay(orderId){
const {error, result} = await ApiPostWxPay({orderId});
if(error){
this.$Router.replace(`/payFail?ordId=${orderId}`)
}else{
this.$msb.confirm({
content : '确认微信支付是否已完成' ,
cancelText : '未支付',
confirmText : '支付已完成',
confirm(){
this.$Router.replace(`/paySuccess?ordId=${orderId}`)
},
cancel(){
this.$Router.replace(`/payFail?ordId=${orderId}`);
}
},
cancel : ()=>{
this.$Router.replace(`/orderDetail?id=${orderId}`)
}
})
})
window.location.href = result.dataInfo.payUrl;
}
// this.$msb.confirm({
// content : '您确定要支付吗？',
// cancelText : '暂不支付',
// confirmText : '立即支付',
// confirm : async () => {
// const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
// if(error){
// this.$Router.replace(`/payFail?ordId=${orderId}`)
// }else{
// this.$Router.replace(`/paySuccess?ordId=${orderId}`)
// }
// },
// cancel : ()=>{
// this.$Router.replace(`/orderDetail?id=${orderId}`)
// }
// })
}

Write Preview
Loading…
Cancel
Save