From e0ffaf662678d06baebb757fb9d6cbacf3ad9d67 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 16 Aug 2023 13:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/company/company.vue | 17 +++++-----
components/companyFinance/companyFinance.vue | 34 ++++++++++++++------
pages/updatePasswprd/updatePasswprd.vue | 22 ++++++++++---
static/server/server.js | 2 +-
subpkg/archivesDetail/archivesDetail.vue | 5 +--
subpkg/companyFinance/companyFinance.vue | 22 ++++++++++---
subpkg/newArchives/newArchives.vue | 21 ++++++------
7 files changed, 82 insertions(+), 41 deletions(-)
diff --git a/components/company/company.vue b/components/company/company.vue
index a92bb08..4f4bda7 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -117,7 +117,13 @@
-
+
+
+
+
+
@@ -208,13 +214,6 @@
}
this.company = res.data.company;
- try{
- if(Array.isArray(JSON.parse(this.company.qualification.bank_account))){
- this.company.qualification.bank_account = JSON.parse(this.company.qualification.bank_account)
- }
- }catch(e){
-
- }
uni.$emit('companyInfo', this.company); //发送全局事件
this.user = res.data.user;
this.contract = res.data.contract;
diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b299648..e7a3f50 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -3,20 +3,20 @@
公司账户余额(元)
- {{cCount(company.deposit)}}
+ {{cCount(+company.deposit)}}
0.00
公司收益金额(元)
- {{cCount(company.company_money)}}
+ {{cCount(+company.company_money)}}
0.00
账单流水
- 日账单
- 月账单
+ 今日账单
+
更多
@@ -28,12 +28,21 @@
- 任务名称：
+ 任务名称：
{{item.remark}}
- 收益来源：
- {{current?item.remark:item.type_desc}}
+ 金额归属：
+ {{item.userInfo.nickname}}
+
+
+ 收益来源：
+
+
+ {{item.type_desc}}
+ {{item.type_desc}}
+ {{item.type_desc}}
+
{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}
@@ -53,14 +62,17 @@
return {
current: 0,
list: [],
- company:{},
+ company:{
+ company_money: "0",
+ deposit: "0"
+ },
loadConfig:{
page: 1,
limit: 15,
lastpage: '',
loadingText: '努力加载中',
loadmoreText: '轻轻上拉',
- nomoreText: '我也是有底线的~~',
+ nomoreText: '没有更多账单了~~',
status: 'loadmore'
},
};
@@ -68,6 +80,7 @@
mounted() {
uni.$on('companyInfo', (e)=>{
this.company = e;
+ console.log(this.company);
this.initLoad();
})
},
@@ -233,8 +246,9 @@
line-height: 39rpx;
.t_item{
display: flex;
- &:nth-child(1){
+ .t_title{
margin-bottom: 16rpx;
+ flex-shrink: 0 !important;
}
.tips{
font-size: 28rpx;
diff --git a/pages/updatePasswprd/updatePasswprd.vue b/pages/updatePasswprd/updatePasswprd.vue
index 9571d1f..08cb82f 100644
--- a/pages/updatePasswprd/updatePasswprd.vue
+++ b/pages/updatePasswprd/updatePasswprd.vue
@@ -4,17 +4,29 @@
-
-
-
+
-
+
+
+
+
+
-
+
+
+
+
+
提交
diff --git a/static/server/server.js b/static/server/server.js
index bcd67b5..c10f4d5 100644
--- a/static/server/server.js
+++ b/static/server/server.js
@@ -245,7 +245,7 @@ export const oaHomeData = [
// admin: true
// },
{
- text: '财务管理',
+ text: '个人财务',
icon: prefix + 'oa/gengduo@2x.png',
url: '/subpkg/finance/finance'
},
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index c51b522..928c6f6 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -44,7 +44,8 @@
-
+
+
@@ -204,7 +205,7 @@
},
async initInformationDetails(id) {
let res = await informationDetails(id);
- this.$u.sleep(500).then(()=>{
+ this.$u.sleep(100).then(()=>{
this.skeleton = false;
Object.keys(res.data).forEach(key => {
this.formData[key] = res.data[key];
diff --git a/subpkg/companyFinance/companyFinance.vue b/subpkg/companyFinance/companyFinance.vue
index e413875..f836ea9 100644
--- a/subpkg/companyFinance/companyFinance.vue
+++ b/subpkg/companyFinance/companyFinance.vue
@@ -17,12 +17,20 @@
- 任务名称：
+ 任务名称：
{{item.remark}}
- 收益来源：
- {{item.type_desc}}
+ 金额归属：
+ {{item.userInfo.nickname}}
+
+
+ 收益来源：
+
+ {{item.type_desc}}
+ {{item.type_desc}}
+ {{item.type_desc}}
+
{{item.change_amount_desc}}
@@ -122,6 +130,11 @@
},
methods: {
async loadBill() {
+ // change_type 200,201,202,203
+ // 200 平台增加余额
+ // 201 充值增加余额
+ // 202 任务收益金额
+ // 203 任务账户余额增加
if(this.loadConfig.status=="nomore")return;
this.loadConfig.status="loading"
let res = await accountDateList({
@@ -299,8 +312,9 @@
line-height: 39rpx;
.t_item{
display: flex;
- &:nth-child(1){
+ .t_title{
margin-bottom: 16rpx;
+ flex-shrink: 0 !important;
}
.tips{
font-size: 28rpx;
diff --git a/subpkg/newArchives/newArchives.vue b/subpkg/newArchives/newArchives.vue
index 729f1e7..95ce837 100644
--- a/subpkg/newArchives/newArchives.vue
+++ b/subpkg/newArchives/newArchives.vue
@@ -31,14 +31,14 @@
-
+
@@ -252,6 +252,7 @@
address.area_name ? str += address.area_name : null;
address.street_name ? str += address.street_name : null;
address.village_name ? str += address.village_name : null;
+ address.brigade_name ? str += address.brigade_name : null;
return str;
}
},
@@ -330,21 +331,21 @@
},
// 初始化商机分类
async initCategoryBusinessList() {
- try{
+ try {
uni.showLoading({
- title:'加载中',
- mask:true
+ title: '加载中',
+ mask: true
})
let res = await categoryBusinessList();
this.demandList = res.data;
- }catch(e){
+ } catch (e) {
console.log(e);
- }finally{
+ } finally {
uni.hideLoading()
}
},
- initBrigadeList(){
- try{
+ initBrigadeList() {
+ try {
let arr = this.$store.state.app.userInfo.brigade.split(',');
for (let i = 0; i < arr.length; i++) {
this.brigadeList.push({
@@ -352,7 +353,7 @@
brigade_name: this.$store.state.app.userInfo.brigade_name[i].brigade_name
})
}
- }catch(e){
+ } catch (e) {
Toast('未负责小队');
}
},