From 36ffb27f2c817352cc69c78690dc98a86f0caae6 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Mon, 22 Aug 2022 15:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/bank/add/add.wxml | 1 +
pages/bank/bank.js | 2 +-
pages/bank/bank.wxml | 2 +-
pages/payee/add/add.js | 63 +++++++-----------
pages/payee/add/add.wxml | 137 ++++++++++++++++++++-------------------
pages/payee/index.js | 6 +-
pages/payee/list/list.js | 10 +--
7 files changed, 105 insertions(+), 116 deletions(-)
diff --git a/pages/bank/add/add.wxml b/pages/bank/add/add.wxml
index 6232c96..b82269c 100644
--- a/pages/bank/add/add.wxml
+++ b/pages/bank/add/add.wxml
@@ -19,6 +19,7 @@
+
保存
diff --git a/pages/bank/bank.js b/pages/bank/bank.js
index 1a94f1a..09dc78b 100644
--- a/pages/bank/bank.js
+++ b/pages/bank/bank.js
@@ -66,7 +66,7 @@ Page({
if (response.code == API.SUCCESS_CODE) {
for (let i = 0; i < response.rows.length; i++) {
response.rows[i].bankTypeText = UTIL.getTransform(response.rows[i].bankType,res.data);
- response.rows[i].payeePaymentLines = response.rows[i].payeePaymentLines.substr(0,4)+'****'
+ // response.rows[i].payeePaymentLines = response.rows[i].payeePaymentLines.substr(0,4)+'****'
}
that.setData({
depositList:response.rows
diff --git a/pages/bank/bank.wxml b/pages/bank/bank.wxml
index 31efe6b..d421358 100644
--- a/pages/bank/bank.wxml
+++ b/pages/bank/bank.wxml
@@ -28,7 +28,7 @@
{{item.sheng+item.shi}}
- 联行号：{{item.payeePaymentLines}}
+ {{item.payeePaymentLines}}
diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js
index 17ca0c8..237e485 100644
--- a/pages/payee/add/add.js
+++ b/pages/payee/add/add.js
@@ -92,52 +92,33 @@ Page({
onReady() {
},
-
+ bindKeyInput(e){
+ console.log(e.detail);
+ var that = this;
+ var str = e.detail.value;
+ var numArr = str.match(/\d+/g)
+ var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
+ if (numArr) {
+ numArr.map(rr=>{
+ if (rr.length>16) {
+ console.log(rr);
+ console.log(UTIL.isBankCard(rr));
+ const carId = UTIL.isBankCard(rr);
+ if (carId) {
+ that.setData({
+ ["form.payee"]:nameArr,
+ ["form.payeeAccount"]:rr
+ })
+ }
+ }
+ })
+ }
+ },
/**
* 生命周期函数--监听页面显示
*/
onShow() {
//6217002190007972186庞东旭,,,,, 山东省威海市文登区XXXXXX
- var that = this;
- wx.getClipboardData({
- success (res){
- console.log(res.data)
- var str = res.data;
- var numArr = str.match(/\d+/g)
- var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
- //直接输出
- console.log("直接输出："+numArr)
- console.log("直接输出："+nameArr)
- if (numArr) {
- numArr.map(rr=>{
- if (rr.length>16) {
- console.log(rr);
- console.log(UTIL.isBankCard(rr));
- const carId = UTIL.isBankCard(rr);
- if (carId) {
- wx.showModal({
- title: '提示',
- content: '检测到粘贴板中可能包含收款方及收款账号，是否自动填充？',
- success (res2) {
- if (res2.confirm) {
- that.setData({
- ["form.payee"]:nameArr,
- ["form.payeeAccount"]:rr
- })
- console.log('用户点击确定')
- } else if (res2.cancel) {
- console.log('用户点击取消')
- }
- }
- })
- }
- }
- })
- }
-
- }
- })
-
},
back:function(){
wx.navigateBack({
diff --git a/pages/payee/add/add.wxml b/pages/payee/add/add.wxml
index 2621ca9..e78ffee 100644
--- a/pages/payee/add/add.wxml
+++ b/pages/payee/add/add.wxml
@@ -4,79 +4,82 @@
{{projectId?"修改":"新增"}}收款方
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
- 公户
- 私户
-
-
-
+
+
+
+ 公户
+ 私户
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
保存
\ No newline at end of file
diff --git a/pages/payee/index.js b/pages/payee/index.js
index f621493..d4170ce 100644
--- a/pages/payee/index.js
+++ b/pages/payee/index.js
@@ -55,7 +55,8 @@ Page({
var payeeType = that.data.payeeType;
var list = [];
array.map(res=>{
- res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+ res.payeeAccountText = res.payeeAccount;
res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
if(payeeType == 2 && array.length>0){
if(res.payeeType == 4 || res.payeeType == 3 ){
@@ -109,7 +110,8 @@ Page({
var payeeType = that.data.payeeType;
var list = [];
array.map(res=>{
- res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+ res.payeeAccountText = res.payeeAccount;
res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
if(payeeType == 2 && array.length>0){
if(res.payeeType == 4 || res.payeeType == 3 ){
diff --git a/pages/payee/list/list.js b/pages/payee/list/list.js
index d51623d..a975751 100644
--- a/pages/payee/list/list.js
+++ b/pages/payee/list/list.js
@@ -49,7 +49,8 @@ Page({
let array = res.rows ;
var list = [];
res.rows.map(res3=>{
- res3.payeeAccountText = res3.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+ res3.payeeAccountText = res3.payeeAccount;
res3.bankTypeText = UTIL.getTransform(res3.bankType,that.data.bankTypeOptions);
list.push(res3)
@@ -102,7 +103,8 @@ Page({
var payeeType = that.data.payeeType;
var list = [];
array.map(res=>{
- res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+ res.payeeAccountText = res.payeeAccount;
res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;
list.push(res)
})
@@ -138,8 +140,8 @@ Page({
return;
}
array.map(res=>{
-
- res.payeeAccountText = res.payeeAccount.replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2");
+ // .replace(/^(.{6})(?:\d+)(.{4})$/,"\$1****\$2")
+ res.payeeAccountText = res.payeeAccount;
console.log(that.data.bankTypeOptions);
res.bankTypeText = (that.data.bankTypeOptions.filter(function (e) { return e.dictValue == res.bankType; }))[0].dictLabel;