diff --git a/pages/home/index.js b/pages/home/index.js index c2600b9..41cada8 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -147,21 +147,21 @@ Page({ this.setData({ state: state }) - if (state == 3) { - wx.showToast({ - title: '暂未开放,敬请期待', - icon: 'none', - duration: 2000 - }) - let list = [{ - longitude: this.data.longitude, - latitude: this.data.latitude - }]; - this.setData({ - includePoints: list - }) - return; - } + // if (state == 3) { + // wx.showToast({ + // title: '暂未开放,敬请期待', + // icon: 'none', + // duration: 2000 + // }) + // let list = [{ + // longitude: this.data.longitude, + // latitude: this.data.latitude + // }]; + // this.setData({ + // includePoints: list + // }) + // return; + // } // this.getLngLat(); this.getLocation(); }, @@ -177,7 +177,7 @@ Page({ url: `/pages/basketballGym/index?id=${e.markerId}`, }) } - if (this.data.state == 2) { + if (this.data.state == 2 || this.data.state == 3) { wx.navigateTo({ url: `/pages/gymnasium/index?id=${e.markerId}`, }) @@ -203,19 +203,6 @@ Page({ }) }, - //扫描二维码 - sacnQRCode() { - wx.scanCode({ - success (res) { - wx.showToast({ - title: res.result, - icon: 'none', - duration: 5000 - }) - } - }) - }, - // 跳转个人中心 pushMine() { if (this.data.unClickBtn) { @@ -366,13 +353,13 @@ Page({ // 东 longitude: 121.7051696777, latitude: 31.2750297303 - }, + }, { // 南 longitude: 121.4167785645, latitude: 31.0317548780 }, - { + { // 西 longitude: 121.2135314941, latitude: 31.2433336586 @@ -512,4 +499,4 @@ function GetDistance(lat1, lng1, lat2, lng2) { s = Math.round(s * 1000) / 1; //单位修改为米,取整 //s=s.toFixed(4); return s; -} \ No newline at end of file +} diff --git a/pages/sportsGroundList/index.js b/pages/sportsGroundList/index.js index 337eed1..f94a717 100644 --- a/pages/sportsGroundList/index.js +++ b/pages/sportsGroundList/index.js @@ -99,7 +99,7 @@ Page({ url: `/pages/basketballGym/index?id=${id}`, }) } - if (this.data.state == 2) { + if (this.data.state == 2 || this.data.state == 3) { wx.navigateTo({ url: `/pages/gymnasium/index?id=${id}`, }) @@ -131,12 +131,12 @@ Page({ venues: list, isShowNewplot: true }) - if (this.data.state == 3) { - wx.showToast({ - title: '暂未开放,敬请期待', - icon: 'none', - }) - } + // if (this.data.state == 3) { + // wx.showToast({ + // title: '暂未开放,敬请期待', + // icon: 'none', + // }) + // } wx.stopPullDownRefresh(); }, err => { wx.stopPullDownRefresh(); diff --git a/project.config.json b/project.config.json index 9114597..8c33395 100644 --- a/project.config.json +++ b/project.config.json @@ -1,58 +1,55 @@ { - "description": "项目配置文件。", - "packOptions": { - "ignore": [] - }, - "setting": { - "urlCheck": false, - "es6": true, - "enhance": false, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": true, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": true, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "" - }, - "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false - }, - "compileType": "miniprogram", - "libVersion": "2.10.2", - "appid": "wx73eb8a9ed10a029d", - "projectname": "%E6%99%BA%E6%85%A7%E4%BA%91%E9%A6%86", - "isGameTourist": false, - "simulatorType": "wechat", - "simulatorPluginLibVersion": {}, - "condition": { - "search": { - "current": -1, - "list": [] - }, - "conversation": { - "current": -1, - "list": [] - }, - "game": { - "currentL": -1, - "list": [] - }, - "miniprogram": { - "current": -1, - "list": [] - } - } + "description": "项目配置文件。", + "packOptions": { + "ignore": [] + }, + "setting": { + "urlCheck": false, + "es6": true, + "enhance": false, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": true, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": true, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useIsolateContext": true, + "useCompilerModule": true, + "userConfirmedUseCompilerModuleSwitch": false + }, + "compileType": "miniprogram", + "libVersion": "2.10.2", + "appid": "wx73eb8a9ed10a029d", + "projectname": "%E6%99%BA%E6%85%A7%E4%BA%91%E9%A6%86", + "isGameTourist": false, + "simulatorType": "wechat", + "simulatorPluginLibVersion": {}, + "condition": { + "search": { + "list": [] + }, + "conversation": { + "list": [] + }, + "game": { + "currentL": -1, + "list": [] + }, + "miniprogram": { + "list": [] + } + } } \ No newline at end of file