From ecd31b84963464621035a5c1061f16a021132917 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Wed, 30 Mar 2022 16:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- env/env.js | 2 +- pages/apply/index.js | 15 +++++ pages/apply/index.wxml | 2 +- pages/index/index.js | 30 +++++++++ pages/index/index.wxml | 4 +- project.config.json | 145 ++++++++++++++++++++--------------------- 7 files changed, 123 insertions(+), 78 deletions(-) diff --git a/app.json b/app.json index dde626f..9d5e40a 100644 --- a/app.json +++ b/app.json @@ -5,7 +5,8 @@ "pages/handle/liist", "pages/handle/expenditureAudit/expenditureAudit", "pages/apply/index", - "pages/apply/paymentTemplate/paymentTemplate" + "pages/apply/paymentTemplate/paymentTemplate", + "pages/inCome/inCome" ], "window": { "backgroundTextStyle": "light", diff --git a/env/env.js b/env/env.js index a3abd48..2bc2e93 100644 --- a/env/env.js +++ b/env/env.js @@ -1,6 +1,6 @@ module.exports = { DEV: { - URL_PREFIX: 'http://116.255.223.226:8081/nsgk_test', + URL_PREFIX: 'http://http://192.168.31.228:8080', }, PRE: { URL_PREFIX: 'http://116.255.223.226:8081/nsgk_test', diff --git a/pages/apply/index.js b/pages/apply/index.js index f7a147c..9454968 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -15,6 +15,21 @@ Page({ */ onLoad: function (options) { + }, + //跳转支出申请 +swichPaymentApply:function(e){ + console.log(e.currentTarget.dataset.current); + // let cur = e.currentTarget.dataset.current; + // if (this.data.currentTaB == cur) { + // return false; + // }else{ + // wx.navigateTo({ + // url: '../inCome/index?id=' + id, + // }) + // } + wx.navigateTo({ + url: '../handle/expenditureAudit/expenditureAudit?', + }) }, openBox:function(){ var that = this ; diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml index 5760725..dd91b73 100644 --- a/pages/apply/index.wxml +++ b/pages/apply/index.wxml @@ -58,7 +58,7 @@ 支付模板 - 下一步 + 下一步 diff --git a/pages/index/index.js b/pages/index/index.js index 1b46b05..eb501a0 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -16,6 +16,36 @@ Page({ //获取滚动条高度 this.computeBarLocation(); }, + //跳转收入登记 +swichInCome:function(e){ + console.log(e.currentTarget.dataset.current); + // let cur = e.currentTarget.dataset.current; + // if (this.data.currentTaB == cur) { + // return false; + // }else{ + // wx.navigateTo({ + // url: '../inCome/index?id=' + id, + // }) + // } + wx.navigateTo({ + url: '../inCome/inCome?', + }) + }, + //跳转支出申请 +swichPayment:function(e){ + console.log(e.currentTarget.dataset.current); + // let cur = e.currentTarget.dataset.current; + // if (this.data.currentTaB == cur) { + // return false; + // }else{ + // wx.navigateTo({ + // url: '../inCome/index?id=' + id, + // }) + // } + wx.navigateTo({ + url: '../apply/index?', + }) + }, /* 计算bar 高度*/ computeBarLocation() { var that = this; diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4a0a49f..f193e7b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -32,13 +32,13 @@ - + 支出申请 - + diff --git a/project.config.json b/project.config.json index 5060023..0052a59 100644 --- a/project.config.json +++ b/project.config.json @@ -1,79 +1,78 @@ { - "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": [ + { + "value": ".eslintrc.js", + "type": "file" + } + ], + "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": true, + "lazyloadPlaceholderEnable": false, + "useMultiFrameRuntime": true, + "useApiHook": true, + "useApiHostProcess": true, + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + }, + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "disableUseStrict": false, + "minifyWXML": true, + "showES6CompileOption": false, + "useCompilerPlugins": false, + "ignoreUploadUnusedFiles": true }, - "conversation": { - "list": [] + "compileType": "miniprogram", + "libVersion": "2.23.2", + "appid": "wxaace54cc2cf8924b", + "projectname": "nsgk_wechat", + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 }, - "game": { - "list": [] - }, - "plugin": { - "list": [] - }, - "gamePlugin": { - "list": [] - }, - "miniprogram": { - "list": [] + "condition": { + "search": { + "list": [] + }, + "conversation": { + "list": [] + }, + "game": { + "list": [] + }, + "plugin": { + "list": [] + }, + "gamePlugin": { + "list": [] + }, + "miniprogram": { + "list": [] + } } - }, - "editorSetting": { - "tabIndent": "insertSpaces", - "tabSize": 2 - } } \ No newline at end of file