Skip to content

P
project-online-old
提交 4662c461 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

chore: update

上级 44a5c5a8
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 121 行增加 和 75 行删除
build/dev.ezijing.com.key
浏览文件 @ 4662c461
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
\ No newline at end of file
build/dev.ezijing.com.pem
浏览文件 @ 4662c461
差异被折叠。
package-lock.json
浏览文件 @ 4662c461
......@@ -1445,6 +1445,12 @@
"integrity": "sha1-M2utwb7sudrMOL6izzKt9ieoQho=",
"dev": true
},
"node_modules/@types/estree": {
"version": "0.0.38",
"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.38.tgz",
"integrity": "sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA==",
"peer": true
},
"node_modules/@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npm.taobao.org/@types/glob/download/@types/glob-7.1.3.tgz?cache=0&sync_timestamp=1596838206290&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fglob%2Fdownload%2F%40types%2Fglob-7.1.3.tgz",
......@@ -1481,8 +1487,7 @@
"node_modules/@types/node": {
"version": "14.11.8",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-14.11.8.tgz?cache=0&sync_timestamp=1602226622617&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.11.8.tgz",
"integrity": "sha1-/iAS8jVeTOCLykSus6u7Ic+I0z8=",
"dev": true
"integrity": "sha1-/iAS8jVeTOCLykSus6u7Ic+I0z8="
},
"node_modules/@types/source-list-map": {
"version": "0.1.2",
......@@ -9494,6 +9499,13 @@
"integrity": "sha1-SLTOmDFksgnC1FoQetsx9HOm56c=",
"dev": true
},
"node_modules/popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmmirror.com/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
"deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
"peer": true
},
"node_modules/portfinder": {
"version": "1.0.28",
"resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.28.tgz?cache=0&sync_timestamp=1596018172434&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fportfinder%2Fdownload%2Fportfinder-1.0.28.tgz",
......@@ -10560,6 +10572,19 @@
"inherits": "^2.0.1"
}
},
"node_modules/rollup": {
"version": "0.58.2",
"resolved": "https://registry.npmmirror.com/rollup/-/rollup-0.58.2.tgz",
"integrity": "sha512-RZVvCWm9BHOYloaE6LLiE/ibpjv1CmI8F8k0B0Cp+q1eezo3cswszJH1DN0djgzSlo0hjuuCmyeI+1XOYLl4wg==",
"peer": true,
"dependencies": {
"@types/estree": "0.0.38",
"@types/node": "*"
},
"bin": {
"rollup": "bin/rollup"
}
},
"node_modules/rollup-plugin-buble": {
"version": "0.15.0",
"resolved": "https://registry.npm.taobao.org/rollup-plugin-buble/download/rollup-plugin-buble-0.15.0.tgz",
......@@ -15055,6 +15080,12 @@
"integrity": "sha1-M2utwb7sudrMOL6izzKt9ieoQho=",
"dev": true
},
"@types/estree": {
"version": "0.0.38",
"resolved": "https://registry.npmmirror.com/@types/estree/-/estree-0.0.38.tgz",
"integrity": "sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA==",
"peer": true
},
"@types/glob": {
"version": "7.1.3",
"resolved": "https://registry.npm.taobao.org/@types/glob/download/@types/glob-7.1.3.tgz?cache=0&sync_timestamp=1596838206290&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fglob%2Fdownload%2F%40types%2Fglob-7.1.3.tgz",
......@@ -15091,8 +15122,7 @@
"@types/node": {
"version": "14.11.8",
"resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-14.11.8.tgz?cache=0&sync_timestamp=1602226622617&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.11.8.tgz",
"integrity": "sha1-/iAS8jVeTOCLykSus6u7Ic+I0z8=",
"dev": true
"integrity": "sha1-/iAS8jVeTOCLykSus6u7Ic+I0z8="
},
"@types/source-list-map": {
"version": "0.1.2",
......@@ -21575,6 +21605,12 @@
"integrity": "sha1-SLTOmDFksgnC1FoQetsx9HOm56c=",
"dev": true
},
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npmmirror.com/popper.js/-/popper.js-1.16.1.tgz",
"integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
"peer": true
},
"portfinder": {
"version": "1.0.28",
"resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.28.tgz?cache=0&sync_timestamp=1596018172434&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fportfinder%2Fdownload%2Fportfinder-1.0.28.tgz",
......@@ -22456,6 +22492,16 @@
"inherits": "^2.0.1"
}
},
"rollup": {
"version": "0.58.2",
"resolved": "https://registry.npmmirror.com/rollup/-/rollup-0.58.2.tgz",
"integrity": "sha512-RZVvCWm9BHOYloaE6LLiE/ibpjv1CmI8F8k0B0Cp+q1eezo3cswszJH1DN0djgzSlo0hjuuCmyeI+1XOYLl4wg==",
"peer": true,
"requires": {
"@types/estree": "0.0.38",
"@types/node": "*"
}
},
"rollup-plugin-buble": {
"version": "0.15.0",
"resolved": "https://registry.npm.taobao.org/rollup-plugin-buble/download/rollup-plugin-buble-0.15.0.tgz",
......
src/pages/train/components/payPop.vue
浏览文件 @ 4662c461
......@@ -87,7 +87,7 @@ export default {
this.isCodeShow = true
clearInterval(this.time)
this.time = setInterval(() => {
this.checkPay(res.data.order_no)
this.checkPay(res.data.pay_order_id, res.data.order_no)
}, 2000)
loading.close()
} else {
......@@ -97,18 +97,19 @@ export default {
// isCodeShow = true
})
},
checkPay(id) {
checkPay(id, order_no) {
action.articleAction.checkPay(id).then(res => {
if (res.code === 0) {
if (res.order.status === 1) {
const [order = {}] = res.data
if (order.status === 1) {
this.$message({
message: '支付成功',
type: 'success'
})
this.payEnd(res.order.order_no)
this.payEnd(order_no)
this.$emit('payStatus')
clearInterval(this.time)
} else if (res.order.status !== 0) {
} else if (order.status !== 0) {
clearInterval(this.time)
}
}
......@@ -125,8 +126,7 @@ export default {
order_no: orderOn,
form_id: this.formData.id.toString()
}
action.articleAction.payEnd(param).then(res => {
})
action.articleAction.payEnd(param).then(res => {})
}
},
beforeDestroy() {
......@@ -135,27 +135,27 @@ export default {
}
</script>
<style lang="scss" scoped>
.pay-pop-box{
.pay-pop-box {
width: 100%;
height: 100%;
.content-box{
&.ewm-code{
.content-box {
&.ewm-code {
padding: 21px 21px 88px;
.title{
.title {
font-size: 18px;
color: #333333;
line-height: 25px;
}
.ewm-box{
.ewm-box {
width: 220px;
margin: 43px auto 0;
text-align: center;
.block{
.block {
height: 200px;
padding: 10px;
border: 1px solid #D0D0D0;
border: 1px solid #d0d0d0;
}
.text{
.text {
font-size: 16px;
color: #999999;
line-height: 22px;
......@@ -171,9 +171,9 @@ export default {
-webkit-transform: translate(-50%, -50%);
width: 735px;
height: 426px;
background: #FFFFFF;
background: #ffffff;
border-radius: 2px;
.el-icon-close{
.el-icon-close {
color: #999999;
position: absolute;
top: 17px;
......@@ -181,81 +181,81 @@ export default {
font-size: 24px;
cursor: pointer;
}
.tips-cen{
.tips-cen {
display: flex;
align-items: center;
&.mar-t-20{
&.mar-t-20 {
margin-top: 20px;
}
.name{
.name {
font-size: 16px;
color: #333333;
margin-right: 10px;
}
.js{
.js {
width: 495px;
font-size: 16px;
color: #333333;
line-height: 22px;
}
.money{
.money {
color: rgba(192, 21, 64, 1);
font-size: 34px;
span{
span {
color: rgba(51, 51, 51, 1);
font-size: 20px;
}
}
}
.tips-top{
.tips-top {
display: flex;
margin-top: 15px;
.name{
.name {
font-size: 16px;
color: #333333;
line-height: 22px;
margin-right: 10px;
}
.pay-method{
.li{
.pay-method {
.li {
cursor: pointer;
.select-icon{
.select-icon {
width: 16px;
height: 16px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/0157a86b05bd8eff993c4b82433acc90.png);
background-size: 100% 100%;
margin-right: 13px;
}
&.active{
.select-icon{
&.active {
.select-icon {
background: url(https://zws-imgs-pub.ezijing.com/static/public/04aad91c8b16f98505ee11f13c13464d.png);
background-size: 100% 100%;
}
}
&:nth-child(1){
.icon{
&:nth-child(1) {
.icon {
width: 25px;
height: 25px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/189526ea395b7a1a3b47ffea73d25b95.png);
background-size: 100% 100%;
}
&.active{
.icon{
&.active {
.icon {
background: url(https://zws-imgs-pub.ezijing.com/static/public/189526ea395b7a1a3b47ffea73d25b95.png);
background-size: 100% 100%;
}
}
}
&:nth-child(2){
&:nth-child(2) {
margin-top: 15px;
.icon{
.icon {
width: 26px;
height: 23px;
background: url(https://zws-imgs-pub.ezijing.com/static/public/e7db788a3194460535d6543cc358a5f5.png);
background-size: 100% 100%;
}
&.active{
.icon{
&.active {
.icon {
background: url(https://zws-imgs-pub.ezijing.com/static/public/e7db788a3194460535d6543cc358a5f5.png);
background-size: 100% 100%;
}
......@@ -263,10 +263,10 @@ export default {
}
display: flex;
align-items: center;
.icon{
.icon {
margin-right: 13px;
}
.text{
.text {
font-size: 16px;
color: #999999;
line-height: 22px;
......@@ -274,10 +274,10 @@ export default {
}
}
}
.pay-btn{
.pay-btn {
width: 120px;
height: 38px;
background: #C01540;
background: #c01540;
border-radius: 2px;
margin: 28px 0 0 91px;
color: #fff;
......@@ -285,9 +285,9 @@ export default {
line-height: 38px;
cursor: pointer;
}
.tips-text{
.tips-text {
font-size: 14px;
color: #BF1A09;
color: #bf1a09;
line-height: 20px;
margin-top: 15px;
}
......
src/pages/train/form.vue
浏览文件 @ 4662c461
......@@ -321,7 +321,7 @@ export default {
if (order.status === 1) {
this.isPayStatus = true
} else {
call()
call && call()
}
}
// isCodeShow = true
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论