移包1

WXD-SEASON\season
1 parent f60fec4c
Showing 13 changed files with 23 additions and 15 deletions
app.js
app.json
pages/giftpack/birthdaygift/birthdaygift.js
pages/giftpack/buygiftpack/giftpackbuy.js
pages/giftpack/evaluategift/evaluategift.js
pages/giftpack/festival/festival.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/mygiftpack/mygiftpack.js
pages/giftpack/newvipgift/newvipgift.js
pages/goods/goodsInfo/goodsInfo.js
pages/index/index/index.js
pages/user/assistance/task_assistance.wxml
pages/user/index/index.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
            })
@@ -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"
+              
           ]
       },
@@ -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(){ },
@@ -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(){ },
@@ -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(){ },
@@ -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(){ },
@@ -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(){ },
@@ -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(){ },
@@ -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(){ },
@@ -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 控制跳转到的页面不显示按钮
                                 };
@@ -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';
@@ -195,5 +195,5 @@
 <!-- 二维码显示页面 -->
 <canvas canvas-id='share_id' style='width:750rpx;height:1200rpx;background-color:white;' wx:if="{{!canvasHidden}}"></canvas>
-<include src="../../giftpack/public/buy_com.wxml"></include>
+<include src="../../../packageF/giftpack/public/buy_com.wxml"></include>
@@ -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({