Skip to content

E
ehall-show-h5
提交 95597e3d authored 作者: haodaking's avatar haodaking
浏览文件
操作

feat: 办事大厅支付迁移

上级 1feb5e83
隐藏空白字符变更
内嵌 并排
正在显示 包含 190 行增加 和 161 行删除
.env
浏览文件 @ 95597e3d
VUE_APP_BASE_API= VUE_APP_BASE_API=https://learn-api2.ezijing.com
VUE_APP_WECHAT_REDIRECT_URL=https://passport2.ezijing.com/rest/wechat/oauth-callback VUE_APP_WECHAT_REDIRECT_URL=https://passport2.ezijing.com/rest/wechat/oauth-callback
\ No newline at end of file
.env.dev
浏览文件 @ 95597e3d
NODE_ENV=production NODE_ENV=production
VUE_APP_BASE_API=https://ehall2.ezijing.com VUE_APP_BASE_API=https://learn-api2.ezijing.com
VUE_APP_WECHAT_REDIRECT_URL=https://passport2.ezijing.com/rest/wechat/oauth-callback VUE_APP_WECHAT_REDIRECT_URL=https://passport2.ezijing.com/rest/wechat/oauth-callback
\ No newline at end of file
.env.production
浏览文件 @ 95597e3d
VUE_APP_BASE_API=https://ehall.ezijing.com VUE_APP_BASE_API=https://learn-api.ezijing.com
VUE_APP_WECHAT_REDIRECT_URL=https://passport.ezijing.com/rest/wechat/oauth-callback VUE_APP_WECHAT_REDIRECT_URL=https://passport.ezijing.com/rest/wechat/oauth-callback
\ No newline at end of file
cert/dev.ezijing.com.key 100755 → 100644
浏览文件 @ 95597e3d
-----BEGIN RSA PRIVATE KEY----- -----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
cert/dev.ezijing.com.pem 100755 → 100644
浏览文件 @ 95597e3d
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIFhzCCBG+gAwIBAgIQCzEi4VmynSzbyBV1UEXGojANBgkqhkiG9w0BAQsFADBu MIIHEDCCBfigAwIBAgIQC53CSHjB5MGsHDzx/2AxzjANBgkqhkiG9w0BAQsFADBb
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg d3cuZGlnaWNlcnQuY29tMRowGAYDVQQDExFTZWN1cmUgU2l0ZSBDQSBHMjAeFw0y
RFYgVExTIENBIC0gRzEwHhcNMjAxMTA5MDAwMDAwWhcNMjExMTA5MjM1OTU5WjAa MDA2MTAwMDAwMDBaFw0yMjA5MTIxMjAwMDBaMFsxCzAJBgNVBAYTAkNOMRAwDgYD
MRgwFgYDVQQDEw9kZXYuZXppamluZy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB VQQIEwdCZWlqaW5nMSIwIAYDVQQKExlUSEggWmlqaW5nIChCZWlqaW5nKSBJbmMu
DwAwggEKAoIBAQD0yNQTHE6Pq18xRpT63+TT5WiRWSHUZVkAIs93FHZVyOM6Roiq MRYwFAYDVQQDDA0qLmV6aWppbmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
WhjhMrj+7JudwuGiq72CDKIkU2ZdUvF7ZPFF4ZeFHy0BzRFMK5oW/SgcnsdcjjwJ MIIBCgKCAQEAn0EINdIXTDCzmR7J5FOjOV+PbXt7GNO6fanoCGe2O0CPRlNf2Ea/
n/NzyyCPJ3tey7JG6srCkdZd/L0UwcTuv/1H4hQcCQg+ZnXuqXCqmGV48rwjV+cN wv6SlRtJPd0ohmnKqZdUbBpAsiV4ggOdOqeEB6utVYQWY/zhXRKYeRjN/iDuWCRY
T8s6+CVc8iVHnlNR7o0pWgI9ldAQcc9kKUfSp2dcWJSrkjV/oYxSgYJtXkMsQJs4 5S+eRVkSzVOJP9DlBn6dnHSsWj55h1PrkIac8B862F/cVno/Wk5dqU55ZUoNwHGw
Cd0I/+yepqTDyh4uagEZKKD8Uatz/jWXYMnHIjGb8J9oSF+dI3iG85MAVdyuj1yD 5Goz3R37w+Q0C9HRS5mrmPqI+Ogy8TJrIRxw9YAj5OlvuqBAeYAW1sNdEfsimMB0
LLzwfUF9P9sSEzs475FFopStXkKJ54g4Sa8ZAgMBAAGjggJzMIICbzAfBgNVHSME H2fbbXqEL4AsipE5ppP7Ij3vxVpxvmnl/SO7N6+Fit6r25VeFSvplK+PIV3cUsK3
GDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQUkRHkmubxZAvEWtCY PCKV2sOo0BDWtWFQh5hW3fK5RYjLpNDHCwIDAQABo4IDzjCCA8owHwYDVR0jBBgw
IBT9sw/3Yb8wGgYDVR0RBBMwEYIPZGV2LmV6aWppbmcuY29tMA4GA1UdDwEB/wQE FoAUxBF+iECGwkG/ZfMa4bRTQKOr7H0wHQYDVR0OBBYEFHxjLRRYXe2jIjYECuN8
AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTAYDVR0gBEUwQzA3 r3EnjOTFMCUGA1UdEQQeMByCDSouZXppamluZy5jb22CC2V6aWppbmcuY29tMA4G
BglghkgBhv1sAQIwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQu A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwbwYD
Y29tL0NQUzAIBgZngQwBAgEwgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYY VR0fBGgwZjAxoC+gLYYraHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1NlY3VyZVNp
aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEoGCCsGAQUFBzAChj5odHRwOi8vY2Fj dGVDQUcyLmNybDAxoC+gLYYraHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1NlY3Vy
ZXJ0cy5kaWdpY2VydC5jb20vRW5jcnlwdGlvbkV2ZXJ5d2hlcmVEVlRMU0NBLUcx ZVNpdGVDQUcyLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUF
LmNydDAJBgNVHRMEAjAAMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYA9lyUL9F3 BwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgGBmeBDAECAjBsBggr
MCIUVBgIMJRWjuNNExkzv98MLyALzE7xZOMAAAF1qpa6jQAABAMARzBFAiAwHOcp BgEFBQcBAQRgMF4wIQYIKwYBBQUHMAGGFWh0dHA6Ly9vY3NwLmRjb2NzcC5jbjA5
Ua1H0WK4OZUHiQ1rndqnYxPHhP9XWunwpRMoagIhAOB2MPSW9M4qj6Yih7eQkydl BggrBgEFBQcwAoYtaHR0cDovL2NybC5kaWdpY2VydC1jbi5jb20vU2VjdXJlU2l0
lgawpoBZzRzhisU+TN67AHYAXNxDkv7mq0VEsV6a1FbmEDf71fpH3KFzlLJe5vbH ZUNBRzIuY3J0MAwGA1UdEwEB/wQCMAAwggH1BgorBgEEAdZ5AgQCBIIB5QSCAeEB
DsoAAAF1qpa63gAABAMARzBFAiEA92ZeW0PgyWW3j+3wypLS0O/wI63C+x0WTvMZ 3wB2AEalVet1+pEgMLWiiWn0830RLEF0vv1JuIWr8vxw/m1HAAABcpwT21oAAAQD
Vngp6AMCIBoThjaKif+XY11YbaV89ndqs1nDlzbEfBrFftoB9fchMA0GCSqGSIb3 AEcwRQIgWTyqiBOL3dFTJBE2Q6cgSBzk9W5iTaC2B8T1f8gFCP0CIQDhngm9WJbO
DQEBCwUAA4IBAQA2geo9wQAd+vx+lwAafVRxCBQyBiS0qT413ewYpZYDnSkLX0l1 J7v14h6w+B2Li7WEAkWLSLiTKzh7na2SuQB1ACJFRQdZVSRWlj+hL/H3bYbgIyZj
5kRdxDGWQhPzOio0ckj/jOtOlbbSsiovBBVTyYPB8WfkNjMd0psMNx2e6Wy/WKkQ rcBLf13Gg1xu4g8CAAABcpwT2zEAAAQDAEYwRAIgckmPL6WJx9Jke4AfVLmy//ye
X3DqEOB4XGg0RwpebiAmz6lWxyFwIAbCrwCntkkaIF4LnIvczn6pvPFBtK2nXJJC tsmT5si8FO8p9Fd52VECICPqDvdjlN2DtfQznTGTxaL0PQ5N8eNiX3fJn6sRCfcU
HL0Igbxo+xJLt3Hql7TcwkFDXz/LIB8AwhhkkhhwW45r3Eyjw8eOyzvflDPwSNH+ AHYAUaOw9f0BeZxWbbg3eI8MpHrMGyfL956IQpoN/tSLBeUAAAFynBPbfQAABAMA
ByadQ+AH4H4vYYVo0ILNIPCdaokLQ+u4FttB9VQ+iGmpJ56Yg2muxWh8Qckca+vH RzBFAiEAwYooscdEijXGnRdJYnz0ClmvWcxtJ169Bq+sywhPReACIDjvE5a5d7mb
40RbC5aK1RSy2RIRpC5fwvq2JuV/CksP5G5Q n3YTgfLOtbnuDpkDRjUfdY7cs6UfderhAHYAQcjKsd8iRkoQxqE6CUKHXk4xixsD
6+tLx2jwkGKWBvYAAAFynBPa0wAABAMARzBFAiAmJVwNfWFMKrqWTvEfHk9O/5/r
Crj/W3BqjV6p0D09hgIhAIKb4drMok8s1X0Evh4Nbzd3Nv9PuwITdICztemCrk4e
MA0GCSqGSIb3DQEBCwUAA4IBAQBWSrE/pt//MKeGpf6vMISGD0LZArebPFQ7wlgv
Y13HpCY5lqwrZItsuXWS5IYMv8ueYarCm081OJOBvSUKHOtYSe6wdFqsXehokUiy
7oVNief7Li5RvLcf6z5fyjB+i017dds73Dt94mE1imV1DR1WErp1U6QCMEh+TKFa
PL52V9X5VWiYdImzdm8AWOlNBrgicmVzEEQuglejF5uaALf9iiyAjP36apqXv77T
UtxKgjONB1tnRw4XRqzwrEK+QjeOhziKCn1v2ppFX/Z11YYA7ajICVrG6wGJ+ENc
ukf5+v8r+TU7PqxQmb62zocX22jhe8HM644UJ4FWCiBh4Lb1
-----END CERTIFICATE----- -----END CERTIFICATE-----
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh MIIFFjCCA/6gAwIBAgIQCH4Y+4+qkn7odgoNiYL1EjANBgkqhkiG9w0BAQsFADBh
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT QTAeFw0xOTA2MjAxMjIxMzVaFw0yOTA2MjAxMjIxMzVaMFsxCzAJBgNVBAYTAlVT
MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH b20xGjAYBgNVBAMTEVNlY3VyZSBTaXRlIENBIEcyMIIBIjANBgkqhkiG9w0BAQEF
MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc AAOCAQ8AMIIBCgKCAQEAx7s903fR6SgpA08UdhKEUIZHa2Ig7KPNkTtwMS1+08YS
oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo 5QSEDM4DQxy48jP8dZkyyU9J/0WCm8Nlv5ga7HOAxhdJcv+CPP4oadx8EbdrmjAH
lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj rGOv64oHvt7Ina7uzLd3krqxd0doeuxRpTHvFAyjaUhxjSfZx0wh1f6W7prPm7V5
pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h 0VcTudj4rI+xtHXUcFAuFz4bcapTcru5aaZ1v6F2usMCMVM+xJxEZcsUM4uTxdIf
yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n W5FUTI0dbP8NyZkr/WVzL59aGwBE4ZU0JKBlgEmtkFpLPR7JCzYunafu7nMk5YY2
wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M 6WDOmezpWDjzDxJ8xakizykWYT5gdJYE3ULlUe31WQIDAQABo4IBzjCCAcowHQYD
pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf VR0OBBYEFMQRfohAhsJBv2XzGuG0U0Cjq+x9MB8GA1UdIwQYMBaAFAPeUDVW0Uy7
BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw ZvCj4hsbw5eyPdFVMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcD
HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C AQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAxBggrBgEFBQcBAQQlMCMwIQYI
AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp KwYBBQUHMAGGFWh0dHA6Ly9vY3NwLmRjb2NzcC5jbjBEBgNVHR8EPTA7MDmgN6A1
Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu hjNodHRwOi8vY3JsLmRpZ2ljZXJ0LWNuLmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RD
Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG QS5jcmwwgc4GA1UdIASBxjCBwzCBwAYEVR0gADCBtzAoBggrBgEFBQcCARYcaHR0
/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzCBigYIKwYBBQUHAgIwfgx8QW55IHVz
MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B ZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2Yg
SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW dGhlIFJlbHlpbmcgUGFydHkgQWdyZWVtZW50IGxvY2F0ZWQgYXQgaHR0cHM6Ly93
M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV d3cuZGlnaWNlcnQuY29tL3JwYS11YTANBgkqhkiG9w0BAQsFAAOCAQEAE+8lW5Yw
4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ IuiRsHn4gYRRVbLmIypWwYH74lIXnQiALeUsUkWfW7KA0ARF1el3YaTAg8/r6zyX
sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy eZTdlhndxKOKvO5N+rnHWJB6a3fJURn6e0I+rDzKV1Zacv2Vx/ZHLZmza/bp4Azi
rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg== BrDOiPlW/Ktj6ALQzAgq70Oytk9htLupBWPuplJDdyhGqb9RfQvWc1Fa1HwXdBQi
oJPibfMaYkHMY3pTbOv2rzMKEoZwHDHqyC73RI9JgqqiXHw0rIL8A1uL3IrymXEr
mycTqbSozQwiiEfb+cxzY82YaNzaLpJyIst0T2QmdDDngmyd2LEmm4NKeXRrcFRh
XDDFfpIn93B7JA==
-----END CERTIFICATE----- -----END CERTIFICATE-----
src/api/index.js
浏览文件 @ 95597e3d
...@@ -3,7 +3,7 @@ import httpRequest from '@/utils/axios' ...@@ -3,7 +3,7 @@ import httpRequest from '@/utils/axios'
// 获取事务类型列表 // 获取事务类型列表
export function getAffairType(params) { export function getAffairType(params) {
return httpRequest({ return httpRequest({
url: '/api/ehall/v2/lobby/affairs', url: '/api/lms/v2/lobby/affairs',
method: 'get', method: 'get',
params params
}) })
...@@ -11,7 +11,7 @@ export function getAffairType(params) { ...@@ -11,7 +11,7 @@ export function getAffairType(params) {
// 获取事务列表 // 获取事务列表
export function getAffairList(params) { export function getAffairList(params) {
return httpRequest({ return httpRequest({
url: '/api/ehall/v2/lobby/processes', url: '/api/lms/v2/lobby/processes',
method: 'get', method: 'get',
params params
}) })
...@@ -19,14 +19,14 @@ export function getAffairList(params) { ...@@ -19,14 +19,14 @@ export function getAffairList(params) {
// 获取事务详情 // 获取事务详情
export function getAffair(id) { export function getAffair(id) {
return httpRequest({ return httpRequest({
url: `/api/ehall/v2/lobby/processes/${id}`, url: `/api/lms/v2/lobby/processes/${id}`,
method: 'get' method: 'get'
}) })
} }
// 创建事务 // 创建事务
export function createAffair(data) { export function createAffair(data) {
return httpRequest({ return httpRequest({
url: '/api/ehall/v2/lobby/processes', url: '/api/lms/v2/lobby/processes',
method: 'post', method: 'post',
data data
}) })
...@@ -34,7 +34,7 @@ export function createAffair(data) { ...@@ -34,7 +34,7 @@ export function createAffair(data) {
// 更新事务 // 更新事务
export function updateAffair(id, data) { export function updateAffair(id, data) {
return httpRequest({ return httpRequest({
url: `/api/ehall/v2/lobby/processes/${id}`, url: `/api/lms/v2/lobby/processes/${id}`,
method: 'post', method: 'post',
data data
}) })
...@@ -42,14 +42,14 @@ export function updateAffair(id, data) { ...@@ -42,14 +42,14 @@ export function updateAffair(id, data) {
// 删除事务 // 删除事务
export function deleteAffair(id) { export function deleteAffair(id) {
return httpRequest({ return httpRequest({
url: `/api/ehall/v2/lobby/processes/${id}`, url: `/api/lms/v2/lobby/processes/${id}`,
method: 'delete' method: 'delete'
}) })
} }
// 上传文件 // 上传文件
export function upload(data) { export function upload(data) {
return httpRequest({ return httpRequest({
url: '/api/ehall/v2/lobby/tools/upload', url: '/api/lms/v2/lobby/tools/upload',
method: 'post', method: 'post',
headers: { headers: {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'
...@@ -60,7 +60,7 @@ export function upload(data) { ...@@ -60,7 +60,7 @@ export function upload(data) {
// 获取学期 // 获取学期
export function getSemesters(params) { export function getSemesters(params) {
return httpRequest({ return httpRequest({
url: '/api/ehall/v2/lobby/semesters', url: '/api/lms/v2/lobby/semesters',
method: 'get', method: 'get',
params params
}) })
...@@ -68,26 +68,26 @@ export function getSemesters(params) { ...@@ -68,26 +68,26 @@ export function getSemesters(params) {
// 获取课程 // 获取课程
export function getCourses(data) { export function getCourses(data) {
return httpRequest({ return httpRequest({
url: `/api/ehall/v2/lobby/semesters/${data.id}/courses`, url: `/api/lms/v2/lobby/semesters/${data.id}/courses`,
method: 'get' method: 'get'
}) })
} }
// 获取成绩单 // 获取成绩单
export function getReport(params) { export function getReport(params) {
return httpRequest({ return httpRequest({
url: `/api/ehall/v2/lobby/havereport`, url: `/api/lms/v2/lobby/havereport`,
method: 'get', method: 'get',
params params
}) })
} }
// 获取学生 // 获取学生
export function getStudent() { export function getStudent() {
return httpRequest.get('/api/ehall/v2/lobby/student') return httpRequest.get('/api/lms/v2/lobby/student')
} }
// 获取重修课程 // 获取重修课程
export function getRetakeCourses() { export function getRetakeCourses() {
return httpRequest.get('/api/ehall/v2/lobby/courses') return httpRequest.get('/api/lms/v2/lobby/courses')
} }
// 创建微信支付订单 // 创建微信支付订单
...@@ -107,7 +107,7 @@ export function getOrder(orderId) { ...@@ -107,7 +107,7 @@ export function getOrder(orderId) {
// 支付成功回调 // 支付成功回调
export function paySuccess(id) { export function paySuccess(id) {
return httpRequest.get(`/api/ehall/v2/lobby/update-status-api/${id}`) return httpRequest.get(`/api/lms/v2/lobby/update-status-api/${id}`)
} }
/** /**
* 获取openId * 获取openId
...@@ -115,3 +115,17 @@ export function paySuccess(id) { ...@@ -115,3 +115,17 @@ export function paySuccess(id) {
export function getOpenId(data) { export function getOpenId(data) {
return httpRequest.post('/api/usercenter/v1/wechat/get-openid', data) return httpRequest.post('/api/usercenter/v1/wechat/get-openid', data)
} }
/**
* 创建订单
* */
export function createOrder(data) {
return httpRequest.post('/api/shop/order/add', data, { headers: { 'Content-Type': 'application/json' } })
}
/**
* 获取订单
* */
export function getOrderList(data) {
return httpRequest.post('/api/shop/order/search', data, { headers: { 'Content-Type': 'application/json' } })
}
src/components/Pay.vue
浏览文件 @ 95597e3d
...@@ -29,7 +29,7 @@ import QrcodeVue from 'qrcode.vue' ...@@ -29,7 +29,7 @@ import QrcodeVue from 'qrcode.vue'
export default { export default {
props: { props: {
payment: { type: String }, // 支付方式 payment: { type: String }, // 支付方式
productId: { type: String, required: true }, // 商品ID product: { type: Object, required: true }, // 商品信息
num: { type: [Number, String], default: 1 } // 购买数量 num: { type: [Number, String], default: 1 } // 购买数量
}, },
components: { QrcodeVue }, components: { QrcodeVue },
...@@ -42,7 +42,7 @@ export default { ...@@ -42,7 +42,7 @@ export default {
}, },
computed: { computed: {
qrcodeValue() { qrcodeValue() {
return this.order.url return this.order.payment_url
}, },
pid() { pid() {
return this.$route.params.id return this.$route.params.id
...@@ -52,23 +52,34 @@ export default { ...@@ -52,23 +52,34 @@ export default {
} }
}, },
methods: { methods: {
// 创建微信订单 // 创建订单
createWxPayOrder(productId, num = 1) { createOrder() {
return api.createWxpayOrder('ezijing', productId, { num, notify_url: this.notifyUrl }).then(response => { // 支付类型(1:微信扫码支付,2:微信小程序支付,3:微信JSAPI支付,4:微信h5支付,11:支付宝扫码支付,12:支付宝手机网站支付,13:支付宝网站支付)
this.order = response const payment = { 1: '11', 2: '1' }
return response const params = {
}) buy_count: this.num + '',
}, payment_method: payment[this.payment],
// 创建支付宝订单 shop_id: this.product.shop_id,
createAliPayOrder(productId, num = 1) { spu_id: this.product.spu_id,
return api.createAlipayOrder(productId, { type: 2, num, notify_url: this.notifyUrl }).then(response => { sku_id: this.product.sku_id
this.order = response }
return api.createOrder(params).then(response => {
if (response.code === 0) {
this.order = response
} else {
this.$message.error(response.msg)
}
return response return response
}) })
}, },
getOrder() { getOrder() {
return api.getOrder(this.order.order_no).then(response => { const params = {
const { order } = response shop_id: this.product.shop_id,
spu_id: this.product.spu_id,
order_id: this.order.order_id
}
return api.getOrderList(params).then(response => {
const [order = {}] = response.data
this.rawOrder = order this.rawOrder = order
return order return order
}) })
...@@ -77,7 +88,7 @@ export default { ...@@ -77,7 +88,7 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.getOrder().then(response => { this.getOrder().then(response => {
// 支付成功 // 支付成功
if (response.status === 1) { if (response.order_status === '4') {
this.$emit('success') this.$emit('success')
this.clearTimer() this.clearTimer()
} }
...@@ -89,13 +100,8 @@ export default { ...@@ -89,13 +100,8 @@ export default {
} }
}, },
mounted() { mounted() {
if (this.payment === '2') { if (this.payment === '3') return
// 微信支付 this.createOrder().then(this.setTimer)
this.createWxPayOrder(this.productId, this.num).then(this.setTimer)
} else if (this.payment === '1') {
// 支付宝支付
this.createAliPayOrder(this.productId, this.num).then(this.setTimer)
}
}, },
destroyed() { destroyed() {
this.clearTimer() this.clearTimer()
......
src/mixins/pay.js
浏览文件 @ 95597e3d
...@@ -36,17 +36,23 @@ export default { ...@@ -36,17 +36,23 @@ export default {
}, },
methods: { methods: {
// 创建微信订单 // 创建微信订单
createWxPayOrder(productId, num = 1) { createWxPayOrder(product, num = 1) {
const notifyUrl = `${location.origin}/api/ehall/v2/lobby/update-status-api/${this.pid}/sofia` const params = {
return api open_id: this.openId,
.createWxpayOrder('ezijing', productId, { num, type: 7, openid: this.openId, notify_url: notifyUrl }) buy_count: num + '',
.then(order => { payment_method: '3',
const redirectURI = `${location.href}&order_no=${order.order_no}` shop_id: product.shop_id,
// 去支付 spu_id: product.spu_id,
window.location.href = `https://web-pay.ezijing.com/wxpay/h5?prepay_id=${order.prepay_id}&open_id=${ sku_id: product.sku_id,
this.openId redirect_url: `${location.origin}/api/ehall/v2/lobby/update-status-api/${this.pid}/sofia`
}&redirect_uri=${encodeURIComponent(redirectURI)}` }
}) return api.createOrder(params).then(order => {
const redirectURI = `${location.href}&order_no=${order.order_id}`
// 去支付
window.location.href = `https://web-pay.ezijing.com/wxpay/h5?prepay_id=${order.pay_order_id}&open_id=${this.openId}&redirect_uri=${encodeURIComponent(
redirectURI
)}`
})
}, },
// 获取微信code // 获取微信code
getCode() { getCode() {
...@@ -70,9 +76,14 @@ export default { ...@@ -70,9 +76,14 @@ export default {
}) })
}, },
getOrder() { getOrder() {
return api.getOrder(this.orderNo).then(response => { const params = {
const { order } = response shop_id: this.product.shop_id,
if (order.status === 1) { spu_id: this.product.spu_id,
order_id: this.orderNo
}
return api.getOrderList(params).then(response => {
const [order = {}] = response.data
if (order.order_status === '4') {
// 支付成功 // 支付成功
this.handlePaySuccess() this.handlePaySuccess()
} }
...@@ -80,11 +91,11 @@ export default { ...@@ -80,11 +91,11 @@ export default {
}) })
}, },
// 微信JSAPI支付 // 微信JSAPI支付
handleWxJSAPIPay(productId, num) { handleWxJSAPIPay(product, num) {
this.openId this.openId
? this.createWxPayOrder(productId, num) ? this.createWxPayOrder(product, num)
: this.getOpenId(() => { : this.getOpenId(() => {
this.createWxPayOrder(productId, num) this.createWxPayOrder(product, num)
}) })
} }
} }
......
src/views/report/PaperEdit.vue
浏览文件 @ 95597e3d
...@@ -3,16 +3,14 @@ ...@@ -3,16 +3,14 @@
<v-form ref="form" :model="ruleForm" :fields="fields" @submit="onSubmit"></v-form> <v-form ref="form" :model="ruleForm" :fields="fields" @submit="onSubmit"></v-form>
<div class="fixed-box"> <div class="fixed-box">
<div class="fixed-inner"> <div class="fixed-inner">
<van-button class="fixed-button" :loading="submitLoading" @click="handleSubmit" v-if="!isPaid" <van-button class="fixed-button" :loading="submitLoading" @click="handleSubmit" v-if="!isPaid">去支付</van-button>
>去支付</van-button
>
<van-button class="fixed-button" :loading="submitLoading" @click="handleSubmit" v-else>保存并提交</van-button> <van-button class="fixed-button" :loading="submitLoading" @click="handleSubmit" v-else>保存并提交</van-button>
<van-button class="fixed-button" @click="onRemove" v-if="hasAbort">撤回申请</van-button> <van-button class="fixed-button" @click="onRemove" v-if="hasAbort">撤回申请</van-button>
</div> </div>
</div> </div>
<van-dialog v-model="payVisible" title="支付" :showConfirmButton="false" :closeOnClickOverlay="true"> <van-dialog v-model="payVisible" title="支付" :showConfirmButton="false" :closeOnClickOverlay="true">
<van-icon name="close" class="dialog-close" @click="payVisible = false" /> <van-icon name="close" class="dialog-close" @click="payVisible = false" />
<pay :payment="ruleForm.payment" :productId="productId" @success="handlePaySuccess" v-if="payVisible"></pay> <pay :payment="ruleForm.payment" :product="product" @success="handlePaySuccess" v-if="payVisible"></pay>
</van-dialog> </van-dialog>
</div> </div>
</template> </template>
...@@ -40,9 +38,9 @@ export default { ...@@ -40,9 +38,9 @@ export default {
payment: '2' payment: '2'
}, },
productList: [ productList: [
{ label: '1份—￥127元', value: '1', product_id: '6747325185390542848' }, { label: '1份—￥127元', value: '1', shop_id: '6816247184455892992', spu_id: '6869466274636759040', sku_id: '6869466274674507776' },
{ label: '2份—￥203元', value: '2', product_id: '6747325279879823360' }, { label: '2份—￥203元', value: '2', shop_id: '6816247184455892992', spu_id: '6869466274636759040', sku_id: '6869466274737422336' },
{ label: '3份—￥278元', value: '3', product_id: '6747325351686307840' } { label: '3份—￥278元', value: '3', shop_id: '6816247184455892992', spu_id: '6869466274636759040', sku_id: '6869466274800336896' }
], ],
payVisible: false payVisible: false
} }
...@@ -111,9 +109,8 @@ export default { ...@@ -111,9 +109,8 @@ export default {
} }
] ]
}, },
productId() { product() {
const found = this.productList.find(item => item.value === this.ruleForm.number) return this.productList.find(item => item.value === this.ruleForm.number)
return found ? found.product_id : ''
} }
}, },
methods: { methods: {
...@@ -137,7 +134,7 @@ export default { ...@@ -137,7 +134,7 @@ export default {
await this.getDetail() await this.getDetail()
} }
if (this.isWechat && this.ruleForm.payment === '2') { if (this.isWechat && this.ruleForm.payment === '2') {
this.handleWxJSAPIPay(this.productId) this.handleWxJSAPIPay(this.product)
} else { } else {
this.payVisible = true this.payVisible = true
} }
......
src/views/retake/Edit.vue
浏览文件 @ 95597e3d
...@@ -10,13 +10,7 @@ ...@@ -10,13 +10,7 @@
</div> </div>
<van-dialog v-model="payVisible" title="支付" :showConfirmButton="false" :closeOnClickOverlay="true"> <van-dialog v-model="payVisible" title="支付" :showConfirmButton="false" :closeOnClickOverlay="true">
<van-icon name="close" class="dialog-close" @click="payVisible = false" /> <van-icon name="close" class="dialog-close" @click="payVisible = false" />
<pay <pay :payment="ruleForm.payment" :product="product" :num="detail.form.credit" @success="handlePaySuccess" v-if="payVisible"></pay>
:payment="ruleForm.payment"
:productId="productId"
:num="detail.form.credit"
@success="handlePaySuccess"
v-if="payVisible"
></pay>
</van-dialog> </van-dialog>
</div> </div>
</template> </template>
...@@ -43,7 +37,7 @@ export default { ...@@ -43,7 +37,7 @@ export default {
}, },
courseList: [], // 课程列表 courseList: [], // 课程列表
submitedCourseList: [], // 提交的课程列表 submitedCourseList: [], // 提交的课程列表
productId: '6745273257873637376', // 商品ID product: { shop_id: '6816247184455892992', spu_id: '6869463821962969088', sku_id: '6869463822004912128' }, // 商品
payVisible: false payVisible: false
} }
}, },
...@@ -129,14 +123,7 @@ export default { ...@@ -129,14 +123,7 @@ export default {
}) })
} }
// 设置表单数据 // 设置表单数据
const ruleForm = this.$_.pick(response.form, [ const ruleForm = this.$_.pick(response.form, ['personal_name', 'class_name', 'sofia_id', 'semester_name', 'course_id', 'payment'])
'personal_name',
'class_name',
'sofia_id',
'semester_name',
'course_id',
'payment'
])
Object.assign(this.ruleForm, ruleForm) Object.assign(this.ruleForm, ruleForm)
// 设置接口返回的数据 // 设置接口返回的数据
this.detail = response this.detail = response
...@@ -160,7 +147,7 @@ export default { ...@@ -160,7 +147,7 @@ export default {
}) })
this.handleUpdate(params, () => { this.handleUpdate(params, () => {
if (this.isWechat && this.ruleForm.payment === '2') { if (this.isWechat && this.ruleForm.payment === '2') {
this.handleWxJSAPIPay(this.productId, this.detail.form.credit) this.handleWxJSAPIPay(this.product, this.detail.form.credit)
} else { } else {
this.payVisible = true this.payVisible = true
} }
......
vue.config.js
浏览文件 @ 95597e3d
...@@ -10,7 +10,7 @@ module.exports = { ...@@ -10,7 +10,7 @@ module.exports = {
}, },
proxy: { proxy: {
'/api': { '/api': {
target: 'https://ehall2.ezijing.com' target: 'https://learn-api2.ezijing.com'
} }
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论