From e0342046691ad09062dc1143229a97743d4804fb Mon Sep 17 00:00:00 2001 From: pangdongxu <850374051@qq.com> Date: Mon, 4 Apr 2022 12:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/apply/index.js | 47 +++++++- pages/apply/index.wxml | 2 +- pages/apply/paymentTemplate/add/add.wxml | 1 - .../expenditureAudit/expenditureAudit.js | 6 +- .../expenditureAudit/expenditureAudit.wxml | 7 +- .../expenditureAudit/expenditureAudit.wxss | 19 +++ project.config.json | 110 +++++++++--------- utils/API.js | 8 ++ 8 files changed, 138 insertions(+), 62 deletions(-) diff --git a/pages/apply/index.js b/pages/apply/index.js index 9454968..3fc4662 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -7,7 +7,13 @@ Page({ */ data: { isIPX: app.globalData.isIPX, +<<<<<<< Updated upstream show:false +======= + show:false, + accountList:[], + bookName:'' +>>>>>>> Stashed changes }, /** @@ -28,7 +34,7 @@ swichPaymentApply:function(e){ // }) // } wx.navigateTo({ - url: '../handle/expenditureAudit/expenditureAudit?', + url: '/pages/apply/paymentTemplate/add/add', }) }, openBox:function(){ @@ -65,7 +71,44 @@ swichPaymentApply:function(e){ * 生命周期函数--监听页面显示 */ onShow: function () { - +<<<<<<< Updated upstream + +======= + var that = this; + var sendData = { + pageNum:'1', + pageSize:'100', + accountName:'', + bankAccountNumber:'', + status:'N', + method:'GET' + } + UTIL.httpRequest(API.URL_GET_GETINFO, {method:'GET'}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + this.setData({bookName:res.user.bookName}) + } + } + }) + UTIL.httpRequest(API.URL_GET_APPROVALITEMSLIST, {method:'GET',dataType:'1'}, { + success: (res) => { + if (res.code == API.SUCCESS_CODE) { + + } + } + }) + UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData,{ + success: (res) => { + for (let i = 0; i < res.rows.length; i++) { + res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ") + } + console.log(res.rows) + that.setData({ + accountList:res.rows + }) + } + }) +>>>>>>> Stashed changes }, /** diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml index f2abd81..7734e12 100644 --- a/pages/apply/index.wxml +++ b/pages/apply/index.wxml @@ -7,7 +7,7 @@ 付款单位 - 龙水镇龙洞村股份经济联合社 + {{bookName}} diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml index 569ad34..71f2c13 100644 --- a/pages/apply/paymentTemplate/add/add.wxml +++ b/pages/apply/paymentTemplate/add/add.wxml @@ -1,5 +1,4 @@ -pages/apply/paymentTemplate/add/add.wxml 支出申请 diff --git a/pages/handle/expenditureAudit/expenditureAudit.js b/pages/handle/expenditureAudit/expenditureAudit.js index 2419fee..8b2aeff 100644 --- a/pages/handle/expenditureAudit/expenditureAudit.js +++ b/pages/handle/expenditureAudit/expenditureAudit.js @@ -63,7 +63,11 @@ Page({ onShow: function () { }, - + back:function(){ + wx.navigateBack({ + delta: 1 + }) + }, /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxml b/pages/handle/expenditureAudit/expenditureAudit.wxml index 577779d..0e67bf7 100644 --- a/pages/handle/expenditureAudit/expenditureAudit.wxml +++ b/pages/handle/expenditureAudit/expenditureAudit.wxml @@ -1,8 +1,9 @@ - - - 支出申请 + + + 支出申请 + 审批事项 房屋出租整年费用 diff --git a/pages/handle/expenditureAudit/expenditureAudit.wxss b/pages/handle/expenditureAudit/expenditureAudit.wxss index b68c4ab..90c616f 100644 --- a/pages/handle/expenditureAudit/expenditureAudit.wxss +++ b/pages/handle/expenditureAudit/expenditureAudit.wxss @@ -17,6 +17,25 @@ text{display: block;} width: 100%; font-size: 16px; } +.pure_top { + width: 100%; + height: 120px; + position: absolute; + z-index: -1; + overflow: hidden +} + +.pure_top::after { + content: ''; + width: 140%; + height: 120px; + position: absolute; + left: -20%; + top: 0; + z-index: -1; + border-radius: 0 0 50% 50%; + background: linear-gradient(to right, #2C8E68, #B3DB62); +} .bgPage{ width: 140%; position:absolute; diff --git a/project.config.json b/project.config.json index 06f098c..d116a1a 100644 --- a/project.config.json +++ b/project.config.json @@ -1,57 +1,59 @@ { - - "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", - "packOptions": { - "ignore": [ - { - "value": ".eslintrc.js", - "type": "file" - } - ], - "include": [] + "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": "" }, - "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": "" - }, - "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": {} + "useIsolateContext": true, + "userConfirmedBundleSwitch": false, + "packNpmManually": false, + "packNpmRelationList": [], + "minifyWXSS": true, + "disableUseStrict": false, + "showES6CompileOption": false, + "useCompilerPlugins": false, + "ignoreUploadUnusedFiles": true, + "minifyWXML": true, + "useStaticServer": true + }, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + }, + "condition": {}, + "appid": "wxaace54cc2cf8924b", + "compileType": "miniprogram", + "libVersion": "2.23.2" } \ No newline at end of file diff --git a/utils/API.js b/utils/API.js index d1abc25..89f2f97 100644 --- a/utils/API.js +++ b/utils/API.js @@ -48,6 +48,9 @@ const URL_POST_USEREDIT = `${URL_PREFIX}/system/user/edit`; //当前账套付款账户列表 const URL_GET_ACCOUNTLIST = `${URL_PREFIX}/cashier/account/list`; +//查看事项审批模板列表 +const URL_GET_APPROVALITEMSLIST = `${URL_PREFIX}/yinnong/approvalItems/list`; + /****************接口地址end****************/ export { @@ -65,6 +68,7 @@ export { URL_POST_DECRYPTEDWXDATA, URL_POST_USERBAND, URL_GET_GETINFO, +<<<<<<< Updated upstream URL_GET_TASKLIST, URL_GET_TASKDONELIST, URL_GET_TRANSFERLIST, @@ -72,4 +76,8 @@ export { URL_POST_UPLOADFILE, URL_POST_USEREDIT, URL_GET_ACCOUNTLIST +======= + URL_GET_ACCOUNTLIST, + URL_GET_APPROVALITEMSLIST +>>>>>>> Stashed changes } \ No newline at end of file