wxd / MShopWeApp

Commit 1a126a825ab9e4f08fa86d9bfbd5f5edfbca8397

Authored by WXD-SEASON\season
1 parent f60fec4c

移包1

Inline Side-by-side
Showing 13 changed files with 23 additions and 15 deletions
... ... @@ -1637,7 +1637,7 @@ App({
1637 1637 if (res.data.code == 0) {
1638 1638 var actid = res.data.data.id; //活动id
1639 1639 var giftBagId = res.data.data.giftBagId; //礼包id
1640   - var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId;
  1640 + var new_nav = "/packageF/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId;
1641 1641 wx.redirectTo({
1642 1642 url:new_nav
1643 1643 })
... ...
app.json
  View file @1a126a8
... ... @@ -23,14 +23,14 @@
23 23 "pages/giftpack/buygiftpack/giftpackbuy",
24 24 "pages/giftpack/giftpacklist/giftpacklist",
25 25 "pages/giftpack/mygiftpack/mygiftpack",
26   -
  26 + "pages/giftpack/festival/festival",
27 27  
28 28 "pages/user/assistance/giftpacklist",
29 29 "pages/user/assistance/task_assistance",
30 30 "pages/user/assistance/friend_assistance",
31 31 "pages/user/assistance/assistance_success",
32 32 "pages/user/assistance/assistance",
33   - "pages/giftpack/festival/festival",
  33 +
34 34 "pages/distribution/distribution",
35 35 "pages/template/index"
36 36 ],
... ... @@ -223,7 +223,9 @@
223 223 "pages/giftpack/payment/payment",
224 224 "pages/giftpack/buygiftpack/giftpackbuy",
225 225 "pages/giftpack/giftpacklist/giftpacklist",
226   - "pages/giftpack/mygiftpack/mygiftpack"
  226 + "pages/giftpack/mygiftpack/mygiftpack",
  227 + "pages/giftpack/festival/festival"
  228 +
227 229 ]
228 230  
229 231 },
... ...
pages/giftpack/birthdaygift/birthdaygift.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/birthdaygift/birthdaygift');
  5 + getApp().goto('/packageF/pages/giftpack/birthdaygift/birthdaygift?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/buygiftpack/giftpackbuy');
  5 + getApp().goto('/packageF/pages/giftpack/buygiftpack/giftpackbuy?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/evaluategift/evaluategift.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/evaluategift/evaluategift');
  5 + getApp().goto('/packageF/pages/giftpack/evaluategift/evaluategift?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/festival/festival.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/festival/festival');
  5 + getApp().goto('/packageF/pages/giftpack/festival/festival?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/giftpacklist/giftpacklist.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/giftpacklist/giftpacklist');
  5 + getApp().goto('/packageF/pages/giftpack/giftpacklist/giftpacklist?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/mygiftpack/mygiftpack');
  5 + getApp().goto('/packageF/pages/giftpack/mygiftpack/mygiftpack?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/giftpack/newvipgift/newvipgift.js
  View file @1a126a8
... ... @@ -2,7 +2,7 @@ Page({
2 2 data: {},
3 3 onLoad: async function(options) {
4 4 getApp().globalData.ts_trans_data=options;
5   - getApp().goto('/packageF/pages/giftpack/newvipgift/newvipgift');
  5 + getApp().goto('/packageF/pages/giftpack/newvipgift/newvipgift?transfer=1');
6 6 },
7 7 //显示加载
8 8 onShow:function(){ },
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @1a126a8
... ... @@ -9139,7 +9139,7 @@ Page({
9139 9139 url = `/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo?isBuy=1&id=${id}&is_act=1`;
9140 9140  
9141 9141 } else if (flag == 1) { // flag =1 控制跳转到专享礼包
9142   - url = `/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
  9142 + url = `/packageF/pages/giftpack/giftpacklist/giftpacklist?lbId=${id}&flag=1`;
9143 9143 } else {
9144 9144 url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮
9145 9145 };
... ...
pages/index/index/index.js
  View file @1a126a8
... ... @@ -1433,7 +1433,7 @@ Page({
1433 1433 if (res.data.code == 0) {
1434 1434 var actid = res.data.data.id; //活动id
1435 1435 var giftBagId = res.data.data.gifBagId; //礼包id
1436   - var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
  1436 + var nav_url = "/packageF/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
1437 1437 var swiperimage = th.data.swiperimage;
1438 1438 var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif';
1439 1439  
... ...
pages/user/assistance/task_assistance.wxml
  View file @1a126a8
... ... @@ -195,5 +195,5 @@
195 195  
196 196 <!-- 二维码显示页面 -->
197 197 <canvas canvas-id='share_id' style='width:750rpx;height:1200rpx;background-color:white;' wx:if="{{!canvasHidden}}"></canvas>
198   -<include src="../../giftpack/public/buy_com.wxml"></include>
  198 +<include src="../../../packageF/giftpack/public/buy_com.wxml"></include>
199 199  
... ...
pages/user/index/index.js
  View file @1a126a8
... ... @@ -1139,7 +1139,13 @@ Page({
1139 1139  
1140 1140 let t_map={};
1141 1141 for (let i in d_list) {
1142   - let ite=d_list[i];
  1142 + let ite=d_list[i];
  1143 + //专享礼包、移包到F包
  1144 + if (ite.id==10)
  1145 + {
  1146 + d_list[i]["weappurl"]="/packageF/pages/giftpack/mygiftpack/mygiftpack";
  1147 + d_list[i]["new_weappurl"]="/packageF/pages/giftpack/mygiftpack/mygiftpack";
  1148 + }
1143 1149 t_map[ite.name]=ite.id+'';
1144 1150 }
1145 1151 this.setData({
... ...