From 7747ee7e9349ef00156aba7e02086386813bcc84 Mon Sep 17 00:00:00 2001 From: Dragon <13925835632@139.com> Date: Mon, 17 Jul 2023 15:27:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E5=A4=B4?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/peko/common/js/common2.js | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/view/peko/common/js/common2.js b/view/peko/common/js/common2.js index f7d30e7..4b4d835 100644 --- a/view/peko/common/js/common2.js +++ b/view/peko/common/js/common2.js @@ -763,19 +763,21 @@ function networkRequest (reqObj = {}, type) { pubInfo.deviceInfo = JSON.parse(pubInfo.deviceInfo); }; var browser = checkVersion(); - const pubHeader = { - app: type != 'yinbaos' ? pubInfo.deviceInfo.app : 'yinbao', - // app: 'peko', - // app: pubInfo.deviceInfo.app.indexOf('peko') != -1 ? 'peko' : 'PlanetStar', - appVersion: pubInfo.deviceInfo.appVersion || '', - os: pubInfo.deviceInfo.os || '', - os_version: pubInfo.deviceInfo.osVersion || '', - channel: pubInfo.deviceInfo.channel || '', - client: 'h5', - pub_uid: window.location.pathname.match(/login.html/) ? 0 : pubInfo.uid, - pub_ticket: pubInfo.ticket, - h5_token: pubInfo.ticket, - }; + const pubHeader = {}; + pubHeader.app = type != 'yinbaos' ? pubInfo.deviceInfo.app : 'yinbao' + // app: 'peko', + // app: pubInfo.deviceInfo.app.indexOf('peko') != -1 ? 'peko' : 'PlanetStar', + pubHeader.appVersion = pubInfo.deviceInfo.appVersion || '' + pubHeader.os = pubInfo.deviceInfo.os || '' + pubHeader.os_version = pubInfo.deviceInfo.osVersion || '' + pubHeader.channel = pubInfo.deviceInfo.channel || '' + pubHeader.client = 'h5' + pubHeader.pub_uid = window.location.pathname.match(/login.html/) ? 0 : pubInfo.uid + if (browser.app) { + pubHeader.pub_ticket = pubInfo.ticket + } else { + pubHeader.h5_token = pubInfo.ticket + } const url = reqObj.url; const commParams = objToParam(pubHeader); if (url.indexOf('?') >= 0) {