diff --git a/app.js b/app.js index 49908df..1dc6101 100644 --- a/app.js +++ b/app.js @@ -1637,7 +1637,7 @@ App({ if (res.data.code == 0) { var actid = res.data.data.id; //活动id var giftBagId = res.data.data.giftBagId; //礼包id - var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; + var new_nav = "/packageF/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId; wx.redirectTo({ url:new_nav }) diff --git a/app.json b/app.json index e8dfda5..8f7e0c7 100644 --- a/app.json +++ b/app.json @@ -23,14 +23,14 @@ "pages/giftpack/buygiftpack/giftpackbuy", "pages/giftpack/giftpacklist/giftpacklist", "pages/giftpack/mygiftpack/mygiftpack", - + "pages/giftpack/festival/festival", "pages/user/assistance/giftpacklist", "pages/user/assistance/task_assistance", "pages/user/assistance/friend_assistance", "pages/user/assistance/assistance_success", "pages/user/assistance/assistance", - "pages/giftpack/festival/festival", + "pages/distribution/distribution", "pages/template/index" ], @@ -223,7 +223,9 @@ "pages/giftpack/payment/payment", "pages/giftpack/buygiftpack/giftpackbuy", "pages/giftpack/giftpacklist/giftpacklist", - "pages/giftpack/mygiftpack/mygiftpack" + "pages/giftpack/mygiftpack/mygiftpack", + "pages/giftpack/festival/festival" + ] }, diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js index 14f7cb5..98e7225 100644 --- a/pages/giftpack/birthdaygift/birthdaygift.js +++ b/pages/giftpack/birthdaygift/birthdaygift.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/birthdaygift/birthdaygift'); + getApp().goto('/packageF/pages/giftpack/birthdaygift/birthdaygift?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index d1dc5a0..f0903ff 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/buygiftpack/giftpackbuy'); + getApp().goto('/packageF/pages/giftpack/buygiftpack/giftpackbuy?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js index 3b7d39f..c959ac2 100644 --- a/pages/giftpack/evaluategift/evaluategift.js +++ b/pages/giftpack/evaluategift/evaluategift.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/evaluategift/evaluategift'); + getApp().goto('/packageF/pages/giftpack/evaluategift/evaluategift?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/festival/festival.js b/pages/giftpack/festival/festival.js index 7d58e26..18706ab 100644 --- a/pages/giftpack/festival/festival.js +++ b/pages/giftpack/festival/festival.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/festival/festival'); + getApp().goto('/packageF/pages/giftpack/festival/festival?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 9c76296..ead0ea3 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/giftpacklist/giftpacklist'); + getApp().goto('/packageF/pages/giftpack/giftpacklist/giftpacklist?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js index 5bb14a5..3feebcf 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.js +++ b/pages/giftpack/mygiftpack/mygiftpack.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/mygiftpack/mygiftpack'); + getApp().goto('/packageF/pages/giftpack/mygiftpack/mygiftpack?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js index 1069faa..d97618e 100644 --- a/pages/giftpack/newvipgift/newvipgift.js +++ b/pages/giftpack/newvipgift/newvipgift.js @@ -2,7 +2,7 @@ Page({ data: {}, onLoad: async function(options) { getApp().globalData.ts_trans_data=options; - getApp().goto('/packageF/pages/giftpack/newvipgift/newvipgift'); + getApp().goto('/packageF/pages/giftpack/newvipgift/newvipgift?transfer=1'); }, //显示加载 onShow:function(){ }, diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 4ade134..71f6af4 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -9139,7 +9139,7 @@ Page({ url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`; } else if (flag == 1) { // flag =1 控制跳转到专享礼包 - url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`; + url = `/packageF/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`; } else { url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮 }; diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 494f3ef..cec28e8 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -1433,7 +1433,7 @@ Page({ if (res.data.code == 0) { var actid = res.data.data.id; //活动id var giftBagId = res.data.data.gifBagId; //礼包id - var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; + var nav_url = "/packageF/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId; var swiperimage = th.data.swiperimage; var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif'; diff --git a/pages/user/assistance/task_assistance.wxml b/pages/user/assistance/task_assistance.wxml index 8a1d3a8..50574ce 100644 --- a/pages/user/assistance/task_assistance.wxml +++ b/pages/user/assistance/task_assistance.wxml @@ -195,5 +195,5 @@ - + diff --git a/pages/user/index/index.js b/pages/user/index/index.js index baf980a..1c0be8d 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -1139,7 +1139,13 @@ Page({ let t_map={}; for (let i in d_list) { - let ite=d_list[i]; + let ite=d_list[i]; + //专享礼包、移包到F包 + if (ite.id==10) + { + d_list[i]["weappurl"]="/packageF/pages/giftpack/mygiftpack/mygiftpack"; + d_list[i]["new_weappurl"]="/packageF/pages/giftpack/mygiftpack/mygiftpack"; + } t_map[ite.name]=ite.id+''; } this.setData({