Merge branch 'test' into 'qa'

Test See merge request !745

Merge branch 'test' into 'qa'
Test See merge request !745
后端研发-苏明海
2 parents be13d091 d830e34c
Showing 3 changed files with 5 additions and 5 deletions
app.json
packageA/pages/profile/profile.js
pages/user/userinfo/userinfo.js
@@ -75,10 +75,8 @@
     "pages/user/assistance/friend_assistance",
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance",
-    "pages/video/index",
     "pages/template/index",
     "pages/store/index",
-    "pages/user/choice_guide/choice_guide",
 		"pages/cart/cart2_inte/cart2_inte",
 		"pages/giftpack/festival/festival",
 		"pages/team/team_more/team_more",
@@ -153,7 +151,9 @@
       "pages/luckactivity/index/index",
       "pages/user/Change_phone/Change_phone",
       "pages/zuhegou/index/index",
-      "pages/user/binding_info/binding_info"
+      "pages/user/binding_info/binding_info",
+      "pages/user/choice_guide/choice_guide",
+      "pages/video/index"
     ]
 }
@@ -827,7 +827,7 @@ Page({
   //-- 跳转到获取导购的列表 --
   go_get_guide:function () {
 	  this.check_click_ok(function(){
-		   getApp().goto("/pages/user/choice_guide/choice_guide");
+		   getApp().goto("/packageB/pages/user/choice_guide/choice_guide");
 	  },1)	      
   },
@@ -896,7 +896,7 @@ Page({
   //-- 跳转到获取导购的列表 --
   go_get_guide:function () {
 	  this.check_click_ok(function(){
-		   getApp().goto("/pages/user/choice_guide/choice_guide");
+		   getApp().goto("/packageB/pages/user/choice_guide/choice_guide");
 	  },1)	      
   },