Commit d830e34cc8dce9fd9722e2499eb85d9527eb0d85
Merge branch 'dev' into 'test'
Dev See merge request !744
Showing
3 changed files
with
5 additions
and
5 deletions
app.json
| ... | ... | @@ -75,10 +75,8 @@ |
| 75 | 75 | "pages/user/assistance/friend_assistance", |
| 76 | 76 | "pages/user/assistance/assistance_success", |
| 77 | 77 | "pages/user/assistance/assistance", |
| 78 | - "pages/video/index", | |
| 79 | 78 | "pages/template/index", |
| 80 | 79 | "pages/store/index", |
| 81 | - "pages/user/choice_guide/choice_guide", | |
| 82 | 80 | "pages/cart/cart2_inte/cart2_inte", |
| 83 | 81 | "pages/giftpack/festival/festival", |
| 84 | 82 | "pages/team/team_more/team_more", |
| ... | ... | @@ -153,7 +151,9 @@ |
| 153 | 151 | "pages/luckactivity/index/index", |
| 154 | 152 | "pages/user/Change_phone/Change_phone", |
| 155 | 153 | "pages/zuhegou/index/index", |
| 156 | - "pages/user/binding_info/binding_info" | |
| 154 | + "pages/user/binding_info/binding_info", | |
| 155 | + "pages/user/choice_guide/choice_guide", | |
| 156 | + "pages/video/index" | |
| 157 | 157 | ] |
| 158 | 158 | |
| 159 | 159 | } | ... | ... |
packageA/pages/profile/profile.js
| ... | ... | @@ -827,7 +827,7 @@ Page({ |
| 827 | 827 | //-- 跳转到获取导购的列表 -- |
| 828 | 828 | go_get_guide:function () { |
| 829 | 829 | this.check_click_ok(function(){ |
| 830 | - getApp().goto("/pages/user/choice_guide/choice_guide"); | |
| 830 | + getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); | |
| 831 | 831 | },1) |
| 832 | 832 | }, |
| 833 | 833 | ... | ... |
pages/user/userinfo/userinfo.js
| ... | ... | @@ -896,7 +896,7 @@ Page({ |
| 896 | 896 | //-- 跳转到获取导购的列表 -- |
| 897 | 897 | go_get_guide:function () { |
| 898 | 898 | this.check_click_ok(function(){ |
| 899 | - getApp().goto("/pages/user/choice_guide/choice_guide"); | |
| 899 | + getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); | |
| 900 | 900 | },1) |
| 901 | 901 | }, |
| 902 | 902 | ... | ... |