Commit 493fc7f84db22212863fa62d06fea5d3b51b16b0
Merge branch 'qa' into 'master'
Qa See merge request !322
Showing
1 changed file
with
25 additions
and
31 deletions
app.json
| @@ -31,6 +31,7 @@ | @@ -31,6 +31,7 @@ | ||
| 31 | "pages/activity/seckill_list/seckill_list", | 31 | "pages/activity/seckill_list/seckill_list", |
| 32 | "pages/activity/pind_list/pind_list", | 32 | "pages/activity/pind_list/pind_list", |
| 33 | "pages/togoin/togoin", | 33 | "pages/togoin/togoin", |
| 34 | + "pages/getphone/getphone", | ||
| 34 | "pages/team/team_success/team_success", | 35 | "pages/team/team_success/team_success", |
| 35 | "pages/team/team_show/team_show", | 36 | "pages/team/team_show/team_show", |
| 36 | "pages/team/team_ping/team_ping", | 37 | "pages/team/team_ping/team_ping", |
| @@ -58,40 +59,33 @@ | @@ -58,40 +59,33 @@ | ||
| 58 | "pages/user/plus/plus", | 59 | "pages/user/plus/plus", |
| 59 | "pages/user/cardinfo/cardinfo", | 60 | "pages/user/cardinfo/cardinfo", |
| 60 | "pages/user/Detailed/Detailed", | 61 | "pages/user/Detailed/Detailed", |
| 61 | - "pages/user/Change_phone/Change_phone" | 62 | + "pages/user/Change_phone/Change_phone", |
| 63 | + "pages/user/my_service/appment_main", | ||
| 64 | + "pages/user/my_service/i_service", | ||
| 65 | + "pages/user/my_service/cosmetology_list", | ||
| 66 | + "pages/user/my_service/hist_service", | ||
| 67 | + "pages/user/my_service/tment_details", | ||
| 68 | + "pages/user/my_service/tment_eval", | ||
| 69 | + "pages/user/my_service/tment_order_list", | ||
| 70 | + "pages/user/my_service/beauty_deta", | ||
| 71 | + "pages/user/labels/labels", | ||
| 72 | + "pages/user/view_comment/view_comment", | ||
| 73 | + "pages/giftpack/birthdaygift/birthdaygift", | ||
| 74 | + "pages/user/comment/comment", | ||
| 75 | + "pages/giftpack/evaluategift/evaluategift", | ||
| 76 | + "pages/giftpack/newvipgift/newvipgift", | ||
| 77 | + "pages/giftpack/payment/payment", | ||
| 78 | + "pages/giftpack/buygiftpack/giftpackbuy", | ||
| 79 | + "pages/giftpack/giftpacklist/giftpacklist", | ||
| 80 | + "pages/giftpack/mygiftpack/mygiftpack", | ||
| 81 | + "pages/user/assistance/giftpacklist", | ||
| 82 | + "pages/user/assistance/task_assistance", | ||
| 83 | + "pages/user/assistance/friend_assistance", | ||
| 84 | + "pages/user/assistance/assistance_success", | ||
| 85 | + "pages/user/assistance/assistance" | ||
| 62 | 86 | ||
| 63 | 87 | ||
| 64 | ], | 88 | ], |
| 65 | - "SubPackages":[ | ||
| 66 | - { | ||
| 67 | - "root":"packageA", | ||
| 68 | - "pages":[ | ||
| 69 | - "pages/user/my_service/appment_main", | ||
| 70 | - "pages/user/my_service/i_service", | ||
| 71 | - "pages/user/my_service/cosmetology_list", | ||
| 72 | - "pages/user/my_service/hist_service", | ||
| 73 | - "pages/user/my_service/tment_details", | ||
| 74 | - "pages/user/my_service/tment_eval", | ||
| 75 | - "pages/user/my_service/tment_order_list", | ||
| 76 | - "pages/user/my_service/beauty_deta", | ||
| 77 | - "pages/user/labels/labels", | ||
| 78 | - "pages/user/view_comment/view_comment", | ||
| 79 | - "pages/giftpack/birthdaygift/birthdaygift", | ||
| 80 | - "pages/user/comment/comment", | ||
| 81 | - "pages/giftpack/evaluategift/evaluategift", | ||
| 82 | - "pages/giftpack/newvipgift/newvipgift", | ||
| 83 | - "pages/giftpack/payment/payment", | ||
| 84 | - "pages/giftpack/buygiftpack/giftpackbuy", | ||
| 85 | - "pages/giftpack/giftpacklist/giftpacklist", | ||
| 86 | - "pages/giftpack/mygiftpack/mygiftpack", | ||
| 87 | - "pages/user/assistance/giftpacklist", | ||
| 88 | - "pages/user/assistance/task_assistance", | ||
| 89 | - "pages/user/assistance/friend_assistance", | ||
| 90 | - "pages/user/assistance/assistance_success", | ||
| 91 | - "pages/user/assistance/assistance" | ||
| 92 | - ] | ||
| 93 | - } | ||
| 94 | - ], | ||
| 95 | "permission": { | 89 | "permission": { |
| 96 | "scope.userLocation": { | 90 | "scope.userLocation": { |
| 97 | "desc": "获取你的位置信息" | 91 | "desc": "获取你的位置信息" |