diff --git a/env/env.js b/env/env.js index a3abd48..b6ffccb 100644 --- a/env/env.js +++ b/env/env.js @@ -1,11 +1,11 @@ module.exports = { DEV: { - URL_PREFIX: 'http://116.255.223.226:8081/nsgk_test', + URL_PREFIX: '192.168.31.228:8080/', }, PRE: { - URL_PREFIX: 'http://116.255.223.226:8081/nsgk_test', + URL_PREFIX: 'http://192.168.31.196:3318/rural_collective_assetes', }, PROD: { - URL_PREFIX: 'http://116.255.223.226:8081/nsgk_test', + URL_PREFIX: 'http://192.168.31.196:3318/rural_collective_assetes', } } \ No newline at end of file diff --git a/pages/user/login/login.js b/pages/user/login/login.js index 35c3b65..3a2563d 100644 --- a/pages/user/login/login.js +++ b/pages/user/login/login.js @@ -19,6 +19,7 @@ Page({ let automatic = STORAGE.getToken(); let getOpenId = STORAGE.getOpenId(); if(automatic == '' && getOpenId ==''){ + console.log(); UTIL.getCOdeFromWX({ complate: (code) => { let sendData = { @@ -36,9 +37,9 @@ Page({ } }); }else{ - wx.navigateTo({ - url: '/pages/index/index', - }) + // wx.navigateTo({ + // url: '/pages/index/index', + // }) } }, //用户隐私协议选项 diff --git a/project.config.json b/project.config.json index a857e90..2e9d4b1 100644 --- a/project.config.json +++ b/project.config.json @@ -1,40 +1,4 @@ { - "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "packOptions": { - "ignore": [ - { - "value": ".eslintrc.js", - "type": "file" - } - ], - "include": [] - }, - "setting": { - "urlCheck": false, - "es6": true, - "enhance": true, - "postcss": true, - "preloadBackgroundData": false, - "minified": true, - "newFeature": false, - "coverView": true, - "nodeModules": false, - "autoAudits": false, - "showShadowRootInWxmlPanel": true, - "scopeDataCheck": false, - "uglifyFileName": false, - "checkInvalidKey": true, - "checkSiteMap": false, - "uploadWithSourceMap": true, - "compileHotReLoad": false, - "lazyloadPlaceholderEnable": false, - "useMultiFrameRuntime": true, - "useApiHook": true, - "useApiHostProcess": true, - "babelSetting": { - "ignore": [], - "disablePlugins": [], - "outputPath": "", "description": "项目配置文件,详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "packOptions": { "ignore": [ @@ -45,46 +9,47 @@ ], "include": [] }, - "useIsolateContext": true, - "userConfirmedBundleSwitch": false, - "packNpmManually": false, - "packNpmRelationList": [], - "minifyWXSS": true, - "disableUseStrict": false, - "minifyWXML": true, - "showES6CompileOption": false, - "useCompilerPlugins": false, - "ignoreUploadUnusedFiles": true, - "useStaticServer": true - }, - "compileType": "miniprogram", - "libVersion": "2.23.2", - "appid": "wxaace54cc2cf8924b", - "projectname": "WXMB", - "condition": { - "search": { - "list": [] + "setting": { + "urlCheck": false, + "es6": true, + "enhance": true, + "postcss": true, + "preloadBackgroundData": false, + "minified": true, + "newFeature": false, + "coverView": true, + "nodeModules": false, + "autoAudits": false, + "showShadowRootInWxmlPanel": true, + "scopeDataCheck": false, + "uglifyFileName": false, + "checkInvalidKey": true, + "checkSiteMap": false, + "uploadWithSourceMap": true, + "compileHotReLoad": false, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" }, - "conversation": { - "list": [] - }, - "game": { - "list": [] - }, - "plugin": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] - } - } - }, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 - } - + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "disableUseStrict": false, + "showES6CompileOption": false, + "useCompilerPlugins": false, + "ignoreUploadUnusedFiles": true, + "minifyWXML": true + }, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, + "condition": {} } \ No newline at end of file