diff --git a/app.json b/app.json index f7616b5..cef32b6 100644 --- a/app.json +++ b/app.json @@ -41,7 +41,7 @@ "window": { "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#00AA00", - "navigationBarTitleText": "HC智慧小区" + "navigationBarTitleText": "融生活智慧社区" }, "tabBar": { "color": "#272636", diff --git a/constant/UrlConstant.js b/constant/UrlConstant.js index 01c2528..4d39d9d 100644 --- a/constant/UrlConstant.js +++ b/constant/UrlConstant.js @@ -7,9 +7,9 @@ // 服务器域名 -const baseUrl = 'https://app.demo.winqi.cn/'; +const baseUrl = 'https://xq.rshenstar.com/'; //const baseUrl = 'http://hc.demo.winqi.cn:8012/'; -const hcBaseUrl = 'https://hc.demo.winqi.cn'; +const hcBaseUrl = 'https://xq.rshenstar.com'; //获取环境 const getEnv = baseUrl + 'app/env/getEnv'; diff --git a/context/Java110Context.js b/context/Java110Context.js index c2a8f88..4d4dfc9 100644 --- a/context/Java110Context.js +++ b/context/Java110Context.js @@ -14,18 +14,18 @@ const factory = require('../factory/index.js'); * 获取请后台服务时的头信息 */ const getHeaders = function() { - let _userInfo = getUserInfo(); + //let _userInfo = getUserInfo(); let userId = '-1'; - if (_userInfo != null || _userInfo != undefined){ - userId = _userInfo.userId; - } + //if (_userInfo != null || _userInfo != undefined){ + // userId = _userInfo.userId; + //} return { - app_id: constant.app.appId, - transaction_id: util.core.wxuuid(), - req_time: util.date.getDateYYYYMMDDHHMISS(), - sign: '1234567', - user_id: userId, - cookie: '_java110_token_=' + wx.getStorageSync('token') + 'app-id': constant.app.appId, + 'transaction-id': util.core.wxuuid(), + 'req-time': util.date.getDateYYYYMMDDHHMISS(), + 'sign': '1234567', + 'user-id': userId, + 'cookie': '_java110_token_=' + wx.getStorageSync('token') } } /** diff --git a/factory/LoginFactory.js b/factory/LoginFactory.js index 6559b3e..3116386 100644 --- a/factory/LoginFactory.js +++ b/factory/LoginFactory.js @@ -77,7 +77,7 @@ class LoginFactory { url: constant.url.loginUrl, method: 'post', header: { - APP_ID: constant.app.appId + 'APP-ID': constant.app.appId }, data: { code: loginRes.code, // 临时登录凭证 diff --git a/pages/bindOwner/bindOwner.js b/pages/bindOwner/bindOwner.js index e903835..88c43fe 100644 --- a/pages/bindOwner/bindOwner.js +++ b/pages/bindOwner/bindOwner.js @@ -207,9 +207,17 @@ Page({ wx.showLoading({ title: '绑定中', }); + + let _userInfo = context.getUserInfo(); + let userId = '-1'; + if (_userInfo != null && _userInfo != undefined) { + userId = _userInfo.userId; + } + let _header = context.getHeaders(); + _header['user-id'] = userId; context.request({ url: constant.url.appUserBindingOwner, - header: context.getHeaders(), + header: _header, method: "POST", data: obj, //动态数据 success: function(res) { diff --git a/pages/index/index.json b/pages/index/index.json index a707c91..747e735 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "HC智慧家园", + "navigationBarTitleText": "融生活智慧社区", "backgroundColor": "#ffffff", "usingComponents": {} } \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4a3a16d..4a98482 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -3,7 +3,7 @@ diff --git a/project.config.json b/project.config.json index 376bbf5..b0462ac 100644 --- a/project.config.json +++ b/project.config.json @@ -29,7 +29,7 @@ "compileType": "miniprogram", "libVersion": "2.9.4", "isGameTourist": false, - "appid": "wxf83d66b0e9f5964d", + "appid": "wxfecd955f5ce1bb20", "projectname": "WechatOwnerService", "simulatorType": "wechat", "simulatorPluginLibVersion": {},