diff --git a/pages/apply/approval/approval.js b/pages/apply/approval/approval.js
index 0bcabad..17d48b0 100644
--- a/pages/apply/approval/approval.js
+++ b/pages/apply/approval/approval.js
@@ -52,10 +52,13 @@ Page({
}
})
- array.splice(indexList,1)
+
console.log(array);
array.map((rrr,index)=>{
+ if(rrr.nickName == res2.user.nickName){
+ array.splice(indexList,1)
+ }
rrr.name = index+1
})
this.setData({
@@ -251,18 +254,22 @@ Page({
if (res.code == API.SUCCESS_CODE) {
let list = [];
console.log(res);
- let index ;
+ let indexList ;
for (let i = 0; i < res.data.length; i++) {
const element = res.data[i];
if(element.nickName == res2.user.nickName){
// res.data.splice(i,1);
- index = i ;
+ indexList = i ;
}else{
list.push(element.userId+"")
}
}
- res.data.splice(index,1)
res.data.map((rrr,index)=>{
+
+ if(rrr.nickName == res2.user.nickName){
+
+ res.data.splice(indexList,1)
+ }
rrr.name = index+1
})
console.log(list);
diff --git a/pages/apply/paymentTemplate/add/add.wxml b/pages/apply/paymentTemplate/add/add.wxml
index 086eee1..070f102 100644
--- a/pages/apply/paymentTemplate/add/add.wxml
+++ b/pages/apply/paymentTemplate/add/add.wxml
@@ -223,14 +223,14 @@
收款方信息
-
+
diff --git a/pages/apply/paymentTemplate/add/add.wxss b/pages/apply/paymentTemplate/add/add.wxss
index 3747edd..4c6c687 100644
--- a/pages/apply/paymentTemplate/add/add.wxss
+++ b/pages/apply/paymentTemplate/add/add.wxss
@@ -67,7 +67,6 @@ text{display: block;}
}
.topBox .van-cell .van-cell__title, .topBox .van-cell .van-cell__value , .topBox .van-cell .van-field__label{
font-size: 15px;
- color: #000000!important;
}
.topBox .van-cell .van-cell__title{
margin-right: 0!important;
diff --git a/pages/drawee/drawee.js b/pages/drawee/drawee.js
index 60de06d..7f6a4e9 100644
--- a/pages/drawee/drawee.js
+++ b/pages/drawee/drawee.js
@@ -15,6 +15,7 @@ Page({
accountListXJ:[],
showDialog:false,
projectId:'',
+ bankName:'',
beforeClose(action) {
return new Promise((resolve) => {
setTimeout(() => {
@@ -233,7 +234,12 @@ swichPaymentApply:function(e){
},
showDialog(e){
var that = this ;
- that.setData({showDialog:true,projectId:e.currentTarget.dataset.id})
+ that.setData({
+ showDialog:true,
+ projectId:e.currentTarget.dataset.id,
+ bankName:e.currentTarget.dataset.name,
+ id: '' ,
+ password: '',})
},
//支付口令修改
edit(e){
@@ -262,8 +268,6 @@ swichPaymentApply:function(e){
})
that.setData({
showDialog : false,
- id: '' ,
- accountPassword: '',
})
}else if(res.code == "403"){
wx.showToast({
@@ -271,6 +275,9 @@ swichPaymentApply:function(e){
icon: 'error',
duration: 2000
})
+ that.setData({
+ showDialog : false,
+ })
}else{
wx.showToast({
title: "系统错误",
diff --git a/pages/drawee/drawee.wxml b/pages/drawee/drawee.wxml
index 8d254e3..7617d99 100644
--- a/pages/drawee/drawee.wxml
+++ b/pages/drawee/drawee.wxml
@@ -28,7 +28,7 @@
{{item.balance}}
-
+
@@ -105,7 +105,8 @@
before-close="{{beforeClose }}"
closeOnClickOverlay="{{ true }}"
>
-
+ {{bankName}}
+
提示:\n此口令为银农直联平台支付人员权限的验证!\n至少6个字符,必须包括字母、数字和符号
diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js
index 75a0406..e8d55cc 100644
--- a/pages/payee/add/add.js
+++ b/pages/payee/add/add.js
@@ -162,14 +162,9 @@ Page({
title: '正在保存',
mask:true
})
- if(that.data.form.bankType == ''){
- wx.hideLoading();
- UTIL.showToastNoneIcon('请选择所属银行!');
- return;
- }
if(that.data.form.payee == ''){
wx.hideLoading();
- UTIL.showToastNoneIcon('请填写户名!');
+ UTIL.showToastNoneIcon('请填写收款方!');
return;
}
if(that.data.form.payeeAccount == ''){
@@ -187,6 +182,11 @@ Page({
UTIL.showToastNoneIcon('请选择账户类型!');
return;
}
+ if(that.data.form.bankType == ''){
+ wx.hideLoading();
+ UTIL.showToastNoneIcon('请选择所属银行!');
+ return;
+ }
if(that.data.form.bankDeposit == ''){
wx.hideLoading();
UTIL.showToastNoneIcon('请选择开户行!');