Commit 27b820205375bd9a46d095437f4af3760e73d7ad
1 parent
105f1a27
微调支付收银界面,缺少 success 参数
Showing
2 changed files
with
4 additions
and
22 deletions
yudao-ui-admin/src/views/pay/cashier/index.vue
| @@ -238,7 +238,7 @@ export default { | @@ -238,7 +238,7 @@ export default { | ||
| 238 | if (data.status === PayOrderStatusEnum.SUCCESS.status) { | 238 | if (data.status === PayOrderStatusEnum.SUCCESS.status) { |
| 239 | this.clearQueryInterval(); | 239 | this.clearQueryInterval(); |
| 240 | this.$message.success('支付成功!'); | 240 | this.$message.success('支付成功!'); |
| 241 | - this.goReturnUrl(); | 241 | + this.goReturnUrl('success'); |
| 242 | return | 242 | return |
| 243 | } | 243 | } |
| 244 | 244 | ||
| @@ -321,13 +321,13 @@ export default { | @@ -321,13 +321,13 @@ export default { | ||
| 321 | if (response.data.status === PayOrderStatusEnum.SUCCESS.status) { | 321 | if (response.data.status === PayOrderStatusEnum.SUCCESS.status) { |
| 322 | this.clearQueryInterval(); | 322 | this.clearQueryInterval(); |
| 323 | this.$message.success('支付成功!'); | 323 | this.$message.success('支付成功!'); |
| 324 | - this.goReturnUrl(); | 324 | + this.goReturnUrl('success'); |
| 325 | } | 325 | } |
| 326 | // 已取消 | 326 | // 已取消 |
| 327 | if (response.data.status === PayOrderStatusEnum.CLOSED.status) { | 327 | if (response.data.status === PayOrderStatusEnum.CLOSED.status) { |
| 328 | this.clearQueryInterval(); | 328 | this.clearQueryInterval(); |
| 329 | this.$message.error('支付已关闭!'); | 329 | this.$message.error('支付已关闭!'); |
| 330 | - this.goReturnUrl(); | 330 | + this.goReturnUrl('close'); |
| 331 | } | 331 | } |
| 332 | }) | 332 | }) |
| 333 | }, 1000 * 2) | 333 | }, 1000 * 2) |
yudao-ui-admin/src/views/pay/order/index.vue
| @@ -302,25 +302,7 @@ export default { | @@ -302,25 +302,7 @@ export default { | ||
| 302 | font-weight: bold; | 302 | font-weight: bold; |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | -.tag-purple { | ||
| 306 | - color: #722ed1; | ||
| 307 | - background: #f9f0ff; | ||
| 308 | - border-color: #d3adf7; | ||
| 309 | -} | ||
| 310 | - | ||
| 311 | -.tag-cyan { | ||
| 312 | - color: #13c2c2; | ||
| 313 | - background: #e6fffb; | ||
| 314 | - border-color: #87e8de; | ||
| 315 | -} | ||
| 316 | - | ||
| 317 | -.tag-pink { | ||
| 318 | - color: #eb2f96; | ||
| 319 | - background: #fff0f6; | ||
| 320 | - border-color: #ffadd2; | ||
| 321 | -} | ||
| 322 | - | ||
| 323 | -.order-font{ | 305 | +.order-font { |
| 324 | font-size: 12px; | 306 | font-size: 12px; |
| 325 | padding: 2px 0; | 307 | padding: 2px 0; |
| 326 | } | 308 | } |