From 418f5145682b206881795885cb3a25b8f1733865 Mon Sep 17 00:00:00 2001 From: WXD-SEASON\season Date: Thu, 1 Sep 2022 16:37:18 +0800 Subject: [PATCH] 登陆页移到E包 --- app.js | 2 +- app.json | 12 ++++++++++-- components/diy_service/diy_service.js | 2 +- components/diy_store_select/diy_store_select.js | 2 +- packageA/pages/activity_share/activity_share.js | 10 +++++----- packageA/pages/checkin/checkin.js | 2 +- packageA/pages/chongzhiDetails/chongzhiDetails.js | 2 +- packageA/pages/goodsInfo/goodsInfo.js | 8 ++++---- packageA/pages/goods_share/goods_share.js | 6 +++--- packageA/pages/hongBao/hongBao.js | 2 +- packageA/pages/hongBaoDetails/hongBaoDetails.js | 2 +- packageA/pages/liveStreamDetails/liveStreamDetails.js | 2 +- packageA/pages/live_share/live_share.js | 2 +- packageA/pages/my_service2/appment_main.js | 2 +- packageA/pages/prom_list/prom_list.js | 2 +- packageA/pages/quan/quan.js | 4 ++-- packageA/pages/quan_list/quan_list.js | 2 +- packageA/pages/quan_pro/quan_pro.js | 2 +- packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js | 10 +++++----- packageA/pages/serviceCard_pd/team_show/team_show.js | 2 +- packageA/pages/serviceCard_pd/team_success/team_success.js | 2 +- packageA/pages/service_record/service_record.js | 2 +- packageA/pages/service_share/service_share.js | 4 ++-- packageB/pages/boxes-list/boxes-list.js | 2 +- packageB/pages/evaluate/evaluate.js | 2 +- packageB/pages/zuhegou/index/index.js | 14 +++++++------- packageB/pages/zuhegou/preindex/index.js | 14 +++++++------- packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js | 4 ++-- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 14 +++++++------- packageC/pages/presell/cart/cart.js | 2 +- packageC/pages/presell/goodsInfo/goodsInfo.js | 10 +++++----- packageC/pages/presell/list/list.js | 2 +- packageC/pages/presell/pregoodsInfo/goodsInfo.js | 8 ++++---- packageD/pages/AI-test-skin/index/aiskin.js | 4 ++-- packageD/pages/AI-test-skin/success_result/success_result.js | 4 ++-- packageD/pages/user/deposit/deposit.js | 2 +- packageD/pages/user/deposit/prepaid/prepaid.js | 2 +- packageD/pages/user/integral/integral.js | 2 +- packageD/pages/user/member/bring/bring.js | 2 +- packageD/pages/user/member/menber.js | 2 +- packageE/packageE/pages/togoin/togoin.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/packageE/pages/togoin/togoin.json | 3 +++ packageE/packageE/pages/togoin/togoin.wxml | 2 ++ packageE/packageE/pages/togoin/togoin.wxss | 1 + packageE/pages/togoin/togoin.js | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/togoin/togoin.json | 6 ++++++ packageE/pages/togoin/togoin.wxml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ packageE/pages/togoin/togoin.wxss | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pages/distribution/distribution.js | 4 ++-- pages/giftpack/birthdaygift/birthdaygift.js | 2 +- pages/giftpack/buygiftpack/giftpackbuy.js | 2 +- pages/giftpack/evaluategift/evaluategift.js | 2 +- pages/giftpack/festival/festival.js | 2 +- pages/giftpack/giftpacklist/giftpacklist.js | 6 +++--- pages/giftpack/mygiftpack/mygiftpack.js | 2 +- pages/giftpack/newvipgift/newvipgift.js | 2 +- pages/goods/goodsInfo/goodsInfo.js | 14 +++++++------- pages/index/index/index.js | 4 ++-- pages/team/team_show/team_show.js | 2 +- pages/team/team_success/team_success.js | 2 +- pages/togoin/togoin.js | 415 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pages/togoin/togoin.json | 6 ------ pages/togoin/togoin.wxml | 76 ---------------------------------------------------------------------------- pages/togoin/togoin.wxss | 77 ----------------------------------------------------------------------------- pages/user/assistance/assistance.js | 2 +- pages/user/assistance/friend_assistance.js | 4 ++-- pages/user/assistance/giftpacklist.js | 2 +- pages/user/assistance/task_assistance.js | 2 +- pages/user/cardinfo/cardinfo.js | 2 +- pages/user/index/index.js | 6 +++--- pages/user/my_service/tment_details.js | 2 +- pages/user/plus/plus.js | 4 ++-- project.config.json | 196 ++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ utils/auth.js | 4 ++-- utils/util.js | 2 +- 75 files changed, 797 insertions(+), 869 deletions(-) create mode 100644 packageE/packageE/pages/togoin/togoin.js create mode 100644 packageE/packageE/pages/togoin/togoin.json create mode 100644 packageE/packageE/pages/togoin/togoin.wxml create mode 100644 packageE/packageE/pages/togoin/togoin.wxss create mode 100644 packageE/pages/togoin/togoin.js create mode 100644 packageE/pages/togoin/togoin.json create mode 100644 packageE/pages/togoin/togoin.wxml create mode 100644 packageE/pages/togoin/togoin.wxss delete mode 100644 pages/togoin/togoin.js delete mode 100644 pages/togoin/togoin.json delete mode 100644 pages/togoin/togoin.wxml delete mode 100644 pages/togoin/togoin.wxss diff --git a/app.js b/app.js index 6bf2f79..672a0a1 100644 --- a/app.js +++ b/app.js @@ -820,7 +820,7 @@ App({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } else { diff --git a/app.json b/app.json index cf63bc6..7a0a7fb 100644 --- a/app.json +++ b/app.json @@ -24,8 +24,7 @@ "pages/user/express/express", "pages/user/get_user_info/get_user_info", "pages/activity/seckill_list/seckill_list", - "pages/activity/pind_list/pind_list", - "pages/togoin/togoin", + "pages/activity/pind_list/pind_list", "pages/team/team_success/team_success", "pages/team/team_show/team_show", "pages/team/team_ping/team_ping", @@ -205,9 +204,18 @@ "pages/shop/order_detail/order_detail", "pages/error/error" ] + }, + { + "root": "packageE/", + "name": "pack5", + "pages": [ + "packageE/pages/togoin/togoin" + ] } ], + + "permission": { "scope.userLocation": { "desc": "获取你的位置信息" diff --git a/components/diy_service/diy_service.js b/components/diy_service/diy_service.js index 7d42364..4103c99 100644 --- a/components/diy_service/diy_service.js +++ b/components/diy_service/diy_service.js @@ -32,7 +32,7 @@ Component({ //-- 跳到绑定注册会员 -- go_user:function(){ - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; }, diff --git a/components/diy_store_select/diy_store_select.js b/components/diy_store_select/diy_store_select.js index 822ec53..efc2641 100644 --- a/components/diy_store_select/diy_store_select.js +++ b/components/diy_store_select/diy_store_select.js @@ -105,7 +105,7 @@ Component({ var user_id=getApp().globalData.user_id; if(!user_id){ wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }); return false; } diff --git a/packageA/pages/activity_share/activity_share.js b/packageA/pages/activity_share/activity_share.js index 4e72101..f954081 100644 --- a/packageA/pages/activity_share/activity_share.js +++ b/packageA/pages/activity_share/activity_share.js @@ -676,7 +676,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 @@ -1088,7 +1088,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -1107,7 +1107,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } var index=e.currentTarget.dataset.index; @@ -1129,7 +1129,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -1147,7 +1147,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js index 4d70ce1..421c6cf 100644 --- a/packageA/pages/checkin/checkin.js +++ b/packageA/pages/checkin/checkin.js @@ -126,7 +126,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } else { diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.js b/packageA/pages/chongzhiDetails/chongzhiDetails.js index 7d780a2..9f3a239 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.js +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.js @@ -28,7 +28,7 @@ Page({ var UserInfo=app.globalData.userInfo; if(!UserInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 18531cf..b9d642a 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -1328,7 +1328,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -1870,7 +1870,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3702,7 +3702,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3739,7 +3739,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/packageA/pages/goods_share/goods_share.js b/packageA/pages/goods_share/goods_share.js index 5e7f82b..a16e3d8 100644 --- a/packageA/pages/goods_share/goods_share.js +++ b/packageA/pages/goods_share/goods_share.js @@ -115,7 +115,7 @@ Page({ }) if(!app.globalData.userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } @@ -371,7 +371,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 @@ -752,7 +752,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/hongBao/hongBao.js b/packageA/pages/hongBao/hongBao.js index 4d41682..4e4b317 100644 --- a/packageA/pages/hongBao/hongBao.js +++ b/packageA/pages/hongBao/hongBao.js @@ -54,7 +54,7 @@ Page({ let user_info = app.globalData.userInfo; if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) } else { resolve(); diff --git a/packageA/pages/hongBaoDetails/hongBaoDetails.js b/packageA/pages/hongBaoDetails/hongBaoDetails.js index 49c8b06..0f53c46 100644 --- a/packageA/pages/hongBaoDetails/hongBaoDetails.js +++ b/packageA/pages/hongBaoDetails/hongBaoDetails.js @@ -108,7 +108,7 @@ Page({ let user_info = app.globalData.userInfo; if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) } else { resolve(); diff --git a/packageA/pages/liveStreamDetails/liveStreamDetails.js b/packageA/pages/liveStreamDetails/liveStreamDetails.js index d808a22..8ac2e74 100644 --- a/packageA/pages/liveStreamDetails/liveStreamDetails.js +++ b/packageA/pages/liveStreamDetails/liveStreamDetails.js @@ -56,7 +56,7 @@ Page({ clickShare: function () { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ diff --git a/packageA/pages/live_share/live_share.js b/packageA/pages/live_share/live_share.js index 34f8619..a8dbc61 100644 --- a/packageA/pages/live_share/live_share.js +++ b/packageA/pages/live_share/live_share.js @@ -169,7 +169,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js index 06f63c9..277492a 100644 --- a/packageA/pages/my_service2/appment_main.js +++ b/packageA/pages/my_service2/appment_main.js @@ -548,7 +548,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js index 7a2ea79..0ba35d8 100644 --- a/packageA/pages/prom_list/prom_list.js +++ b/packageA/pages/prom_list/prom_list.js @@ -662,7 +662,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/quan/quan.js b/packageA/pages/quan/quan.js index 0855002..ac9e2f5 100644 --- a/packageA/pages/quan/quan.js +++ b/packageA/pages/quan/quan.js @@ -132,7 +132,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -155,7 +155,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js index f76fea9..3baf596 100644 --- a/packageA/pages/quan_list/quan_list.js +++ b/packageA/pages/quan_list/quan_list.js @@ -98,7 +98,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index 703ce05..59d4fde 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -82,7 +82,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 116900e..298c30b 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -1216,7 +1216,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -1742,7 +1742,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3568,7 +3568,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3606,7 +3606,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; @@ -4175,7 +4175,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/serviceCard_pd/team_show/team_show.js b/packageA/pages/serviceCard_pd/team_show/team_show.js index 5d5fd3c..1f98af0 100644 --- a/packageA/pages/serviceCard_pd/team_show/team_show.js +++ b/packageA/pages/serviceCard_pd/team_show/team_show.js @@ -162,7 +162,7 @@ Page({ //--先判断会员状态-- var user_info=getApp().globalData.userInfo; if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){ - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageA/pages/serviceCard_pd/team_success/team_success.js b/packageA/pages/serviceCard_pd/team_success/team_success.js index a1cbd08..9ca0754 100644 --- a/packageA/pages/serviceCard_pd/team_success/team_success.js +++ b/packageA/pages/serviceCard_pd/team_success/team_success.js @@ -854,7 +854,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ diff --git a/packageA/pages/service_record/service_record.js b/packageA/pages/service_record/service_record.js index 8660dc8..f10989b 100644 --- a/packageA/pages/service_record/service_record.js +++ b/packageA/pages/service_record/service_record.js @@ -57,7 +57,7 @@ Page({ let user_info = app.globalData.userInfo; if(user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) } else { resolve(); diff --git a/packageA/pages/service_share/service_share.js b/packageA/pages/service_share/service_share.js index d763522..747fa0e 100644 --- a/packageA/pages/service_share/service_share.js +++ b/packageA/pages/service_share/service_share.js @@ -344,7 +344,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 @@ -731,7 +731,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageB/pages/boxes-list/boxes-list.js b/packageB/pages/boxes-list/boxes-list.js index 5025bf8..c2d5751 100644 --- a/packageB/pages/boxes-list/boxes-list.js +++ b/packageB/pages/boxes-list/boxes-list.js @@ -109,7 +109,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/packageB/pages/evaluate/evaluate.js b/packageB/pages/evaluate/evaluate.js index c04f7a1..7768331 100644 --- a/packageB/pages/evaluate/evaluate.js +++ b/packageB/pages/evaluate/evaluate.js @@ -249,7 +249,7 @@ Page({ if(!userinfo){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index 3ef5fe2..8e81cd1 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -369,7 +369,7 @@ Page({ }) } else { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } }) @@ -521,7 +521,7 @@ Page({ var index = e.currentTarget.dataset.index; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } let haveAdded = this.data.list[index].haveAdded; @@ -656,7 +656,7 @@ Page({ var th = this; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } @@ -679,7 +679,7 @@ Page({ sub(e) { var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } @@ -784,7 +784,7 @@ Page({ var th = this; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } wx.showLoading(); @@ -1694,7 +1694,7 @@ Page({ user_id = getApp().globalData.user_id; if (user_id == null) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } if (map && map.has(gd.goods_id)) { @@ -1792,7 +1792,7 @@ Page({ choose_store: function (e) { var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.data.only = 1; diff --git a/packageB/pages/zuhegou/preindex/index.js b/packageB/pages/zuhegou/preindex/index.js index 9508141..5f69ea5 100644 --- a/packageB/pages/zuhegou/preindex/index.js +++ b/packageB/pages/zuhegou/preindex/index.js @@ -370,7 +370,7 @@ Page({ }) } else { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } }) @@ -523,7 +523,7 @@ Page({ var index = e.currentTarget.dataset.index; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } let haveAdded = this.data.list[index].haveAdded; @@ -658,7 +658,7 @@ Page({ var th = this; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } @@ -681,7 +681,7 @@ Page({ sub(e) { var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } @@ -786,7 +786,7 @@ Page({ var th = this; var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } wx.showLoading(); @@ -1695,7 +1695,7 @@ Page({ user_id = getApp().globalData.user_id; if (user_id == null) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } if (map && map.has(gd.goods_id)) { @@ -1793,7 +1793,7 @@ Page({ choose_store: function (e) { var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.data.only = 1; diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 5b2ac21..4b14fcc 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -447,7 +447,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - // wx.navigateTo({ url: '/pages/togoin/togoin', }) + // wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) // return false; } @@ -1011,7 +1011,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index e8d1026..7b03c7e 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -540,7 +540,7 @@ Page({ getApp().is_Single_page(th, function () { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }) @@ -2064,7 +2064,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3917,7 +3917,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; @@ -4491,7 +4491,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -4643,7 +4643,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -6224,7 +6224,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ @@ -6533,7 +6533,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 445639e..6e8d46c 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -136,7 +136,7 @@ Page({ } }); if (!getApp().globalData.userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } //判断是不是佣金抵扣 diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 2d38450..357861e 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1260,7 +1260,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -2656,7 +2656,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -2719,7 +2719,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3873,7 +3873,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ share_hidden: true, }); @@ -4076,7 +4076,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/packageC/pages/presell/list/list.js b/packageC/pages/presell/list/list.js index 562f4f1..88a0cdb 100644 --- a/packageC/pages/presell/list/list.js +++ b/packageC/pages/presell/list/list.js @@ -56,7 +56,7 @@ Page({ //调用列表 this.get_list(); }else{ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } var room_id = t.room_id; diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js index dc2c751..d72e20a 100644 --- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js +++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js @@ -1254,7 +1254,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -2619,7 +2619,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -2682,7 +2682,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } @@ -3837,7 +3837,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ share_hidden: true, }); diff --git a/packageD/pages/AI-test-skin/index/aiskin.js b/packageD/pages/AI-test-skin/index/aiskin.js index 89cd8e7..54ebde4 100644 --- a/packageD/pages/AI-test-skin/index/aiskin.js +++ b/packageD/pages/AI-test-skin/index/aiskin.js @@ -33,7 +33,7 @@ Page({ let user_id=getApp().globalData.user_id; if(!user_id) { setTimeout(function () { - let url = "/pages/togoin/togoin"; + let url = "/packageE/pages/togoin/togoin"; app.goto(url); }, 1000) } @@ -86,7 +86,7 @@ Page({ }); setTimeout(function () { - let url = "/pages/togoin/togoin"; + let url = "/packageE/pages/togoin/togoin"; app.goto(url); }, 1000) return false; diff --git a/packageD/pages/AI-test-skin/success_result/success_result.js b/packageD/pages/AI-test-skin/success_result/success_result.js index 19901c4..4d839e4 100644 --- a/packageD/pages/AI-test-skin/success_result/success_result.js +++ b/packageD/pages/AI-test-skin/success_result/success_result.js @@ -845,7 +845,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } if (this.data.share_hidden) { @@ -1140,7 +1140,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageD/pages/user/deposit/deposit.js b/packageD/pages/user/deposit/deposit.js index 2092b7c..720be92 100644 --- a/packageD/pages/user/deposit/deposit.js +++ b/packageD/pages/user/deposit/deposit.js @@ -28,7 +28,7 @@ Page({ // --先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } wx.setNavigationBarTitle({ diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 527b8eb..afe3e57 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -35,7 +35,7 @@ Page({ else{ wx.showToast({ title: "您还未登陆，请先授权", icon: 'none', duration: 2000 }) setTimeout(function () { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); },1200) } diff --git a/packageD/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index a65f460..b856599 100644 --- a/packageD/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -311,7 +311,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageD/pages/user/member/bring/bring.js b/packageD/pages/user/member/bring/bring.js index ae7c091..50d6052 100644 --- a/packageD/pages/user/member/bring/bring.js +++ b/packageD/pages/user/member/bring/bring.js @@ -337,7 +337,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == " " || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/packageD/pages/user/member/menber.js b/packageD/pages/user/member/menber.js index 038452d..89df0b0 100644 --- a/packageD/pages/user/member/menber.js +++ b/packageD/pages/user/member/menber.js @@ -25,7 +25,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } this.init_fir(); diff --git a/packageE/packageE/pages/togoin/togoin.js b/packageE/packageE/pages/togoin/togoin.js new file mode 100644 index 0000000..0d17bda --- /dev/null +++ b/packageE/packageE/pages/togoin/togoin.js @@ -0,0 +1,66 @@ +// packageE/packageE/pages/togoin/togoin.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/packageE/packageE/pages/togoin/togoin.json b/packageE/packageE/pages/togoin/togoin.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageE/packageE/pages/togoin/togoin.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageE/packageE/pages/togoin/togoin.wxml b/packageE/packageE/pages/togoin/togoin.wxml new file mode 100644 index 0000000..a350a9e --- /dev/null +++ b/packageE/packageE/pages/togoin/togoin.wxml @@ -0,0 +1,2 @@ + +packageE/packageE/pages/togoin/togoin.wxml diff --git a/packageE/packageE/pages/togoin/togoin.wxss b/packageE/packageE/pages/togoin/togoin.wxss new file mode 100644 index 0000000..2582b52 --- /dev/null +++ b/packageE/packageE/pages/togoin/togoin.wxss @@ -0,0 +1 @@ +/* packageE/packageE/pages/togoin/togoin.wxss */ \ No newline at end of file diff --git a/packageE/pages/togoin/togoin.js b/packageE/pages/togoin/togoin.js new file mode 100644 index 0000000..d6f0722 --- /dev/null +++ b/packageE/pages/togoin/togoin.js @@ -0,0 +1,415 @@ +var t = require("../../utils/common.js"); +const app=getApp(); +var os = app.globalData.setting; +var regeneratorRuntime = require('../../utils/runtime.js'); + +Page({ + data: { + user:null, + show_bind:0, + imghots: os.imghost, + store_logo:'', + first_leader:'', //-- 邀请人 -- + config2:null, + sub:0 + }, + onLoad: function (options) { + if (wx.getUserProfile) { + this.setData({ + canIUseGetUserProfile: true + }) + } + + getApp().globalData.isLoad_ad=1; + //--判断是否有接受到邀请人的ID-- + if(options.first_leader){ + this.setData({first_leader:options.first_leader}); + }else if(getApp().globalData.first_leader){ + this.setData({first_leader:getApp().globalData.first_leader}); + } + var th=this; + app.getConfig(function (e) { + var logo=th.data.imghots+e.store_logo; + th.setData({ store: e,store_logo:logo}); + }) + + //判断注册的条件 + app.getConfig2(function (e) { + if(e.reg_type==1){ + var arr=JSON.parse(e.reg_info); + if(arr['name_state']==1) th.data.name_need_go=1; + if(arr['birthday_state']==1) th.data.birth_need_go=1; + if(arr['idcard_state']==1) th.data.idcard_need_go=1; + if(arr['address_state']==1) th.data.address_need_go=1; + if(arr['pick_state']==1) th.data.pick_need_go=1; + if(arr['sex_state']==1) th.data.sex_need_go=1; + if(arr['introducer_state']==1) th.data.introducer_need_go=1; + } + },1) + + getApp().promiseGet("/api/wx/weappSendlist/page", { + data: { + store_id: os.stoid, + typeid: "1007" + }}).then(res=>{ + if (res.data.code == 0 && res.data.data.pageData.length > 0) { + var template_id = res.data.data.pageData[0].template_id; + th.setData({template_id:template_id}); + } + }) + }, + + + //绑定手机号 + getphone:function (e) { + //接下来写业务代码登录 + e=e.detail; + if (e.encryptedData==undefined){ + this.setData({show_bind:0}) + return app.my_warnning("登录需要授权手机号码！", 0, this); + return false; + } + var sessionKey = getApp().globalData.sessionKey; + var openid = getApp().globalData.openid; + var r=getApp().globalData.getu; + this.save_the_data(r,e,sessionKey,openid) + }, + + + //-- 会员授权 -- + bindGetUserInfo: function(ee) { + if(!this.data.isAgree) { + wx.showToast({ + title: '请您先阅读和勾选指定的内容', + icon: 'none', + }); + return false; + } + var that = this; + //-- 点击授权 -- + that.getUserProfile(function(res){ + var user=res; + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code:o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if(getApp().globalData.guide_id){ + dd.guide_id=getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if(e.data.code==0){ + that.setData({user:user}) + //如果有会员的话,没有sessionKey + if(!e.data.data.sessionKey){ + // getApp().showWarning("登录成功"); + wx.showToast({ + title: '登录成功', + icon: 'success', + duration: 2000 + }); + getApp().globalData.userInfo=e.data.data; + getApp().globalData.user_id=e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo",e.data.data); + + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + + setTimeout(function () { + getApp().globalData.login_back=1; + wx.navigateBack({ delta: 1}) //返回上一页 + },1000) + }else{ + getApp().globalData.sessionKey=e.data.data.sessionKey; + getApp().globalData.openid=e.data.data.openid; + that.setData({show_bind:1}); + } + }else{ + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + }) + }, + + //-- 调整后的获取会员信息 -- + getUserProfile:function(func){ + var that=this; + wx.getUserProfile({ + desc:'获取用户相关信息', + success:res=>{ + console.log("getUserProfile",res); + //此处授权得到userInfo + getApp().globalData.getu = res.userInfo; + func(res.userInfo); + } + }); + }, + + //暂不登录，返回上一页 + cancle_bind:function () { + wx.navigateBack({ delta: 1}) + }, + + close_pop:function(){ + this.setData({show_bind:0}) + }, + show_bind_mobile:function(){ + let th=this; + th.sendsm(function (){ + th.setData({show_bind:1}) + }) + }, + + + save_the_data: async function (r,e,sessionKey,openid) { + var app=getApp(),a=app,th=this; + var dd = { + oauth: "miniapp", + nickname:a.clear_word(r.nickName), + head_pic: r.avatarUrl, + sex: r.gender, + terminal: "miniapp", + sessionKey: sessionKey, + openid:openid, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + }; + //--如果有邀请人的时候-- + if(th.data.first_leader){ + dd.first_leader=th.data.first_leader; + } + //-- 导购会员ID -- + if(getApp().globalData.guide_id){ + dd.guide_id=getApp().globalData.guide_id; + } + + //门店的扫描识别码 + if(getApp().globalData.store_number){ + dd.SunCode=encodeURIComponent(getApp().globalData.store_number.trim()); + } + + console.log("-----会员注册的信息-------"); + console.log(dd); + + + var need_go=0; + //如果有需要完善的信息没有完善，就需要跳转 + if(th.data.name_need_go){ need_go=1;} + if(th.data.birth_need_go){ need_go=1;} + if(th.data.idcard_need_go){ need_go=1;} + if(th.data.address_need_go){ need_go=1;} + if(th.data.pick_need_go){ need_go=1;} + if(th.data.sex_need_go){ need_go=1;} + if(th.data.introducer_need_go){ need_go=1;} + + if(need_go){ + + var req_data={ + sessionKey: sessionKey, + encryptedData: e.encryptedData, + iv: e.iv, + store_id: getApp().globalData.setting.stoid, + } + //-- 获取一下手机 -- + getApp().request.promiseGet("/api/weshop/users/getmobile", {data:req_data}).then(res=>{ + if(res.data.code==0){ + dd.mobile=res.data.data; + getApp().globalData.zc_dd=dd; + wx.redirectTo({ + url:"/packageA/pages/profile/profile?is_back=1" + }) + } + }) + + }else{ + + this.setData({sub:1}); + wx.showLoading({ + title:'处理中.', + mask:true + }) + this.zu_ce(dd); //调用注册的函数 + } + + }, + + zu_ce:function (dd) { + var th=this; + app.request.get("/api/weshop/users/thirdLogin", { + data: dd, + success: function (e) { + if (e.data.code == 0) { + app.globalData.user_id = e.data.data.user_id; + } else { + return app.showWarning("授权登入失败！"+e.data.msg); + } + getApp().globalData.login_back=1; + wx.setStorageSync("userinfo",e.data.data); + wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); + + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + wx.navigateBack({ delta: 1}) + + }, + failStatus: function (t) { + th.setData({sub:0}); + return app.my_warnning("授权登入失败,请稍后再试!", 0, th); + }, + fail: function (t) { + th.setData({sub:0}); + return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; + } + }); + }, + + + bind_bnerr:function(e){ + var _errImg = e.target.dataset.errorimg; + var _errObj = {}; + _errObj[_errImg] = this.data.imghots+"/miniapp/images/logo.png"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + }, + + //-- 会员授权 -- + bindUserInfo: function(ee) { + var that = this; + var user=ee.detail.userInfo; + //此处授权得到userInfo + getApp().globalData.getu = user; + + //--拿下code-- + wx.login({ + success: function (o) { + var dd = { + js_code:o.code, + store_id: os.stoid, + nickname: app.clear_word(app.globalData.getu.nickName), + head_pic: app.clear_word(app.globalData.getu.avatarUrl) + }; + //-- 导购会员ID -- + if(getApp().globalData.guide_id){ + dd.guide_id=getApp().globalData.guide_id; + } + + getApp().request.get("/api/weshop/users/openidandkey", { + data: dd, + success: function (e) { + if(e.data.code==0){ + that.setData({user:user}) + //如果有会员的话,没有sessionKey + if(!e.data.data.sessionKey){ + // getApp().showWarning("登录成功"); + wx.showToast({ + title: '登录成功', + icon: 'success', + duration: 2000 + }); + + getApp().globalData.userInfo=e.data.data; + getApp().globalData.user_id=e.data.data.user_id; + getApp().globalData.openid = e.data.data.weapp_openid; + //把会员的信息存在内存 + wx.setStorageSync("userinfo",e.data.data); + + //调用接口判断是不是会员 + app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { + if (res.data.code == 0) { + getApp().globalData.guide_id = res.data.data.id; + } + }) + + + setTimeout(function () { + getApp().globalData.login_back=1; + wx.navigateBack({ delta: 1}) //返回上一页 + },1000) + }else{ + getApp().globalData.sessionKey=e.data.data.sessionKey; + getApp().globalData.openid=e.data.data.openid; + that.setData({show_bind:1}); + } + }else{ + getApp().confirmBox(e.data.msg); + } + } + }); + } + }) + + + }, + + + close_pop_back:function(){ + this.close_pop(); + wx.navigateBack({ delta: 1}) + }, + + + // 是否同意协议 + isAgree(e) { + let isAgree = null; + if(e.detail.value[0]) { + isAgree = true; + } else { + isAgree = false; + }; + // this.data.isAgree = isAgree; + this.setData({ + isAgree, + }); + }, + + + //通过路径跳转到其他页面 + goto: function(e) { + console.log('xxxx', e); + var url = e.currentTarget.dataset.url; + getApp().goto(url); + }, + + //订阅消息提醒 + sendsm:function(func) + { + var template_id = this.data.template_id; + // //授权订阅 + wx.requestSubscribeMessage({ + tmplIds: [template_id], + success(res) { + func(); + }, + fail(res) { + func(); + } + }) + + }, + + +}) diff --git a/packageE/pages/togoin/togoin.json b/packageE/pages/togoin/togoin.json new file mode 100644 index 0000000..23b89bc --- /dev/null +++ b/packageE/pages/togoin/togoin.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "授权登录", + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageE/pages/togoin/togoin.wxml b/packageE/pages/togoin/togoin.wxml new file mode 100644 index 0000000..8f14586 --- /dev/null +++ b/packageE/pages/togoin/togoin.wxml @@ -0,0 +1,76 @@ + + + + + + + + + {{store.store_name}} + + + + + + + + + + + + + 我已阅读同意 《用户使用协议》与《隐私政策》 + + + + + + + + + + + + + + + + + + 暂不登录 + + + + + + + + + + + + 登录手机号，同步会员信息以及订单记录 + + + 暂不授权 + + + + + + diff --git a/packageE/pages/togoin/togoin.wxss b/packageE/pages/togoin/togoin.wxss new file mode 100644 index 0000000..64b347e --- /dev/null +++ b/packageE/pages/togoin/togoin.wxss @@ -0,0 +1,77 @@ +page{ + border-top: 3rpx solid #EAEAEC; + background-color: #fff; +} +.logins { + width: 100%; + /* padding-bottom: 130rpx; */ + background-position: center; + background-repeat: no-repeat; + background-size: cover +} + +.login_img { + width: 192rpx; + height: 192rpx; + border-radius: 50%; +} +.phones{ + margin-bottom: 48rpx; +} +.getPhoneNumber { + width: 600rpx; + height: 94rpx; + line-height: 94rpx; + background-color: #57b837; + border-radius: 48rpx; + color: rgb(255,255,255); + font-size: 32rpx; + margin-top: 40rpx; +} +.we_chat{ + width: 55rpx; + height: 45rpx; + margin-right: 15rpx; +} +.userlongin{ + color: #767f8e; +} +button{ + border:none; +} +.login_img_back{ width: 100%;} +.p_content{ + margin: 10%; + width: 80%; + height:340rpx; + top:50%; + margin-top: -180rpx; + background-color: #fff; + z-index: 12; + position: fixed; +} + +.btn_view { height: 120rpx; line-height: 120rpx; border-top:1rpx solid #e9e9e9;} +.p_title{ height:220rpx; padding: 0 40rpx; line-height: 50rpx;} +.g_mobile{ background: none;line-height: normal;} +.b_right{border-right:1rpx solid #e9e9e9;} + +.ali-c{align-items: center;} +.flex-center2{ justify-content: center;} +.f2 { + flex: 2 0; +} + +.middle_view{ + position: absolute; left: 0; width: 100%; text-align: center; +} + +/*checkbox 选项框大小 */ +checkbox .wx-checkbox-input { + width: 30rpx; + height: 30rpx; +} + +.gray { + color: #767f8e; +} diff --git a/pages/distribution/distribution.js b/pages/distribution/distribution.js index 509ace9..cf5e386 100644 --- a/pages/distribution/distribution.js +++ b/pages/distribution/distribution.js @@ -22,7 +22,7 @@ Page({ userInfo: app.globalData.userInfo, }); }else{ - getApp().goto("/pages/togoin/togoin") //跳到非tabbar页 + getApp().goto("/packageE/pages/togoin/togoin") //跳到非tabbar页 } wx.setNavigationBarTitle({ title: "我的分销", @@ -340,6 +340,6 @@ Page({ }, go_login(){ - getApp().goto("/pages/togoin/togoin") //跳到非tabbar页 + getApp().goto("/packageE/pages/togoin/togoin") //跳到非tabbar页 } }) \ No newline at end of file diff --git a/pages/giftpack/birthdaygift/birthdaygift.js b/pages/giftpack/birthdaygift/birthdaygift.js index 590c300..0e44149 100644 --- a/pages/giftpack/birthdaygift/birthdaygift.js +++ b/pages/giftpack/birthdaygift/birthdaygift.js @@ -127,7 +127,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } this.GetList(); diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index 79b9aa8..2fe33c6 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -135,7 +135,7 @@ Page({ getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } com.wait_for_store_config(th); diff --git a/pages/giftpack/evaluategift/evaluategift.js b/pages/giftpack/evaluategift/evaluategift.js index 44c4a50..1c3f013 100644 --- a/pages/giftpack/evaluategift/evaluategift.js +++ b/pages/giftpack/evaluategift/evaluategift.js @@ -160,7 +160,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } diff --git a/pages/giftpack/festival/festival.js b/pages/giftpack/festival/festival.js index 98e0e51..645397a 100644 --- a/pages/giftpack/festival/festival.js +++ b/pages/giftpack/festival/festival.js @@ -133,7 +133,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } this.is_festival(); diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 151aa6d..2646e3e 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -167,7 +167,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } this.init(); @@ -903,7 +903,7 @@ Page({ clickShare() { if (!getApp().globalData.user_id) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ @@ -930,7 +930,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({url: '/pages/togoin/togoin',}) + wx.navigateTo({url: '/packageE/pages/togoin/togoin',}) return false; } diff --git a/pages/giftpack/mygiftpack/mygiftpack.js b/pages/giftpack/mygiftpack/mygiftpack.js index 4760e80..1b080ea 100644 --- a/pages/giftpack/mygiftpack/mygiftpack.js +++ b/pages/giftpack/mygiftpack/mygiftpack.js @@ -83,7 +83,7 @@ Page({ getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } this.init() diff --git a/pages/giftpack/newvipgift/newvipgift.js b/pages/giftpack/newvipgift/newvipgift.js index 467c9a0..f6ef5e3 100644 --- a/pages/giftpack/newvipgift/newvipgift.js +++ b/pages/giftpack/newvipgift/newvipgift.js @@ -126,7 +126,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } this.GetList(); diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 3752482..34ea947 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -2272,7 +2272,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -2297,7 +2297,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -4234,7 +4234,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -4833,7 +4833,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } @@ -5028,7 +5028,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { //getApp().my_warnning("请先登录",0,this); - wx.navigateTo({url: '/pages/togoin/togoin',}) + wx.navigateTo({url: '/packageE/pages/togoin/togoin',}) return false; } @@ -6516,7 +6516,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ @@ -6817,7 +6817,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/pages/index/index/index.js b/pages/index/index/index.js index bd24abb..e076bd2 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -1031,7 +1031,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', //url: '/pages/getphone/getphone', }) return false; @@ -1219,7 +1219,7 @@ Page({ go_pre: function (e) { var userInfo = getApp().globalData.userInfo; if (!userInfo) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } var url = e.currentTarget.dataset.url; diff --git a/pages/team/team_show/team_show.js b/pages/team/team_show/team_show.js index 97babf8..7c90eb8 100644 --- a/pages/team/team_show/team_show.js +++ b/pages/team/team_show/team_show.js @@ -163,7 +163,7 @@ Page({ //--先判断会员状态-- var user_info=getApp().globalData.userInfo; if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){ - wx.navigateTo({ url: '/pages/togoin/togoin', }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 29e6e84..81cf88e 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -844,7 +844,7 @@ Page({ clickShare() { if(!getApp().globalData.user_id){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); return false; } this.setData({ diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js deleted file mode 100644 index d6f0722..0000000 --- a/pages/togoin/togoin.js +++ /dev/null @@ -1,415 +0,0 @@ -var t = require("../../utils/common.js"); -const app=getApp(); -var os = app.globalData.setting; -var regeneratorRuntime = require('../../utils/runtime.js'); - -Page({ - data: { - user:null, - show_bind:0, - imghots: os.imghost, - store_logo:'', - first_leader:'', //-- 邀请人 -- - config2:null, - sub:0 - }, - onLoad: function (options) { - if (wx.getUserProfile) { - this.setData({ - canIUseGetUserProfile: true - }) - } - - getApp().globalData.isLoad_ad=1; - //--判断是否有接受到邀请人的ID-- - if(options.first_leader){ - this.setData({first_leader:options.first_leader}); - }else if(getApp().globalData.first_leader){ - this.setData({first_leader:getApp().globalData.first_leader}); - } - var th=this; - app.getConfig(function (e) { - var logo=th.data.imghots+e.store_logo; - th.setData({ store: e,store_logo:logo}); - }) - - //判断注册的条件 - app.getConfig2(function (e) { - if(e.reg_type==1){ - var arr=JSON.parse(e.reg_info); - if(arr['name_state']==1) th.data.name_need_go=1; - if(arr['birthday_state']==1) th.data.birth_need_go=1; - if(arr['idcard_state']==1) th.data.idcard_need_go=1; - if(arr['address_state']==1) th.data.address_need_go=1; - if(arr['pick_state']==1) th.data.pick_need_go=1; - if(arr['sex_state']==1) th.data.sex_need_go=1; - if(arr['introducer_state']==1) th.data.introducer_need_go=1; - } - },1) - - getApp().promiseGet("/api/wx/weappSendlist/page", { - data: { - store_id: os.stoid, - typeid: "1007" - }}).then(res=>{ - if (res.data.code == 0 && res.data.data.pageData.length > 0) { - var template_id = res.data.data.pageData[0].template_id; - th.setData({template_id:template_id}); - } - }) - }, - - - //绑定手机号 - getphone:function (e) { - //接下来写业务代码登录 - e=e.detail; - if (e.encryptedData==undefined){ - this.setData({show_bind:0}) - return app.my_warnning("登录需要授权手机号码！", 0, this); - return false; - } - var sessionKey = getApp().globalData.sessionKey; - var openid = getApp().globalData.openid; - var r=getApp().globalData.getu; - this.save_the_data(r,e,sessionKey,openid) - }, - - - //-- 会员授权 -- - bindGetUserInfo: function(ee) { - if(!this.data.isAgree) { - wx.showToast({ - title: '请您先阅读和勾选指定的内容', - icon: 'none', - }); - return false; - } - var that = this; - //-- 点击授权 -- - that.getUserProfile(function(res){ - var user=res; - //--拿下code-- - wx.login({ - success: function (o) { - var dd = { - js_code:o.code, - store_id: os.stoid, - nickname: app.clear_word(app.globalData.getu.nickName), - head_pic: app.clear_word(app.globalData.getu.avatarUrl) - }; - //-- 导购会员ID -- - if(getApp().globalData.guide_id){ - dd.guide_id=getApp().globalData.guide_id; - } - - getApp().request.get("/api/weshop/users/openidandkey", { - data: dd, - success: function (e) { - if(e.data.code==0){ - that.setData({user:user}) - //如果有会员的话,没有sessionKey - if(!e.data.data.sessionKey){ - // getApp().showWarning("登录成功"); - wx.showToast({ - title: '登录成功', - icon: 'success', - duration: 2000 - }); - getApp().globalData.userInfo=e.data.data; - getApp().globalData.user_id=e.data.data.user_id; - getApp().globalData.openid = e.data.data.weapp_openid; - //把会员的信息存在内存 - wx.setStorageSync("userinfo",e.data.data); - - //调用接口判断是不是会员 - app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - } - }) - - - setTimeout(function () { - getApp().globalData.login_back=1; - wx.navigateBack({ delta: 1}) //返回上一页 - },1000) - }else{ - getApp().globalData.sessionKey=e.data.data.sessionKey; - getApp().globalData.openid=e.data.data.openid; - that.setData({show_bind:1}); - } - }else{ - getApp().confirmBox(e.data.msg); - } - } - }); - } - }) - - }) - }, - - //-- 调整后的获取会员信息 -- - getUserProfile:function(func){ - var that=this; - wx.getUserProfile({ - desc:'获取用户相关信息', - success:res=>{ - console.log("getUserProfile",res); - //此处授权得到userInfo - getApp().globalData.getu = res.userInfo; - func(res.userInfo); - } - }); - }, - - //暂不登录，返回上一页 - cancle_bind:function () { - wx.navigateBack({ delta: 1}) - }, - - close_pop:function(){ - this.setData({show_bind:0}) - }, - show_bind_mobile:function(){ - let th=this; - th.sendsm(function (){ - th.setData({show_bind:1}) - }) - }, - - - save_the_data: async function (r,e,sessionKey,openid) { - var app=getApp(),a=app,th=this; - var dd = { - oauth: "miniapp", - nickname:a.clear_word(r.nickName), - head_pic: r.avatarUrl, - sex: r.gender, - terminal: "miniapp", - sessionKey: sessionKey, - openid:openid, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - }; - //--如果有邀请人的时候-- - if(th.data.first_leader){ - dd.first_leader=th.data.first_leader; - } - //-- 导购会员ID -- - if(getApp().globalData.guide_id){ - dd.guide_id=getApp().globalData.guide_id; - } - - //门店的扫描识别码 - if(getApp().globalData.store_number){ - dd.SunCode=encodeURIComponent(getApp().globalData.store_number.trim()); - } - - console.log("-----会员注册的信息-------"); - console.log(dd); - - - var need_go=0; - //如果有需要完善的信息没有完善，就需要跳转 - if(th.data.name_need_go){ need_go=1;} - if(th.data.birth_need_go){ need_go=1;} - if(th.data.idcard_need_go){ need_go=1;} - if(th.data.address_need_go){ need_go=1;} - if(th.data.pick_need_go){ need_go=1;} - if(th.data.sex_need_go){ need_go=1;} - if(th.data.introducer_need_go){ need_go=1;} - - if(need_go){ - - var req_data={ - sessionKey: sessionKey, - encryptedData: e.encryptedData, - iv: e.iv, - store_id: getApp().globalData.setting.stoid, - } - //-- 获取一下手机 -- - getApp().request.promiseGet("/api/weshop/users/getmobile", {data:req_data}).then(res=>{ - if(res.data.code==0){ - dd.mobile=res.data.data; - getApp().globalData.zc_dd=dd; - wx.redirectTo({ - url:"/packageA/pages/profile/profile?is_back=1" - }) - } - }) - - }else{ - - this.setData({sub:1}); - wx.showLoading({ - title:'处理中.', - mask:true - }) - this.zu_ce(dd); //调用注册的函数 - } - - }, - - zu_ce:function (dd) { - var th=this; - app.request.get("/api/weshop/users/thirdLogin", { - data: dd, - success: function (e) { - if (e.data.code == 0) { - app.globalData.user_id = e.data.data.user_id; - } else { - return app.showWarning("授权登入失败！"+e.data.msg); - } - getApp().globalData.login_back=1; - wx.setStorageSync("userinfo",e.data.data); - wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(app.globalData.userInfo.head_pic); - - //调用接口判断是不是会员 - app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - } - }) - - wx.navigateBack({ delta: 1}) - - }, - failStatus: function (t) { - th.setData({sub:0}); - return app.my_warnning("授权登入失败,请稍后再试!", 0, th); - }, - fail: function (t) { - th.setData({sub:0}); - return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1; - } - }); - }, - - - bind_bnerr:function(e){ - var _errImg = e.target.dataset.errorimg; - var _errObj = {}; - _errObj[_errImg] = this.data.imghots+"/miniapp/images/logo.png"; - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; - }, - - //-- 会员授权 -- - bindUserInfo: function(ee) { - var that = this; - var user=ee.detail.userInfo; - //此处授权得到userInfo - getApp().globalData.getu = user; - - //--拿下code-- - wx.login({ - success: function (o) { - var dd = { - js_code:o.code, - store_id: os.stoid, - nickname: app.clear_word(app.globalData.getu.nickName), - head_pic: app.clear_word(app.globalData.getu.avatarUrl) - }; - //-- 导购会员ID -- - if(getApp().globalData.guide_id){ - dd.guide_id=getApp().globalData.guide_id; - } - - getApp().request.get("/api/weshop/users/openidandkey", { - data: dd, - success: function (e) { - if(e.data.code==0){ - that.setData({user:user}) - //如果有会员的话,没有sessionKey - if(!e.data.data.sessionKey){ - // getApp().showWarning("登录成功"); - wx.showToast({ - title: '登录成功', - icon: 'success', - duration: 2000 - }); - - getApp().globalData.userInfo=e.data.data; - getApp().globalData.user_id=e.data.data.user_id; - getApp().globalData.openid = e.data.data.weapp_openid; - //把会员的信息存在内存 - wx.setStorageSync("userinfo",e.data.data); - - //调用接口判断是不是会员 - app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { - if (res.data.code == 0) { - getApp().globalData.guide_id = res.data.data.id; - } - }) - - - setTimeout(function () { - getApp().globalData.login_back=1; - wx.navigateBack({ delta: 1}) //返回上一页 - },1000) - }else{ - getApp().globalData.sessionKey=e.data.data.sessionKey; - getApp().globalData.openid=e.data.data.openid; - that.setData({show_bind:1}); - } - }else{ - getApp().confirmBox(e.data.msg); - } - } - }); - } - }) - - - }, - - - close_pop_back:function(){ - this.close_pop(); - wx.navigateBack({ delta: 1}) - }, - - - // 是否同意协议 - isAgree(e) { - let isAgree = null; - if(e.detail.value[0]) { - isAgree = true; - } else { - isAgree = false; - }; - // this.data.isAgree = isAgree; - this.setData({ - isAgree, - }); - }, - - - //通过路径跳转到其他页面 - goto: function(e) { - console.log('xxxx', e); - var url = e.currentTarget.dataset.url; - getApp().goto(url); - }, - - //订阅消息提醒 - sendsm:function(func) - { - var template_id = this.data.template_id; - // //授权订阅 - wx.requestSubscribeMessage({ - tmplIds: [template_id], - success(res) { - func(); - }, - fail(res) { - func(); - } - }) - - }, - - -}) diff --git a/pages/togoin/togoin.json b/pages/togoin/togoin.json deleted file mode 100644 index 23b89bc..0000000 --- a/pages/togoin/togoin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "navigationBarTitleText": "授权登录", - "usingComponents": { - "warn": "/components/long_warn/long_warn" - } -} \ No newline at end of file diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml deleted file mode 100644 index 8f14586..0000000 --- a/pages/togoin/togoin.wxml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - {{store.store_name}} - - - - - - - - - - - - - 我已阅读同意 《用户使用协议》与《隐私政策》 - - - - - - - - - - - - - - - - - - 暂不登录 - - - - - - - - - - - - 登录手机号，同步会员信息以及订单记录 - - - 暂不授权 - - - - - - diff --git a/pages/togoin/togoin.wxss b/pages/togoin/togoin.wxss deleted file mode 100644 index 64b347e..0000000 --- a/pages/togoin/togoin.wxss +++ /dev/null @@ -1,77 +0,0 @@ -page{ - border-top: 3rpx solid #EAEAEC; - background-color: #fff; -} -.logins { - width: 100%; - /* padding-bottom: 130rpx; */ - background-position: center; - background-repeat: no-repeat; - background-size: cover -} - -.login_img { - width: 192rpx; - height: 192rpx; - border-radius: 50%; -} -.phones{ - margin-bottom: 48rpx; -} -.getPhoneNumber { - width: 600rpx; - height: 94rpx; - line-height: 94rpx; - background-color: #57b837; - border-radius: 48rpx; - color: rgb(255,255,255); - font-size: 32rpx; - margin-top: 40rpx; -} -.we_chat{ - width: 55rpx; - height: 45rpx; - margin-right: 15rpx; -} -.userlongin{ - color: #767f8e; -} -button{ - border:none; -} -.login_img_back{ width: 100%;} -.p_content{ - margin: 10%; - width: 80%; - height:340rpx; - top:50%; - margin-top: -180rpx; - background-color: #fff; - z-index: 12; - position: fixed; -} - -.btn_view { height: 120rpx; line-height: 120rpx; border-top:1rpx solid #e9e9e9;} -.p_title{ height:220rpx; padding: 0 40rpx; line-height: 50rpx;} -.g_mobile{ background: none;line-height: normal;} -.b_right{border-right:1rpx solid #e9e9e9;} - -.ali-c{align-items: center;} -.flex-center2{ justify-content: center;} -.f2 { - flex: 2 0; -} - -.middle_view{ - position: absolute; left: 0; width: 100%; text-align: center; -} - -/*checkbox 选项框大小 */ -checkbox .wx-checkbox-input { - width: 30rpx; - height: 30rpx; -} - -.gray { - color: #767f8e; -} diff --git a/pages/user/assistance/assistance.js b/pages/user/assistance/assistance.js index 2a38aa4..4fe94ab 100644 --- a/pages/user/assistance/assistance.js +++ b/pages/user/assistance/assistance.js @@ -54,7 +54,7 @@ Page({ getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } // 助力活动 diff --git a/pages/user/assistance/friend_assistance.js b/pages/user/assistance/friend_assistance.js index f7101f5..9f7e9a2 100644 --- a/pages/user/assistance/friend_assistance.js +++ b/pages/user/assistance/friend_assistance.js @@ -58,7 +58,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } @@ -118,7 +118,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; } diff --git a/pages/user/assistance/giftpacklist.js b/pages/user/assistance/giftpacklist.js index 63ad10d..58dba8d 100644 --- a/pages/user/assistance/giftpacklist.js +++ b/pages/user/assistance/giftpacklist.js @@ -71,7 +71,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js index 0d9805f..e7ec355 100644 --- a/pages/user/assistance/task_assistance.js +++ b/pages/user/assistance/task_assistance.js @@ -143,7 +143,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - getApp().goto('/pages/togoin/togoin'); + getApp().goto('/packageE/pages/togoin/togoin'); return false; } diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index f5381a5..20fb5be 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -53,7 +53,7 @@ Page({ //--先判断会员状态-- var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { - wx.navigateTo({ url: '/pages/togoin/togoin' }) + wx.navigateTo({ url: '/packageE/pages/togoin/togoin' }) return false; } diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 62bb0db..9e8a4df 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -58,7 +58,7 @@ Page({ getApp().goto(url); } else { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) } }, @@ -597,7 +597,7 @@ Page({ //--跳到绑定页面-- gobindtel: function () { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) }, @@ -972,7 +972,7 @@ Page({ let user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) return false; }; diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js index a77650d..1898051 100644 --- a/pages/user/my_service/tment_details.js +++ b/pages/user/my_service/tment_details.js @@ -76,7 +76,7 @@ Page({ var user=getApp().globalData.userInfo; if(!user){ - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } }, diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 2b4b28b..a2f8476 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -72,7 +72,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin?first_leader=' + fir_leader, + url: '/packageE/pages/togoin/togoin?first_leader=' + fir_leader, }) return false; } @@ -543,7 +543,7 @@ Page({ var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { wx.navigateTo({ - url: '/pages/togoin/togoin?first_leader=' + fir_leader, + url: '/packageE/pages/togoin/togoin?first_leader=' + fir_leader, }) return false; } diff --git a/project.config.json b/project.config.json index 95a50c6..3d2ec81 100644 --- a/project.config.json +++ b/project.config.json @@ -1,8 +1,5 @@ { - "description": "项目配置文件", - "packOptions": { - "ignore": [] - }, + "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "setting": { "urlCheck": false, "es6": true, @@ -16,15 +13,13 @@ "autoAudits": false, "showShadowRootInWxmlPanel": true, "scopeDataCheck": false, - "uglifyFileName": false, + "uglifyFileName": true, "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [], @@ -35,1031 +30,884 @@ "packNpmManually": false, "packNpmRelationList": [], "minifyWXSS": true, - "showES6CompileOption": false + "showES6CompileOption": false, + "disableUseStrict": false, + "useCompilerPlugins": false, + "ignoreUploadUnusedFiles": true, + "useStaticServer": true, + "minifyWXML": true, + "useApiHostProcess": false }, "compileType": "miniprogram", - "libVersion": "2.16.0", - "appid": "wx2ea7cdd3ef52cdff", - "projectname": "MShopWeApp", - "debugOptions": { - "hidedInDevtools": [] - }, - "isGameTourist": false, "simulatorType": "wechat", "simulatorPluginLibVersion": {}, "condition": { - "search": { - "list": [] - }, - "conversation": { - "list": [] - }, - "plugin": { - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "gamePlugin": { - "list": [] - }, "miniprogram": { "list": [ { - "id": 0, "name": "启动直播列表页", "pathName": "pages/justTest/justTest", "query": "", "scene": null }, { - "id": 1, "name": "liveStreamDetails", "pathName": "packageA/pages/liveStreamDetails/liveStreamDetails", "query": "", "scene": null }, { - "id": 2, "name": "justTest", "pathName": "pages/justTest/justTest", "query": "", "scene": null }, { - "id": 3, "name": "pages/goods/goodsInfo/goodsInfo", "pathName": "pages/goods/goodsInfo/goodsInfo", "query": "", "scene": null }, { - "id": -1, "name": "pages/team/team_show/team_show", "pathName": "pages/team/team_show/team_show", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "pages/store/index", "pathName": "pages/store/index", "query": "", "scene": null }, { - "id": 7, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/goods_share/goods_share", "query": "", "scene": null }, { - "id": 8, "name": "packageA/pages/live_share/live_share", "pathName": "packageA/pages/live_share/live_share", "query": "", "scene": null }, { - "id": -1, "name": "pages/cart/cart2_pt/cart2_pt", "pathName": "pages/cart/cart2_pt/cart2_pt", "query": "", "scene": null }, { - "id": -1, "name": "pages/cart/cart2_pt/cart2_pt", "pathName": "pages/cart/cart2_pt/cart2_pt", "query": "", "scene": null }, { - "id": -1, "name": "pages/cart/cart_wk/cart_wk", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "pages/cart_wk/cart_wk/cart_wk", "pathName": "pages/cart_wk/cart_wk/cart_wk", "query": "", "scene": null }, { - "id": -1, "name": "pages/cart/cart_wk/cart_wk", "pathName": "pages/cart/cart_wk/cart_wk", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/assistance/assistance", "pathName": "pages/user/assistance/assistance", "query": "", "scene": null }, { - "id": -1, "name": "pages/goods/search/search", "pathName": "pages/goods/search/search", "query": "", "scene": null }, { - "id": -1, "name": "pages/goods/search/search", "pathName": "pages/goods/search/search", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/userinfo/userinfo", "pathName": "pages/user/userinfo/userinfo", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/goods_share/goods_share", "pathName": "pages/user/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA//pages/user/goods_share/goods_share", "pathName": "packageA//pages/user/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/user/goods_share/goods_share", "pathName": "packageA/pages/user/goods_share/goods_share", "query": "", "scene": null }, { - "id": 21, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/addCustomer/addCustomer", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/activity_share/activity_share", "pathName": "packageA/pages/activity_share/activity_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_list/quan_list", "pathName": "packageA/pages/quan_list/quan_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_pro/quan_pro", "pathName": "packageA/pages/quan_pro/quan_pro", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_list/quan_list", "pathName": "packageA/pages/quan_list/quan_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/addCustomer/addCustomer", "pathName": "packageA/pages/addCustomer/addCustomer", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/assistance/assistance", "pathName": "pages/user/assistance/assistance", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/live_share/live_share", "pathName": "packageA/pages/live_share/live_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/assistance/assistance", "pathName": "pages/user/assistance/assistance", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/live_share/live_share", "pathName": "packageA/pages/live_share/live_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/jfbuy/jfbuy", "pathName": "packageA/pages/jfbuy/jfbuy", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/live_share/live_share", "pathName": "packageA/pages/live_share/live_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/activity_share/activity_share", "pathName": "packageA/pages/activity_share/activity_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/jfbuy/jfbuy", "pathName": "packageA/pages/jfbuy/jfbuy", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/jfbuy/jfbuy", "pathName": "packageA/pages/jfbuy/jfbuy", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/order_list/order_list", "pathName": "pages/user/order_list/order_list", "query": "", "scene": null }, { - "id": -1, "name": "pages/shop_details/shop_details", "pathName": "pages/shop_details/shop_details", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/order_list/order_list", "pathName": "pages/user/order_list/order_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhiDetails/chongzhiDetails", "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhiDetails/chongzhiDetails", "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/deposit/prepaid/prepaid", "pathName": "pages/user/deposit/prepaid/prepaid", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhiDetails/chongzhiDetails", "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhiDetails/chongzhiDetails", "pathName": "packageA/pages/chongzhiDetails/chongzhiDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/jfbuy/jfbuy", "pathName": "packageA/pages/jfbuy/jfbuy", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/integral/integral", "pathName": "pages/user/integral/integral", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/jfbuy/jfbuy", "pathName": "packageA/pages/jfbuy/jfbuy", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_list/quan_list", "pathName": "packageA/pages/quan_list/quan_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_list/quan_list", "pathName": "packageA/pages/quan_list/quan_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan/quan", "pathName": "packageA/pages/quan/quan", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/checkin/checkin", "pathName": "packageA/pages/checkin/checkin", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/chongzhi/chongzhi", "pathName": "packageA/pages/chongzhi/chongzhi", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/assistance/assistance", "pathName": "pages/user/assistance/assistance", "query": "", "scene": null }, { - "id": -1, "name": "pages/giftpack/mygiftpack/mygiftpack", "pathName": "pages/giftpack/mygiftpack/mygiftpack", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/quan_list/quan_list", "pathName": "packageA/pages/quan_list/quan_list", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/service_record/service_record", "pathName": "packageA/pages/service_record/service_record", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBao/hongBao", "pathName": "packageA/pages/hongBao/hongBao", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBaoDetails/hongBaoDetails", "pathName": "packageA/pages/hongBao/hongBao", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBaoDetails/hongBaoDetails", "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBaoDetails/hongBaoDetails", "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBao/hongBao", "pathName": "packageA/pages/hongBao/hongBao", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBaoDetails/hongBaoDetails", "pathName": "packageA/pages/hongBaoDetails/hongBaoDetails", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/hongBao/hongBao", "pathName": "packageA/pages/hongBao/hongBao", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/service_record/service_record", "pathName": "packageA/pages/service_record/service_record", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/myteam/myteam", "pathName": "packageA/pages/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "pages/giftpack/newvipgift/newvipgift", "pathName": "pages/giftpack/newvipgift/newvipgift", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/order/order", "pathName": "packageA/pages/distribution/order/order", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/order/order", "pathName": "packageA/pages/distribution/order/order", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/commision/commision", "pathName": "packageA/pages/distribution/commision/commision", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/commision/commision", "pathName": "packageA/pages/distribution/commision/commision", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/commision/commision", "pathName": "packageA/pages/distribution/commision/commision", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/rank/rank", "pathName": "packageA/pages/distribution/rank/rank", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/commision/commision", "pathName": "packageA/pages/distribution/commision/commision", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/order/order", "pathName": "packageA/pages/distribution/order/order", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/card/card", "pathName": "packageA/pages/distribution/card/card", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/rank/rank", "pathName": "packageA/pages/distribution/rank/rank", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/goods/goods", "pathName": "packageA/pages/distribution/goods/goods", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/shop/shop", "pathName": "packageA/pages/distribution/shop/shop", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/rookie/rookie", "pathName": "packageA/pages/distribution/rookie/rookie", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/order/order", "pathName": "packageA/pages/distribution/order/order", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/order/order", "pathName": "packageA/pages/distribution/order/order", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/rank/rank", "pathName": "packageA/pages/distribution/rank/rank", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/myteam/myteam", "pathName": "packageA/pages/distribution/myteam/myteam", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/commision/commision", "pathName": "packageA/pages/distribution/commision/commision", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/shop/shop", "pathName": "packageA/pages/distribution/shop/shop", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/shop/shop", "pathName": "packageA/pages/distribution/shop/shop", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/shop/shop", "pathName": "packageA/pages/distribution/shop/shop", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/card/card", "pathName": "packageA/pages/distribution/card/card", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/card/card", "pathName": "packageA/pages/distribution/card/card", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/activity_share/activity_share", "pathName": "packageA/pages/activity_share/activity_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/goods_share/goods_share", "pathName": "packageA/pages/goods_share/goods_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/service_share/service_share", "pathName": "packageA/pages/service_share/service_share", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/cardDetails/cardDetails", "pathName": "packageA/pages/cardDetails/cardDetails", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/my_service/i_service", "pathName": "pages/user/appment_main/appment_main", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/appment_main/appment_main", "pathName": "pages/user/my_service/appment_main/appment_main", "query": "", "scene": null }, { - "id": -1, "name": "pages/user/my_service/appment_main", "pathName": "pages/user/my_service/appment_main", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", "query": "", "scene": null }, { - "id": -1, "name": "pages/index/index/index", "pathName": "pages/index/index/index", "query": "", "scene": null }, { - "id": -1, "name": "packageA/pages/distribution/main/main", "pathName": "packageA/pages/distribution/main/main", + "query": "", "scene": null } ] } - } + }, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, + "packOptions": { + "ignore": [], + "include": [] + }, + "appid": "wx2ea7cdd3ef52cdff", + "projectname": "Dev_MShopWeApp", + "libVersion": "2.25.4" } \ No newline at end of file diff --git a/utils/auth.js b/utils/auth.js index ed0dd7d..f5bf325 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -113,7 +113,7 @@ module.exports = { app.globalData.getu = r; wx.navigateTo({ - url: '/pages/togoin/togoin', + url: '/packageE/pages/togoin/togoin', }) }else{ app.globalData.user_id = e.data.data.user_id; @@ -225,7 +225,7 @@ module.exports = { var a = wx.getStorageSync("wx_user_info"); var userInfo = a.userInfo; if (userInfo==undefined){ - n.goto("/pages/togoin/togoin"); + n.goto("/packageE/pages/togoin/togoin"); }else{ a && void 0 != a ? (n.globalData.wechatUser = a, o.login(t, a, e)) : o.goGetUserInfo(); } diff --git a/utils/util.js b/utils/util.js index 867edf8..10a0c82 100644 --- a/utils/util.js +++ b/utils/util.js @@ -689,7 +689,7 @@ module.exports = { content: e.data.data.vipname+'邀请你登录成为会员？', success: function (res) { if (res.confirm) { - getApp().goto("/pages/togoin/togoin"); + getApp().goto("/packageE/pages/togoin/togoin"); } } }) -- libgit2 0.21.4