diff --git a/config/app.js b/config/app.js index dfe0acc..ea49652 100644 --- a/config/app.js +++ b/config/app.js @@ -1,5 +1,5 @@ // 开发者环境:开|关 -const SWITCH_DEVELOPMENT = true +const SWITCH_DEVELOPMENT = false /** S 是否H5端 **/ // #ifdef H5 @@ -20,7 +20,7 @@ const baseURLMap = { // 生产环境 // production: IS_H5 ? location.origin : 'http://125.35.93.94:8986' // 生产环境 - production: IS_H5 ? location.origin : 'https://test.jichengshanshui.com.cn:28303' + production: IS_H5 ? location.origin : 'https://yuanlin.jichengshanshui.com.cn:8987' } @@ -33,6 +33,7 @@ export const version = '1.0.6' // export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' export const uploadURL = baseURL + '/ylapi/yuanl/common/upload' // export const OSSURL = baseURL + '/yuanlin/' -export const OSSURL = 'https://test.jichengshanshui.com.cn:28310/yuanlin/' +export const OSSURL = 'https://yuanlin.jichengshanshui.com.cn:8987/yuanlin/' +// https://img.jichengshanshui.com.cn:28207 // https://yuanlin.jichengshanshui.com.cn:8987/yuanlin/ \ No newline at end of file diff --git a/pages.json b/pages.json index bb8c94f..a9c0d19 100644 --- a/pages.json +++ b/pages.json @@ -1,20 +1,21 @@ { "pages": [ { - "path": "pages/work/index", + "path": "pages/index", "style": { - "navigationBarTitleText": "工作台", + "navigationBarTitleText": "首页", "navigationStyle": "custom" } }, { - "path": "pages/index", + "path": "pages/work/index", "style": { - "navigationBarTitleText": "首页", + "navigationBarTitleText": "工作台", "navigationStyle": "custom" } }, + { "path": "pages/mine/index", "style": { diff --git a/pages/index.vue b/pages/index.vue index e6ce692..d2fd23b 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -61,7 +61,7 @@ - + @@ -140,7 +140,7 @@ export default { }, onLoad() { this.getUserInfo() - this.upgradation() + // this.upgradation() this.getSummary(this.summaryDate) this.getSummaryType(this.summaryType) this.getStaffSummary(this.staffSummary) diff --git a/pages/work/daily/maintain/subList.vue b/pages/work/daily/maintain/subList.vue index 29f82c3..d8bdd22 100644 --- a/pages/work/daily/maintain/subList.vue +++ b/pages/work/daily/maintain/subList.vue @@ -1,6 +1,6 @@