diff --git a/app.json b/app.json index 900da75..deeb986 100644 --- a/app.json +++ b/app.json @@ -34,7 +34,7 @@ "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", - "pages/user/grow_value/grow_value", + "pages/payment/pay_success/pay_success", "pages/user/plus/plus", @@ -45,8 +45,7 @@ "pages/user/my_service/tment_details", "pages/user/my_service/tment_eval", "pages/user/my_service/tment_order_list", - "pages/user/my_service/beauty_deta", - "pages/user/labels/labels", + "pages/user/my_service/beauty_deta", "pages/giftpack/birthdaygift/birthdaygift", "pages/giftpack/evaluategift/evaluategift", "pages/giftpack/newvipgift/newvipgift", @@ -122,7 +121,7 @@ "pages/serviceCard_pd/team_success/team_success" ], - "plugins":{"live-player-plugin":{"version":"1.3.2","provider":"wx2b03c6e691cd7370"}} + "plugins":{"live-player-plugin":{"version":"1.3.5","provider":"wx2b03c6e691cd7370"}} }, { "root": "packageB/", @@ -213,7 +212,9 @@ "pages/user/cardinfo/cardinfo", "pages/user/nick_avatar/nick_avatar", "pages/user/slimming/slimming", - "pages/user/punchInhistory/punchInhistory" + "pages/user/punchInhistory/punchInhistory", + "pages/user/grow_value/grow_value", + "pages/user/labels/labels" ] } diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 147ab81..97a3374 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -149,7 +149,7 @@ - + 我的兴趣 @@ -161,7 +161,7 @@ - + + 标签 diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index f7460c2..58b8cd1 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -1282,7 +1282,7 @@ Page({ break; }; case 2: { - url = '/pages/user/grow_value/grow_value'; + url = '/packageE/pages/user/grow_value/grow_value'; break; }; case 3: { diff --git a/packageD/components/diy_login/login.wxml b/packageD/components/diy_login/login.wxml index 31de3dd..2f325d8 100644 --- a/packageD/components/diy_login/login.wxml +++ b/packageD/components/diy_login/login.wxml @@ -215,7 +215,7 @@ - + 我的兴趣 @@ -227,7 +227,7 @@ - + + 标签 diff --git a/pages/user/grow_value/filter.wxs b/packageE/pages/user/grow_value/filter.wxs index 00c2b32..00c2b32 100644 --- a/pages/user/grow_value/filter.wxs +++ b/packageE/pages/user/grow_value/filter.wxs diff --git a/pages/user/grow_value/grow_value.js b/packageE/pages/user/grow_value/grow_value.js index 9e6556a..887bb7b 100644 --- a/pages/user/grow_value/grow_value.js +++ b/packageE/pages/user/grow_value/grow_value.js @@ -1,6 +1,6 @@ var e = getApp(),os = e.globalData.setting; -var utils = require('../../../utils/util.js'); -var regeneratorRuntime = require('../../../utils/runtime.js'); +var utils = require('../../../../utils/util.js'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /*** 页面的初始数据*/ diff --git a/pages/user/grow_value/grow_value.json b/packageE/pages/user/grow_value/grow_value.json index 227558a..227558a 100644 --- a/pages/user/grow_value/grow_value.json +++ b/packageE/pages/user/grow_value/grow_value.json diff --git a/pages/user/grow_value/grow_value.wxml b/packageE/pages/user/grow_value/grow_value.wxml index 541c0bd..541c0bd 100644 --- a/pages/user/grow_value/grow_value.wxml +++ b/packageE/pages/user/grow_value/grow_value.wxml diff --git a/pages/user/grow_value/grow_value.wxss b/packageE/pages/user/grow_value/grow_value.wxss index d5ebb11..d5ebb11 100644 --- a/pages/user/grow_value/grow_value.wxss +++ b/packageE/pages/user/grow_value/grow_value.wxss diff --git a/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js index 5666231..5666231 100644 --- a/pages/user/labels/labels.js +++ b/packageE/pages/user/labels/labels.js diff --git a/pages/user/labels/labels.json b/packageE/pages/user/labels/labels.json index 12d96e4..12d96e4 100644 --- a/pages/user/labels/labels.json +++ b/packageE/pages/user/labels/labels.json diff --git a/pages/user/labels/labels.wxml b/packageE/pages/user/labels/labels.wxml index 6d46152..6d46152 100644 --- a/pages/user/labels/labels.wxml +++ b/packageE/pages/user/labels/labels.wxml diff --git a/pages/user/labels/labels.wxss b/packageE/pages/user/labels/labels.wxss index fcfa1c4..fcfa1c4 100644 --- a/pages/user/labels/labels.wxss +++ b/packageE/pages/user/labels/labels.wxss diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 10463d3..cb9194b 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -822,7 +822,7 @@ Page({ }, jump: function () { - getApp().goto("/pages/user/grow_value/grow_value") + getApp().goto("/packageE/pages/user/grow_value/grow_value") }, // 判断生日营销的页面是不是存在 birthday: function () { diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index cf1af24..163350c 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -246,7 +246,7 @@ - + 我的兴趣 @@ -258,7 +258,7 @@ - + + 标签 diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index f0f6af4..90bc7ca 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -218,7 +218,7 @@ Page({ }, go_cz:function(){ - getApp().goto("/pages/user/grow_value/grow_value") + getApp().goto("/packageE/pages/user/grow_value/grow_value") }, //获取卡类的gr_id