diff --git a/image/apply/icon_ABC.png b/image/apply/icon_ABC.png
index d8c00ef..666f5a7 100644
Binary files a/image/apply/icon_ABC.png and b/image/apply/icon_ABC.png differ
diff --git a/image/apply/icon_CCB.png b/image/apply/icon_CCB.png
index f9794f9..e870ef0 100644
Binary files a/image/apply/icon_CCB.png and b/image/apply/icon_CCB.png differ
diff --git a/image/apply/icon_RCB.png b/image/apply/icon_RCB.png
index 3e6f09a..5a2482d 100644
Binary files a/image/apply/icon_RCB.png and b/image/apply/icon_RCB.png differ
diff --git a/image/apply/icon_icbc.png b/image/apply/icon_icbc.png
index bc4f989..1aacffe 100644
Binary files a/image/apply/icon_icbc.png and b/image/apply/icon_icbc.png differ
diff --git a/image/apply/icon_other.png b/image/apply/icon_other.png
index 9d3d3cb..5c76167 100644
Binary files a/image/apply/icon_other.png and b/image/apply/icon_other.png differ
diff --git a/image/icon/icon_tjzb.png b/image/icon/icon_tjzb.png
index 2c7ac20..e69e871 100644
Binary files a/image/icon/icon_tjzb.png and b/image/icon/icon_tjzb.png differ
diff --git a/image/icon/icon_word.png b/image/icon/icon_word.png
index 7691fdb..f06d51d 100644
Binary files a/image/icon/icon_word.png and b/image/icon/icon_word.png differ
diff --git a/image/icon/icon_zs.png b/image/icon/icon_zs.png
index 8f83e04..7bb445d 100644
Binary files a/image/icon/icon_zs.png and b/image/icon/icon_zs.png differ
diff --git a/pages/contract/contract.js b/pages/contract/contract.js
index bfb59f8..162c734 100644
--- a/pages/contract/contract.js
+++ b/pages/contract/contract.js
@@ -129,11 +129,29 @@ Page({
})
},
delete(e){
- this.setData({
- 'itemId':e.currentTarget.dataset.id,
- 'itemIndex':e.currentTarget.dataset.index,
- "showPopupDel":true
- });
+ wx.showModal({
+ title: '提示',
+ content: '是否删除',
+ success (res) {
+ if (res.confirm) {
+ UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+e.currentTarget.dataset.id , {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let new_list = this.data.list
+ new_list.splice(e.currentTarget.dataset.index,1)
+ this.setData({'list':new_list})
+ UTIL.showToastNoneIcon('删除成功!');
+ }else{
+ UTIL.showToastNoneIcon('删除失败!');
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
+ }
+ })
+
},
cancelTemDel:function(e){
this.setData({
@@ -146,18 +164,7 @@ Page({
this.setData({
"showPopupDel":false
});
- UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
- success: (res) => {
- if(res.code==200){
- let new_list = this.data.list
- new_list.splice(this.data.itemIndex,1)
- this.setData({'list':new_list})
- UTIL.showToastNoneIcon('删除成功!');
- }else{
- UTIL.showToastNoneIcon('删除失败!');
- }
- }
- })
+
},
relevanceBack(){
let params = {
@@ -173,32 +180,53 @@ Page({
})
},
terminate(e){
- UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
- success: (res) => {
- if(res.code==200){
- let list = this.data.list
- list[e.currentTarget.dataset.index].contractionStatus = '3'
- this.setData({'list':list})
- UTIL.showToastNoneIcon('终止成功!');
- }else{
- UTIL.showToastNoneIcon('终止失败!: '+res.msg);
+ wx.showModal({
+ title: '提示',
+ content: '是否终止',
+ success (res) {
+ if (res.confirm) {
+ UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let list = this.data.list
+ list[e.currentTarget.dataset.index].contractionStatus = '3'
+ this.setData({'list':list})
+ UTIL.showToastNoneIcon('终止成功!');
+ }else{
+ UTIL.showToastNoneIcon('终止失败!: '+res.msg);
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消')
}
}
})
+
},
cancel(e){
- UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
- success: (res) => {
- if(res.code==200){
- let list = this.data.list
- list[e.currentTarget.dataset.index].contractionStatus = '2'
- this.setData({'list':list})
- UTIL.showToastNoneIcon('撤销成功!');
- }else{
- UTIL.showToastNoneIcon('撤销失败!: '+res.msg);
+ wx.showModal({
+ title: '提示',
+ content: '是否撤销',
+ success (res) {
+ if (res.confirm) {
+ UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+ success: (res) => {
+ if(res.code==200){
+ let list = this.data.list
+ list[e.currentTarget.dataset.index].contractionStatus = '2'
+ this.setData({'list':list})
+ UTIL.showToastNoneIcon('撤销成功!');
+ }else{
+ UTIL.showToastNoneIcon('撤销失败!: '+res.msg);
+ }
+ }
+ })
+ } else if (res.cancel) {
+ console.log('用户点击取消')
+ }
}
- }
- })
+ })
},
relevanceDelete(e){
UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, {
diff --git a/pages/contract/contract.wxml b/pages/contract/contract.wxml
index c81b6f1..cc1a717 100644
--- a/pages/contract/contract.wxml
+++ b/pages/contract/contract.wxml
@@ -16,7 +16,7 @@
填报
-
+
@@ -78,8 +78,6 @@
资产
-
-
diff --git a/pages/contract/contract.wxss b/pages/contract/contract.wxss
index 5ec4d4c..e1e6ff8 100644
--- a/pages/contract/contract.wxss
+++ b/pages/contract/contract.wxss
@@ -64,7 +64,7 @@ text{display: block;}
color: #31936c;
}
.deleteBox{
- width: 150px;
+ width: 225px;
text-align: center;
height: 100%;
background: #F6F6F6;
diff --git a/pages/drawee/drawee.js b/pages/drawee/drawee.js
index f80c658..71d7c79 100644
--- a/pages/drawee/drawee.js
+++ b/pages/drawee/drawee.js
@@ -457,6 +457,7 @@ Page({
edit(e){
var that = this ;
var zz = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/;
+ console.log(zz.test(that.data.password));
if(!(zz.test(that.data.password))){
wx.showToast({
title: '请根据提示修改',
diff --git a/pages/drawee/drawee.wxml b/pages/drawee/drawee.wxml
index f1ce91a..03a293c 100644
--- a/pages/drawee/drawee.wxml
+++ b/pages/drawee/drawee.wxml
@@ -102,7 +102,7 @@
公务卡
- {{item.payeeAccount}}卡号
+ {{item.payeeAccount}}卡号
{{item.bankDeposit}}
diff --git a/pages/finance/index.js b/pages/finance/index.js
index 226e0e1..6342b59 100644
--- a/pages/finance/index.js
+++ b/pages/finance/index.js
@@ -35,20 +35,26 @@ Page({
*/
onShow() {
var that = this;
+ that.setData({
+ imgUrl:wx.getStorageSync('dressCode')
+ })
UTIL.httpRequest(API.URL_GET_GETOPENLIST, {method:'GET'},{
success: (res) => {
if(res.code == 200){
for (let i = 0; i < res.rows.length; i++) {
const element = res.rows[i];
- element.openPic = wx.getStorageSync('dressCode')+element.openPic;
- element.openFile = wx.getStorageSync('dressCode')+element.openFile;
+ element.openPic = element.openPic.split(',');
+ element.openFile = element.openFile.split(',');
}
+ // wx.getStorageSync('dressCode')+
if (res.rows.length>0) {
that.setData({
bookId:res.rows[0].bookId,
deptId:res.rows[0].deptId,
})
}
+
+ console.log(res.rows);
that.setData({
list:res.rows
})
diff --git a/pages/finance/index.wxml b/pages/finance/index.wxml
index 1c47d39..71fdf1b 100644
--- a/pages/finance/index.wxml
+++ b/pages/finance/index.wxml
@@ -8,7 +8,7 @@
value="{{ value }}"
shape="round"
background="transparent"
- placeholder="请输入对方账户名搜索"
+ placeholder="请输入名称搜索"
clearable
bind:change="goSearch"
/>
@@ -16,38 +16,33 @@
-
-
+
+
{{item.openName}}
-
-
-
- {{item.openNy}}
-
-
-
+
+
+ {{item.openNy}}
+
+
+
+
-
+
diff --git a/pages/finance/index.wxss b/pages/finance/index.wxss
index 83df135..963d26c 100644
--- a/pages/finance/index.wxss
+++ b/pages/finance/index.wxss
@@ -123,6 +123,7 @@ text{display: block;}
.tit_box{
display: flex;
align-items: center;
+ justify-content: space-between;
margin-bottom: 10px;
}
.detail_box{
diff --git a/pages/payee/add/add.js b/pages/payee/add/add.js
index f90763a..17ca0c8 100644
--- a/pages/payee/add/add.js
+++ b/pages/payee/add/add.js
@@ -97,7 +97,46 @@ Page({
* 生命周期函数--监听页面显示
*/
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(){
diff --git a/pages/payee/add/add.wxss b/pages/payee/add/add.wxss
index af85688..2eeb7aa 100644
--- a/pages/payee/add/add.wxss
+++ b/pages/payee/add/add.wxss
@@ -56,4 +56,5 @@
padding: 8px 0px;
background-image: linear-gradient(to right, #2C8E68, #5CAE77);
color: #fff;
-}
\ No newline at end of file
+}
+
diff --git a/pages/statistics/statistics.js b/pages/statistics/statistics.js
index ae9798f..07ce080 100644
--- a/pages/statistics/statistics.js
+++ b/pages/statistics/statistics.js
@@ -14,9 +14,9 @@ function setOption(chart, rowRows1, rowRows2) {
textStyle: { // 主标题样式
color: '#5CAE77',
fontWeight: '400',
- fontSize: 18
+ fontSize: 14
},
- left: '25%', // 定位到适合的位置
+ left: '27%', // 定位到适合的位置
top: '45%', // 定位到适合的位置
textAlign: 'center' // 主、副标题水平居中显示
},
@@ -25,9 +25,9 @@ function setOption(chart, rowRows1, rowRows2) {
textStyle: {
color: '#E90000',
fontWeight: '400',
- fontSize: 18
+ fontSize: 14
},
- left: '74%',
+ left: '76%',
top: '45%',
textAlign: 'center'
}
@@ -39,7 +39,7 @@ function setOption(chart, rowRows1, rowRows2) {
{ // 第一个圆环
type: 'pie',
radius: ['30%', '50%'],
- center: ['26%', '50%'],
+ center: ['28%', '50%'],
avoidLabelOverlap: false,
label: {
show: true,
@@ -55,7 +55,7 @@ function setOption(chart, rowRows1, rowRows2) {
{ // 第二个圆环
type: 'pie',
radius: ['30%', '50%'],
- center: ['75%', '50%'],
+ center: ['77%', '50%'],
avoidLabelOverlap: false,
itemStyle: {
},
@@ -296,14 +296,14 @@ Page({
console.log('aaa');
rowRows1.push({
value: rr.percentage,
- name: UTIL.getTransform(rr.incomeType,that.data.incomeTypeOptions)+' '+rr.percentage+'%'
+ name: UTIL.getTransform(rr.incomeType,that.data.incomeTypeOptions).substr(0,2)+'\n'+rr.percentage+'%'
})
rr.jieAmount = Number(rr.jieAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "");
})
res.data[2].forEach(rrr=>{
rowRows2.push({
value: rrr.percentage,
- name: UTIL.getTransform(rrr.expenditureType,that.data.expenditureTypeOptions)+' '+rrr.percentage+'%'
+ name: UTIL.getTransform(rrr.expenditureType,that.data.expenditureTypeOptions).substr(0,2)+'\n'+rrr.percentage+'%'
})
rrr.daiAmount = Number(rrr.daiAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "");
})
diff --git a/pages/statistics/statistics.wxml b/pages/statistics/statistics.wxml
index 5bc03ad..488a734 100644
--- a/pages/statistics/statistics.wxml
+++ b/pages/statistics/statistics.wxml
@@ -74,7 +74,7 @@
-
+
统计占比
@@ -105,7 +105,7 @@
- {{item.incomeType == 1 ? '经营' : item.incomeType == 2 ? '发包 ' : item.incomeType == 3 ? '补助' : item.incomeType == 4 ? '其他' : item.incomeType == 5 ? '投资' : ''}}
+ {{item.incomeType == 1 ? '经营收入' : item.incomeType == 2 ? '发包收入' : item.incomeType == 3 ? '补助收入' : item.incomeType == 4 ? '其他收入' : item.incomeType == 5 ? '投资收益' : ''}}
¥{{item.jieAmount}}
@@ -134,11 +134,11 @@
-
+
-
+
收/支走势
单位:元
diff --git a/pages/statistics/statistics.wxss b/pages/statistics/statistics.wxss
index fdf279d..3f375ed 100644
--- a/pages/statistics/statistics.wxss
+++ b/pages/statistics/statistics.wxss
@@ -28,7 +28,7 @@ ec-canvas {
}
.main-box{
background: #ffffff;
- padding: 20px;
+ padding: 20px 10px;
width: 94%;
margin: 20px auto;
border-radius: 10px;
diff --git a/pages/transferAccounts/transferAccounts.wxml b/pages/transferAccounts/transferAccounts.wxml
index 87f86ae..44fb8fe 100644
--- a/pages/transferAccounts/transferAccounts.wxml
+++ b/pages/transferAccounts/transferAccounts.wxml
@@ -27,7 +27,7 @@
-
+
@@ -68,7 +68,7 @@
明细
-
+
对账
diff --git a/utils/util.js b/utils/util.js
index 98462d9..811af9f 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -480,6 +480,80 @@ const hideLoadingWithErrorTips = (err = '加载失败...') => {
duration: 2000
})
}
+
+/**
+ * @author Rui.Zhang
+ * @description 判断是否为银行卡号
+ * @param {String} str_cardNo 待校验的数据
+ * @returns {Boolean}, true:是银行卡号
+ **/
+function isBankCard (str_cardNo) {
+ str_cardNo = str_cardNo || String(this);
+ if ("" == str_cardNo.trim() || undefined == str_cardNo) {
+ return false;
+ }
+ var lastNum = str_cardNo.substr(str_cardNo.length - 1, 1);//取出最后一位(与luhm进行比较)
+
+ var first15Num = str_cardNo.substr(0, str_cardNo.length - 1);//前15或18位
+ var newArr=new Array();
+ for(var i=first15Num.length-1;i>-1;i--){ //前15或18位倒序存进数组
+ newArr.push(first15Num.substr(i,1));
+ }
+ var arrJiShu=new Array(); //奇数位*2的积 <9
+ var arrJiShu2=new Array(); //奇数位*2的积 >9
+
+ var arrOuShu=new Array(); //偶数位数组
+ for(var j=0;j9 的分割之后的数组个位数
+ var jishu_child2=new Array();//奇数位*2 >9 的分割之后的数组十位数
+ for(var h=0;h9 的分割之后的数组个位数之和
+ var sumJiShuChild2=0; //奇数位*2 >9 的分割之后的数组十位数之和
+ var sumTotal=0;
+ for(var m=0;m