Merged
Merge Request #746 · created by 后端研发-苏明海


Qa


From qa into master

Merged by 后端研发-苏明海

1 participants

app.json
@@ -75,10 +75,8 @@ @@ -75,10 +75,8 @@
75 "pages/user/assistance/friend_assistance", 75 "pages/user/assistance/friend_assistance",
76 "pages/user/assistance/assistance_success", 76 "pages/user/assistance/assistance_success",
77 "pages/user/assistance/assistance", 77 "pages/user/assistance/assistance",
78 - "pages/video/index",  
79 "pages/template/index", 78 "pages/template/index",
80 "pages/store/index", 79 "pages/store/index",
81 - "pages/user/choice_guide/choice_guide",  
82 "pages/cart/cart2_inte/cart2_inte", 80 "pages/cart/cart2_inte/cart2_inte",
83 "pages/giftpack/festival/festival", 81 "pages/giftpack/festival/festival",
84 "pages/team/team_more/team_more", 82 "pages/team/team_more/team_more",
@@ -153,7 +151,9 @@ @@ -153,7 +151,9 @@
153 "pages/luckactivity/index/index", 151 "pages/luckactivity/index/index",
154 "pages/user/Change_phone/Change_phone", 152 "pages/user/Change_phone/Change_phone",
155 "pages/zuhegou/index/index", 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,7 +827,7 @@ Page({
827 //-- 跳转到获取导购的列表 -- 827 //-- 跳转到获取导购的列表 --
828 go_get_guide:function () { 828 go_get_guide:function () {
829 this.check_click_ok(function(){ 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 },1) 831 },1)
832 }, 832 },
833 833
pages/user/userinfo/userinfo.js
@@ -896,7 +896,7 @@ Page({ @@ -896,7 +896,7 @@ Page({
896 //-- 跳转到获取导购的列表 -- 896 //-- 跳转到获取导购的列表 --
897 go_get_guide:function () { 897 go_get_guide:function () {
898 this.check_click_ok(function(){ 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 },1) 900 },1)
901 }, 901 },
902 902