diff --git a/conf/config.js b/conf/config.js index f0ea582..8fa5655 100644 --- a/conf/config.js +++ b/conf/config.js @@ -43,5 +43,6 @@ export default{ appPayKey:appPayKey, commonBaseUrl: commonBaseUrl, QQMapKey: QQMapKey, + imgUrl:commonBaseUrl, systemName:systemName } \ No newline at end of file diff --git a/main.js b/main.js index fe2c35e..bdaee0f 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,6 @@ import Vue from 'vue' import App from './App' +import conf from './conf/config.js'; import Java110Context from './lib/java110/Java110Context.js' import context from './lib/java110/context.js' import url from './constant/url.js' @@ -25,6 +26,7 @@ Vue.prototype.url = url; Vue.prototype.factory = factory; Vue.prototype.util = util; Vue.prototype.date = date; +Vue.prototype.imgUrl = conf.imgUrl; App.mpType = 'app' diff --git a/pages.json b/pages.json index dc9c6a1..3c6f304 100644 --- a/pages.json +++ b/pages.json @@ -542,6 +542,15 @@ } } + ,{ + "path" : "pages/inspection/inspectionTodayReport", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTextStyle": "white", diff --git a/pages/index/index.vue b/pages/index/index.vue index 91c055b..82520a1 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,10 +1,10 @@