Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
Showing
2 changed files
with
37 additions
and
3 deletions
@@ -340,7 +340,7 @@ export default { | @@ -340,7 +340,7 @@ export default { | ||
340 | } | 340 | } |
341 | }), | 341 | }), |
342 | onCloseAction() { | 342 | onCloseAction() { |
343 | - // vm.onClose(orderResult.data.orderCode); | 343 | + vm.onClose(get(vm.publishresult, 'orderCode', '')); |
344 | } | 344 | } |
345 | }).show(); | 345 | }).show(); |
346 | }, | 346 | }, |
@@ -361,6 +361,18 @@ export default { | @@ -361,6 +361,18 @@ export default { | ||
361 | }).show(); | 361 | }).show(); |
362 | }, | 362 | }, |
363 | 363 | ||
364 | + onClose(orderCode) { | ||
365 | + if (orderCode) { | ||
366 | + this.$router.replace({ | ||
367 | + name: 'buyOrderDetail', | ||
368 | + params: { | ||
369 | + owner: 'buy', | ||
370 | + code: orderCode | ||
371 | + } | ||
372 | + }); | ||
373 | + } | ||
374 | + } | ||
375 | + | ||
364 | } | 376 | } |
365 | }; | 377 | }; |
366 | </script> | 378 | </script> |
@@ -619,4 +631,13 @@ export default { | @@ -619,4 +631,13 @@ export default { | ||
619 | padding: 0 40px 40px; | 631 | padding: 0 40px 40px; |
620 | background-color: white; | 632 | background-color: white; |
621 | } | 633 | } |
634 | + | ||
635 | + .cube-picker-panel { | ||
636 | + height: 273px; | ||
637 | + text-align: center; | ||
638 | + font-size: 14px; | ||
639 | + background: #fff; | ||
640 | + border-top-left-radius: 15px !important; | ||
641 | + border-top-right-radius: 15px !important; | ||
642 | + } | ||
622 | </style> | 643 | </style> |
@@ -183,7 +183,7 @@ export default { | @@ -183,7 +183,7 @@ export default { | ||
183 | 183 | ||
184 | }, | 184 | }, |
185 | payOrder() { | 185 | payOrder() { |
186 | - | 186 | + let vm = this; |
187 | this.$createOrderPayType({ | 187 | this.$createOrderPayType({ |
188 | price: get(this.computeTip, 'earnestMoney', 0), | 188 | price: get(this.computeTip, 'earnestMoney', 0), |
189 | desc: '保证金', | 189 | desc: '保证金', |
@@ -204,7 +204,7 @@ export default { | @@ -204,7 +204,7 @@ export default { | ||
204 | } | 204 | } |
205 | }), | 205 | }), |
206 | onCloseAction() { | 206 | onCloseAction() { |
207 | - // vm.onClose(orderResult.data.orderCode); | 207 | + vm.onClose(get(this.publishinfo, 'orderCode', '')); |
208 | } | 208 | } |
209 | }).show(); | 209 | }).show(); |
210 | }, | 210 | }, |
@@ -216,6 +216,19 @@ export default { | @@ -216,6 +216,19 @@ export default { | ||
216 | type: 'txt', | 216 | type: 'txt', |
217 | txt: this.toastMessage | 217 | txt: this.toastMessage |
218 | }).show(); | 218 | }).show(); |
219 | + }, | ||
220 | + | ||
221 | + onClose(orderCode) { | ||
222 | + if (orderCode) { | ||
223 | + this.$router.replace({ | ||
224 | + name: 'sellOrderDetail', | ||
225 | + params: { | ||
226 | + owner: 'sell', | ||
227 | + code: orderCode | ||
228 | + } | ||
229 | + }); | ||
230 | + } | ||
231 | + | ||
219 | } | 232 | } |
220 | } | 233 | } |
221 | 234 |
-
Please register or login to post a comment