diff --git a/App.vue b/App.vue index 4821ffd..80deaaa 100644 --- a/App.vue +++ b/App.vue @@ -38,9 +38,16 @@ requestNoAuth({ url: url.listSystemInfo, method: "GET", - data: _data, + data: { + page:1, + row:1 + }, success: function(res) { - reslove(res); + console.log(res.data); + if(res.data.data && res.data.data.length >0){ + uni.setStorageSync('java110SystemConfig',res.data.data[0]) + } + //reslove(res); }, fail: function(e) {} diff --git a/conf/config.js b/conf/config.js index d8cdb14..f0ea582 100644 --- a/conf/config.js +++ b/conf/config.js @@ -8,30 +8,40 @@ * @QQ 928255095 */ +let _systemConfig = uni.getStorageSync('java110SystemConfig'); + // #ifdef H5 // 服务器域名 公众号时,配置为 / 就可以 -const baseUrl = '/'; +let baseUrl = '/'; // #endif // 腾讯地图Key, h5使用 -const QQMapKey = ''; -const commonBaseUrl= 'http://wy.yxkj.ltd/'; +let QQMapKey = ''; +let commonBaseUrl= 'http://wy.yxkj.ltd/'; // #ifndef H5 //服务器域名 小程序 或者 app 时 后端地址 -const baseUrl = 'http://wy.yxkj.ltd/'; +let baseUrl = 'http://wy.yxkj.ltd/'; // #endif - //app支付时这里需要填写支付秘钥 -const appPayKey=""; +let appPayKey=""; -const logLevel="DEBUG"; // 日志级别 +let logLevel="DEBUG"; // 日志级别 + +let systemName="物业版"; + +if(_systemConfig){ + QQMapKey = _systemConfig.qqMapKey; + commonBaseUrl = _systemConfig.imgUrl; + systemName = _systemConfig.propertyTitle; +} export default{ baseUrl:baseUrl, logLevel:logLevel, appPayKey:appPayKey, commonBaseUrl: commonBaseUrl, - QQMapKey: QQMapKey + QQMapKey: QQMapKey, + systemName:systemName } \ No newline at end of file diff --git a/manifest.json b/manifest.json index 92bcfbb..2ab6363 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "HC掌上物业", + "name" : "物业版", "appid" : "__UNI__29E0560", "description" : "", "versionName" : "1.0.0", @@ -81,18 +81,18 @@ "disableHostCheck" : true, "proxy" : { "/app" : { - "target" : "http://property.homecommunity.cn", //目标接口域名http://192.168.1.16:8012 + "target" : "http://192.168.100.108:8088", //目标接口域名http://192.168.1.16:8012 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 }, "/callComponent" : { - "target" : "http://property.homecommunity.cn", //目标接口域名http://192.168.1.16:8012 + "target" : "http://192.168.100.108:8088", //目标接口域名http://192.168.1.16:8012 "changeOrigin" : true, //是否跨域 "secure" : true // 设置支持https协议的代理 } } }, "domain" : "http://property.homecommunity.cn", - "title" : "HC掌上物业" + "title" : "物业版" } } diff --git a/pages.json b/pages.json index 626aa7b..6440416 100644 --- a/pages.json +++ b/pages.json @@ -3,7 +3,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "HC掌上物业" + "navigationBarTitleText": "" } } ,{ @@ -549,7 +549,7 @@ ], "globalStyle": { "navigationBarTextStyle": "white", - "navigationBarTitleText": "HC掌上物业", + "navigationBarTitleText": "物业版", "navigationBarBackgroundColor": "#00AA00", "backgroundColor": "#00AA00", "onReachBottonDistance":50 diff --git a/pages/index/index.vue b/pages/index/index.vue index fe1a1ce..91c055b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -2,7 +2,7 @@ + :text="welcomeTitle">