From 6dc0e69392c6751b98e3dda26bad5804fe309ac4 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 12 Dec 2023 11:08:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=99=BB=E5=BD=95=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/companyFinance/companyFinance.vue | 51 +- pages/oaHome/oaHome.vue | 14 + subpkg/finance/finance.vue | 1042 +++++++++--------- subpkg/newPersonnel/newPersonnel.vue | 83 +- subpkg/personnel/personnel.vue | 33 +- subpkg/townTask/townGather.vue | 10 +- 6 files changed, 611 insertions(+), 622 deletions(-) diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue index 3180af0..1d3e5b9 100644 --- a/components/companyFinance/companyFinance.vue +++ b/components/companyFinance/companyFinance.vue @@ -7,7 +7,7 @@ 0.00 - 公司收益总金额(元) + 公司预计收益总金额(元) {{cCount(+company.company_money)}} 0.00 @@ -45,9 +45,10 @@ 收益来源： - {{item.type_desc}} - {{item.type_desc}} - {{item.type_desc}} + {{item.type_desc}} + {{item.type_desc}} + {{item.type_desc}} @@ -69,7 +70,7 @@ import { accountMonthList, accountDateList, - companyView + companyView } from "@/api/company.js" import { Toast @@ -96,28 +97,30 @@ }; }, mounted() { - this.loadCompany(); + this.loadCompany(); this.initLoad(); }, methods: { - async loadCompany(){ - let res = await companyView(); - this.company = res.data.company; - }, + async loadCompany() { + let res = await companyView(); + this.company = res.data.company; + }, navTo(url) { - if(url){ - uni.showLoading({ - title: '加载中', - mask: true - }); - uni.navigateTo({ - url: url, - success:(res)=> { - uni.hideLoading(); - res.eventChannel.emit('company_money', { company_money: this.company.company_money }) - } - }) - }else Toast('暂未开放') + if (url) { + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success: (res) => { + uni.hideLoading(); + res.eventChannel.emit('company_money', { + company_money: this.company.company_money + }) + } + }) + } else Toast('暂未开放') }, initLoad() { this.loadConfig.page = 1; @@ -251,7 +254,7 @@ &:before { display: inline-block; - content: '账户收益'; + content: '预计收益'; width: 137rpx; height: 49rpx; line-height: 49rpx; diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index ec8e508..c5baa82 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -270,7 +270,14 @@ }; }, async onLoad() { + // console.log('asdashg') + if (uni.getStorageSync('USER_INFO')) { + let userData = JSON.parse(uni.getStorageSync('USER_INFO')) + this.initUserInfo(userData); + // console.log(545) + } + console.log(7787878) await this.$onLaunched; this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO") || '{}')?.is_captain this.options.data = bj; @@ -286,6 +293,10 @@ } }); // #endif + + + + }, onReachBottom() { if (this.flag) return @@ -314,6 +325,9 @@ // } // this.getUserIndex() // this.getIndexList() + + + let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id this.getOrderList(); console.log("show") diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index eb111ad..4868a8f 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -1,84 +1,62 @@ \ No newline at end of file diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue index 72db15a..bdef5a2 100644 --- a/subpkg/newPersonnel/newPersonnel.vue +++ b/subpkg/newPersonnel/newPersonnel.vue @@ -46,7 +46,8 @@ - + - - - - - - + + + + + + @@ -295,11 +297,10 @@ --> - + - + @@ -309,7 +310,7 @@ } from "@/api/file.js" import { loginAdd, - } from "@/api/oaUser.js" + } from "@/api/oaUser.js" import districtSelector from "@/components/districtSelector/districtSelector.vue" //地区选择器 import districtSelectorTow from "@/components/districtSelector/districtSelectorTow.vue" //地区选择器 import { @@ -322,7 +323,7 @@ }, data() { return { - modelShow: false, + modelShow: false, formData: { account: '', //账号 password: '123456', //密码 @@ -330,7 +331,7 @@ // channel: 6, //注册渠道[1-微信小程序 2-微信公众号 3-手机H5 4-电脑PC 5-苹果APP 6-安卓APP] id_card: '', is_captain: '', // 队长标识 - is_service_manager: '', //服务部长标识 + is_service_manager: '', //服务部长标识 sex: '', avatar: '', nickname: '', @@ -381,12 +382,12 @@ }, trigger: ['change', 'blur'] }, - is_service_manager: { - validator: (rule, value, callback) => { - typeof value === 'number' ? callback() : callback('不能为空') - }, - trigger: ['change', 'blur'] - }, + is_service_manager: { + validator: (rule, value, callback) => { + typeof value === 'number' ? callback() : callback('不能为空') + }, + trigger: ['change', 'blur'] + }, 'qualification.id_card': { type: 'string', required: true, @@ -428,17 +429,17 @@ }, // 上传头像 async afterReadAvatar(event) { - uni.showLoading({ - title:'上传中' - }) + uni.showLoading({ + title: '上传中' + }) upLoadImage({ filePath: event.file.url, name: 'file' }).then(res => { this.formData.avatar = res.data.uri; - }).finally(()=>{ - uni.hideLoading(); - }) + }).finally(() => { + uni.hideLoading(); + }) }, // 新增图片 async afterRead(event) { @@ -446,27 +447,29 @@ }, // 上传图片 upLoad(url, type) { - uni.showLoading({ - title:'上传中请稍后' - }) + uni.showLoading({ + title: '上传中请稍后' + }) upLoadImage({ filePath: url, name: 'file' }).then(res => { this.formData.qualification[type] = res.data.uri - }).finally(()=>{ - uni.hideLoading(); - }) + }).finally(() => { + uni.hideLoading(); + }) }, // 创建账号 - async addAcountNum() { - this.modelShow = false; - await this.$nextTick(); + async addAcountNum() { + this.modelShow = false; + await this.$nextTick(); if (!this.formData.avatar) return Toast('头像未上传'); let flag = this.$refs.districtSelectorRef.validate(); - if (!this.formData.qualification.id_card || !this.formData.qualification.id_card_b) return Toast('身份证未上传'); - if (!this.formData.qualification.bank_account || !this.formData.qualification.bank_account_b) return Toast( - '银行卡未上传'); + if (!this.formData.qualification.id_card || !this.formData.qualification.id_card_b) return Toast( + '身份证未上传'); + if (!this.formData.qualification.bank_account || !this.formData.qualification.bank_account_b) + return Toast( + '银行卡未上传'); this.$refs.uForm.validate().then(async (e) => { if (e && flag) { uni.showLoading() diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue index c58671b..8f3c80f 100644 --- a/subpkg/personnel/personnel.vue +++ b/subpkg/personnel/personnel.vue @@ -109,7 +109,9 @@ :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> - + @@ -146,18 +148,18 @@ // console.log(a.substring(0, 10)) }, navTo(url) { - if(url){ - uni.showLoading({ - title: '加载中', - mask: true - }); - uni.navigateTo({ - url: url, - success() { - uni.hideLoading() - } - }) - }else Toast('暂未开放') + if (url) { + uni.showLoading({ + title: '加载中', + mask: true + }); + uni.navigateTo({ + url: url, + success() { + uni.hideLoading() + } + }) + } else Toast('暂未开放') }, async initLoad() { this.loadConfig.page = 1; @@ -202,8 +204,9 @@