From 12c0f386443ec423fb19fa8cdf35d8990c6ba440 Mon Sep 17 00:00:00 2001 From: whitechiina <1293616053@qq.com> Date: Sun, 28 Sep 2025 15:39:54 +0800 Subject: [PATCH] updata --- App.vue | 32 ++++++++++--------- request/request.js | 4 +-- unpackage/dist/build/web/index.html | 2 +- .../build/web/static/js/index.08d8b296.js | 1 - .../build/web/static/js/index.a625358b.js | 1 + 5 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 unpackage/dist/build/web/static/js/index.08d8b296.js create mode 100644 unpackage/dist/build/web/static/js/index.a625358b.js diff --git a/App.vue b/App.vue index c1fc5da..c167428 100644 --- a/App.vue +++ b/App.vue @@ -29,15 +29,6 @@ globalData: { // FPT上传地址 urlfileName:'https://jc.agrimedia.cn/discountt', - // parameters: { - // isWechat: true, - // token: "123456", - // cityInfor:{ - // city: "天津市", - // lat: '39.093471137152775', - // lon: '117.12767279730903', - // } - // }, parameters: {} }, @@ -65,7 +56,8 @@ }; if(Object.keys(querys)['length'] > 0){ - if(querys?.para){ + if(querys?.para){ + console.log('正常登录') // 获取URL参数 var _para = getUrlParams(window.location.href); console.log(_para,'_para'); @@ -98,11 +90,22 @@ } else { console.log('没有参数') } - - console.log(JSON.stringify(this['globalData']['parameters'],null,10), 'App Launch'); - + + this.SETSPREAD(this['globalData']['parameters']['spread']); }else{ - console.log('存在参数1997', !querys.token) + console.log('分享者的参数1997', !querys.token) + console.log('登录token后存在的参数1997', querys) + + + // 分享者的参数 + if (querys.userinfor.spread) { + setTimeout(() => { + this.SETSPREAD(querys.userinfor.spread); + spread({ puid: querys.userinfor.spread, code: 0 }).then(res => { + }) + }, 1000) + } + if (!querys.token) { for(let key in querys){ const value = querys[key]; @@ -152,7 +155,6 @@ } }; console.log(this['globalData']['parameters']['spread'],'测试取参'); - this.SETSPREAD(this['globalData']['parameters']['spread']); this.clearUrlParams(); return; diff --git a/request/request.js b/request/request.js index 709d23b..81bcf1f 100644 --- a/request/request.js +++ b/request/request.js @@ -133,8 +133,8 @@ class Request { if (infor['data']['status'] != 200 && infor['data']['code'] != 7777) { // #ifdef H5 if (infor['data']['status'] == 110002 && !isMiniPrograms()) { - window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`; - // window.location.href = `http://10.210.254.176:8081/JXH5/#/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`; + // window.location.href = `${HTTP_REQUEST_URL}/JXH5/pages/users/h5_login/index?redirectUri=${window.location.protocol + "//" + window.location.host}/privilege/pages/restaurant/home/shop_home/shop_home`; + window.location.href = `http://10.210.254.176:1024/JXH5/#/pages/users/h5_login/index?redirectUri=http://10.210.254.176:8090/privilege/pages/restaurant/home/shop_home/shop_home`; } // #endif if (infor['data']['msg'] == '产品错误' || infor['data']['msg'] == '产品不存在') { diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html index aaddf4b..544c727 100644 --- a/unpackage/dist/build/web/index.html +++ b/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@