diff --git a/app.js b/app.js index a5f224f..55de20f 100644 --- a/app.js +++ b/app.js @@ -1,5 +1,3 @@ -import checkoutVersion from './utils/checkVersion' - App({ onLaunch: function (options) { // 判断是否由分享进入小程序 @@ -20,8 +18,6 @@ App({ this.globalData.deviceInfo.navigationHeight = menuButtonInfo.height + (menuButtonInfo.top - res.statusBarHeight) * 2 } }) - // 检查版本更新 - checkoutVersion() }, globalData: { flag: false, diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js index b6705f9..2383b1b 100644 --- a/pages/indexNew/indexNew.js +++ b/pages/indexNew/indexNew.js @@ -4,6 +4,7 @@ var global = require('../../utils/config.js') import { getTimestamp } from '../../utils/common' +import checkoutVersion from '../../utils/checkVersion' Page({ data: { @@ -109,6 +110,8 @@ Page({ setTimeout(function() { that.getUserState() }, 700) + // 检查版本更新 + checkoutVersion() }, getBannerList: function() { let that = this diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index e50da0b..b761a0e 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.1.0' + const versionNum = '1.1.1' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index 59f0e42..0215a71 100644 --- a/project.config.json +++ b/project.config.json @@ -54,8 +54,8 @@ }, { "id": 1, - "name": "ceshi", - "pathName": "pages/formid/formid", + "name": "pages/indexNew/indexNew", + "pathName": "pages/indexNew/indexNew", "query": "gid=1175270967490244609", "scene": 1011 }, @@ -84,6 +84,7 @@ "id": -1, "name": "完善信息", "pathName": "pages/complete/complete", + "query": "", "scene": null } ]