diff --git a/image/apply/ABC.png b/image/apply/ABC.png new file mode 100644 index 0000000..ad9676a Binary files /dev/null and b/image/apply/ABC.png differ diff --git a/image/apply/CCB.png b/image/apply/CCB.png new file mode 100644 index 0000000..441d754 Binary files /dev/null and b/image/apply/CCB.png differ diff --git a/image/apply/ICBC.png b/image/apply/ICBC.png new file mode 100644 index 0000000..eea2dab Binary files /dev/null and b/image/apply/ICBC.png differ diff --git a/image/apply/RCB.png b/image/apply/RCB.png new file mode 100644 index 0000000..5c39d59 Binary files /dev/null and b/image/apply/RCB.png differ diff --git a/pages/apply/index.js b/pages/apply/index.js index 1e49cb3..99ed469 100644 --- a/pages/apply/index.js +++ b/pages/apply/index.js @@ -47,9 +47,9 @@ swichPaymentApply:function(e){ show: false, }) }, - goTemplate:function(){ + goTemplate:function(e){ wx.navigateTo({ - url: 'paymentTemplate/paymentTemplate' + url: 'paymentTemplate/paymentTemplate?id='+e.currentTarget.dataset.id }) }, diff --git a/pages/apply/index.wxml b/pages/apply/index.wxml index 962c7c8..7fcbc56 100644 --- a/pages/apply/index.wxml +++ b/pages/apply/index.wxml @@ -13,31 +13,22 @@ - - 一般户 - - - - - 6217 0021 9000 7972 186卡号 - 可用余额 - 10,288.83 - - - - + 一般户 - - - - 6217 0021 9000 7972 186卡号 + + + + {{item.bankType == 1 ? '中国银行':item.bankType == 2 ? '农商行(山东省)':item.bankType == 3 ? '农业银行':item.bankType == 4 ? '建设银行':''}} + + + {{item.bankAccountNumber}}卡号 可用余额 - 10,288.83 + {{item.balance}} - + @@ -63,7 +54,7 @@ - + {{item.templateName}}默认 diff --git a/pages/apply/index.wxss b/pages/apply/index.wxss index a0d02b2..f61fe60 100644 --- a/pages/apply/index.wxss +++ b/pages/apply/index.wxss @@ -26,7 +26,7 @@ color: #fff; } .main{ - width: 94%; + width: 100%; margin: 0 auto; margin-top: 3vw; } @@ -37,13 +37,38 @@ .bank_content{ color: #fff; - background:linear-gradient(to right, #176AB7, #318DE5); width: 100%; - border-radius: 10px; - /* height: 100%; */ - padding: 2vh 2vh 3vh; + padding: 2vh; +} + +.ICBC{ + background:url('http://192.168.31.196:81/bj/bg_ICBC.png') no-repeat center; + background-size: 100% 100%; +} +.ABC{ + background:url('http://192.168.31.196:81/bj/bg_ABC.png') no-repeat center; + background-size: 100% 100%; +} +.CCB{ + background:url('http://192.168.31.196:81/bj/bg_CCB.png') no-repeat center; + background-size: 100% 100%; +} +.RCB{ + background:url('http://192.168.31.196:81/bj/bg_RCB.png') no-repeat center; + background-size: 100% 100%; } +.bankName{ + margin-top: 0!important; +} +.bankName image{ + vertical-align: middle; + margin-right: 5px; +} +.bankName text{ + margin: 0!important; + display: inline-block; +} .bank_content view{ margin-top: 1vh; } @@ -55,6 +80,11 @@ .bank_box{ position: relative; + box-shadow: 0px 5px 9px #ccc; + overflow: hidden; + border-radius: 15px; + width: 94%; + margin: 0 auto; margin-top: 20px; } .zt { diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js index 89272e3..e0eaec9 100644 --- a/pages/apply/paymentTemplate/add/add.js +++ b/pages/apply/paymentTemplate/add/add.js @@ -520,8 +520,13 @@ Page({ 'Authorization':'Bearer '+getApp().globalData.userInfo.token }, formData:element, - success (res){ + success (response){ console.log(res); + if((i+1) == that.data.fileForm.length){ + wx.navigateTo({ + url: '/pages/apply/approval/approval?id='+res.data.id, + }) + } }, fail(res){ console.log(res) diff --git a/pages/apply/paymentTemplate/paymentTemplate.js b/pages/apply/paymentTemplate/paymentTemplate.js index 7273b79..5cfe14e 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.js +++ b/pages/apply/paymentTemplate/paymentTemplate.js @@ -1,4 +1,6 @@ // pages/apply/paymentTemplate/paymentTemplate.js +import * as UTIL from '../../../utils/util.js'; +import * as API from '../../../utils/API.js'; const app = getApp(); Page({ @@ -7,7 +9,8 @@ Page({ */ data: { isIPX: app.globalData.isIPX, - show: false + show: false, + form:{} }, showPopup() { this.setData({ show: true }); @@ -31,7 +34,19 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + var that = this ; + UTIL.httpRequest(API.URL_GET_APPROVALITEMSBYID + options.id, {method:'GET'}, { + success: (res) => { + let transList = res.data.transfers; + transList.forEach(item => { + item.num = UTIL.convertToChinaNum(transList.length) + }); + res.data.transfers = transList + that.setData({ + form:res.data + }); + } + }) }, /** diff --git a/pages/apply/paymentTemplate/paymentTemplate.wxml b/pages/apply/paymentTemplate/paymentTemplate.wxml index 3fb239c..eb00c06 100644 --- a/pages/apply/paymentTemplate/paymentTemplate.wxml +++ b/pages/apply/paymentTemplate/paymentTemplate.wxml @@ -6,29 +6,29 @@ 审批事项 - + 支出总金额 - 提交单位:龙华村联合社 - 提交日期:2022年1月18日 - 提 交 人:报账员 - 联系电话:13906311234 + 提交单位:{{form.submitCompany}} + 提交日期:{{form.submitDate}} + 提 交 人:{{form.submitter}} + 联系电话:{{form.telephone}} - -事项一 + +事项{{item.num}} 支出金额 - + - + 事由: - + - + @@ -39,6 +39,8 @@ + + diff --git a/project.private.config.json b/project.private.config.json index 7fb9557..c9b84ca 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -35,7 +35,7 @@ { "name": "支出模板查看", "pathName": "pages/apply/paymentTemplate/paymentTemplate", - "query": "", + "query": "id=32", "launchMode": "default", "scene": null }, diff --git a/utils/API.js b/utils/API.js index c0191a6..4c0ba61 100644 --- a/utils/API.js +++ b/utils/API.js @@ -161,7 +161,6 @@ export { URL_POST_APPROVALITEMSEDIT, URL_POST_TEMPLATEEDIT, URL_POST_APPROVALITEMSSUBMIT, - URL_GET_SELECTACCOUNTLIST, URL_GET_MONEYORDERLIST, URL_GET_PAYEESELECTLIST, URL_GET_DEPOSITLIST,