diff --git a/app.js b/app.js index 50d308b..fd33424 100644 --- a/app.js +++ b/app.js @@ -319,12 +319,12 @@ App({ that.globalData.roleOf132 = res.data.data.roleOf132; that.globalData.roleOf142 = res.data.data.roleOf142; that.globalData.managerRoleClassify = res.data.data.managerRoleClassify; - that.globalData.header.Cookie = "JSESSIONID=" + res.data.data.sessionId; - that.globalData.header2.Cookie = "JSESSIONID=" + res.data.data.sessionId; - that.globalData.headers.Cookie = "JSESSIONID=" + res.data.data.sessionId; - // that.globalData.header.Authorization = "Bearer " + res.data.data.token; - // that.globalData.header2.Authorization = "Bearer " + res.data.data.token; - // that.globalData.headers.Authorization = "Bearer " + res.data.data.token; + // that.globalData.header.Cookie = "JSESSIONID=" + res.data.data.sessionId; + // that.globalData.header2.Cookie = "JSESSIONID=" + res.data.data.sessionId; + // that.globalData.headers.Cookie = "JSESSIONID=" + res.data.data.sessionId; + that.globalData.header.Authorization = "Bearer " + res.data.data.token; + that.globalData.header2.Authorization = "Bearer " + res.data.data.token; + that.globalData.headers.Authorization = "Bearer " + res.data.data.token; that.globalData.remoteHeaders.Cookie = "JSESSIONID=" + res.data.data.remoteSessionId; that.globalData.isLogin = true; that.globalData.read = res.data.data.read; diff --git a/app.json b/app.json index 8da48f0..348d838 100644 --- a/app.json +++ b/app.json @@ -140,9 +140,7 @@ ] } ], - "requiredPrivateInfos": [ - "chooseLocation" - ], + "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#ffffff", diff --git a/pages/jobDetail/index.js b/pages/jobDetail/index.js index 0032f18..367ab6c 100644 --- a/pages/jobDetail/index.js +++ b/pages/jobDetail/index.js @@ -415,7 +415,12 @@ Page({ // var title1 = result.store.aliasName; // that.data.logo2 // var telStr = result.storeJob.onSiteInfo; - var telN = result.storeJob.onSiteInfo.split("\n"); + var telN = "" + if(result.storeJob.onSiteInfo.includes(",")){ + telN = result.storeJob.onSiteInfo.split(","); + }else{ + telN = result.storeJob.onSiteInfo.split("\n"); + } that.data.telStr = []; // console.log(result.storeJob.onSiteInfo.split("\n")); telN.forEach((item, index) => {