Commit c75ee4a63d619b254858eba369283e67e65fd740
解决冲突
Showing
1 changed file
with
4 additions
and
0 deletions
app.json
| @@ -54,7 +54,11 @@ | @@ -54,7 +54,11 @@ | ||
| 54 | "pages/payment/pay_success/pay_success", | 54 | "pages/payment/pay_success/pay_success", |
| 55 | "pages/user/plus/plus", | 55 | "pages/user/plus/plus", |
| 56 | "pages/user/cardinfo/cardinfo", | 56 | "pages/user/cardinfo/cardinfo", |
| 57 | +<<<<<<< HEAD | ||
| 57 | "pages/user/Detailed/Detailed", | 58 | "pages/user/Detailed/Detailed", |
| 59 | +======= | ||
| 60 | + "pages/user/Detailed/Detailed", | ||
| 61 | +>>>>>>> 875625f38c1972869416e1894a992442d54ae75a | ||
| 58 | "pages/user/my_service/appment_main", | 62 | "pages/user/my_service/appment_main", |
| 59 | "pages/user/my_service/i_service", | 63 | "pages/user/my_service/i_service", |
| 60 | "pages/user/my_service/cosmetology_list", | 64 | "pages/user/my_service/cosmetology_list", |