diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index 26e08bc..12ba7a5 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -2,12 +2,12 @@
- 履约保证金(元)
+ 履约保证总金额(元)
{{cCount(+company.deposit)}}
0.00
- 公司收益金额(元)
+ 公司收益总金额(元)
{{cCount(+company.company_money)}}
0.00
@@ -40,18 +40,16 @@
任务名称:
{{item.remark}}
-
+
收益来源:
-
- {{item.type_desc}}
-
- {{item.type_desc}}
+ {{item.type_desc}}
+ {{item.type_desc}}
+ {{item.type_desc}}
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index 7df07cf..f35f526 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -14,7 +14,7 @@
已完成
已关闭
-
+
{{(datas.extend.informationg.update?datas.extend.informationg.update:0)+'/'+(datas.extend.informationg.count?datas.extend.informationg.count:0)}}
diff --git a/pages/oaExamine/oaExamine.vue b/pages/oaExamine/oaExamine.vue
index 32a4218..b4ae95a 100644
--- a/pages/oaExamine/oaExamine.vue
+++ b/pages/oaExamine/oaExamine.vue
@@ -111,7 +111,7 @@
}
},
click(item) {
- Toast('开发中')
+ // Toast('开发中')
return
this.myEventList = []
this.params.page = '1'
diff --git a/subpkg/captain/captain.vue b/subpkg/captain/captain.vue
index d4e0c3e..e5af9f6 100644
--- a/subpkg/captain/captain.vue
+++ b/subpkg/captain/captain.vue
@@ -31,7 +31,7 @@
{{'管理户数: '+item.informationg_count+" 户"}}
- {{'更新户数: '+item.informationg_update_count+" 户"}}{{'累计更新: '+item.informationg_update_count+" 户"}}
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 6c19d0e..e16e1b8 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -54,7 +54,7 @@
- 保证金额(元)
+ 履约保证金额(元)
{{
userInfo.deposit || 0.0
}}
@@ -62,9 +62,9 @@
- 收益金额(元)
+ 个人收益金额(元)
{{
- userInfo.income || 0.0
+ userInfo.user_money || 0.0
}}
****
@@ -116,12 +116,12 @@
任务名称:
{{ item.remark }}
-
+
收益来源:
@@ -187,7 +187,7 @@
- 收益金额(元)
+ 个人收益金额(元)
{{ item.income }}
@@ -264,13 +264,14 @@ export default {
return this.$store.state.config.eyeType;
},
all_money(){
- let str = '0.00';
+ let str = 0.00;
+
try{
- this.userInfo.user_money?str=parseFloat(str)+this.userInfo.user_money:null;
- this.userInfo.deposit?str=parseFloat(str)+this.userInfo.deposit:null;
+ this.userInfo.user_money?str=str+parseFloat(this.userInfo.user_money):0.00;
+ this.userInfo.deposit?str=str+parseFloat(this.userInfo.deposit):0.00;
str = str.toFixed(2);
}catch(e){
- str = "0.00";
+ str = 0.00;
}
return str;
}