From 2131951aee0dfcdb9914074dcbcd1b91379d7d26 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 5 Sep 2023 16:40:33 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/newArchives/breeding.vue | 4 ++-- components/newArchives/plant.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/newArchives/breeding.vue b/components/newArchives/breeding.vue index 7345791..ec676af 100644 --- a/components/newArchives/breeding.vue +++ b/components/newArchives/breeding.vue @@ -54,9 +54,9 @@ - - diff --git a/components/newArchives/plant.vue b/components/newArchives/plant.vue index 068c0e9..9a65e33 100644 --- a/components/newArchives/plant.vue +++ b/components/newArchives/plant.vue @@ -68,9 +68,9 @@ - - From f8bb35182f9322fba08dc1add9abbc76b23d3d83 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 6 Sep 2023 11:36:38 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + manifest.json | 3 ++- pages/oaHome/oaHome.vue | 4 +++- subpkg/buyShare/buyShare.vue | 2 +- subpkg/topUp/topUp.vue | 46 ++++++++++++++++++++---------------- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/App.vue b/App.vue index 77ceb18..3362217 100644 --- a/App.vue +++ b/App.vue @@ -37,6 +37,7 @@ data } = await userInfo(); this.$store.commit('setUserInfo', data); + uni.$emit('home_initUserInfo', data); }catch(e){ console.log(e); } diff --git a/manifest.json b/manifest.json index f67ad1e..4a6d424 100644 --- a/manifest.json +++ b/manifest.json @@ -60,7 +60,8 @@ "payment" : { "weixin" : { "__platform__" : [ "ios", "android" ], - "appid" : "wx4789d9f1b50390ba", + // "appid" : "wx4789d9f1b50390ba", + "appid" : "wx9d68c92b550ddd1e", // 商城 "UniversalLinks" : "https://worker-task.lihaink.cn/" } }, diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 1ca1f39..6672e47 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -262,6 +262,7 @@ this.showToask(); // this.initOaHomeDada(); this.getOrderList(); + uni.$on('home_initUserInfo',this.initUserInfo); //#ifdef APP-PLUS this.noticeFn(); // #endif @@ -324,7 +325,8 @@ url: "/pages/logistics/index", }); }, - initUserInfo() { + initUserInfo(data=null) { + if(data) return this.myOaInfo = data; this.$store.state.app.userInfo ? (this.myOaInfo = this.$store.state.app.userInfo) : (this.myOaInfo.avatar = ""); diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue index 9d14fc4..624e488 100644 --- a/subpkg/buyShare/buyShare.vue +++ b/subpkg/buyShare/buyShare.vue @@ -9,7 +9,7 @@ 任务描述 - {{task.content}} + {{task.content||'暂无任务描述'}} 事件记录 diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index da2ac07..a8b9d59 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -42,6 +42,8 @@ payMoney: { money: '' }, + // 微信支付信息 + payData: null, payTimer: null, timeCount: 5, task_id: -1, //任务id,当为任务时,不可自选充值金额 @@ -62,7 +64,28 @@ this.loadTask(); } }, - onShow() {}, + onShow() { + if(this.payData){ + payStatus({ + order_id: payData.order_id, + from: payData.from, + }).then((status)=>{ + uni.showToast({ + icon: status.data.pay_status?'success':'none', + title: status.data.pay_status?'支付成功':'支付失败' + }) + if(this.task_id>0){ + uni.$emit('upBuyShare'); + uni.navigateBack(); + } + else{ + userInfo().then(user=>{ + this.$store.commit('setUserInfo', user.data); + }) + } + }) + } + }, methods: { changePrice(index){ if(this.changeMoney == index)this.changeMoney = -1; @@ -112,6 +135,7 @@ queryData.task_id = this.task_id; } let { data } = await recharge(queryData); + this.payData = data; let res = await payWay({ order_id: data.order_id, from: data.from, @@ -147,24 +171,6 @@ success: (e) => { // console.log('成功', e); uni.hideLoading(); - payStatus({ - order_id: data.order_id, - from: data.from, - }).then((status)=>{ - uni.showToast({ - icon: status.data.pay_status?'success':'none', - title: status.data.pay_status?'支付成功':'支付失败' - }) - if(this.task_id>0){ - uni.$emit('upBuyShare'); - uni.navigateBack(); - } - else{ - userInfo().then(user=>{ - this.$store.commit('setUserInfo', user.data); - }) - } - }) }, fail: (e) => { console.log(e); @@ -175,7 +181,7 @@ }) }, complete: () => { - this.payMoney.money = ''; + if(this.task_id<=0)this.payMoney.money = ''; }, }); } From a8661351ae849cd2dd320be603bcc2093b7ce016 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Wed, 6 Sep 2023 11:36:48 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/mybtn/mybtn.vue | 20 +++---- subpkg/property/agencyList.vue | 34 +++++++++--- subpkg/property/chosseCompany.vue | 4 +- subpkg/property/index.vue | 86 ++++++++++++++++++++----------- subpkg/property/vehicle_a.vue | 10 ++-- 5 files changed, 101 insertions(+), 53 deletions(-) diff --git a/components/mybtn/mybtn.vue b/components/mybtn/mybtn.vue index 978b011..71e73f4 100644 --- a/components/mybtn/mybtn.vue +++ b/components/mybtn/mybtn.vue @@ -1,11 +1,10 @@ @@ -39,11 +38,12 @@ \ No newline at end of file diff --git a/components/newArchives/banquetFullMoon.vue b/components/newArchives/banquetFullMoon.vue index 23caefe..0a5ecba 100644 --- a/components/newArchives/banquetFullMoon.vue +++ b/components/newArchives/banquetFullMoon.vue @@ -1,163 +1,176 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetFuneral.vue b/components/newArchives/banquetFuneral.vue index 384474f..202d78b 100644 --- a/components/newArchives/banquetFuneral.vue +++ b/components/newArchives/banquetFuneral.vue @@ -1,176 +1,189 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetMarry.vue b/components/newArchives/banquetMarry.vue index 784f562..93724fb 100644 --- a/components/newArchives/banquetMarry.vue +++ b/components/newArchives/banquetMarry.vue @@ -1,171 +1,184 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/banquetOther.vue b/components/newArchives/banquetOther.vue index e7caddc..5344698 100644 --- a/components/newArchives/banquetOther.vue +++ b/components/newArchives/banquetOther.vue @@ -117,11 +117,24 @@ \ No newline at end of file diff --git a/components/newArchives/deepProcessing.vue b/components/newArchives/deepProcessing.vue index aabf1e7..4502ce8 100644 --- a/components/newArchives/deepProcessing.vue +++ b/components/newArchives/deepProcessing.vue @@ -1,285 +1,298 @@ - - - - - - \ No newline at end of file diff --git a/components/newArchives/houseDecoration.vue b/components/newArchives/houseDecoration.vue index 7dd9a89..67ee412 100644 --- a/components/newArchives/houseDecoration.vue +++ b/components/newArchives/houseDecoration.vue @@ -1,143 +1,177 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/houseRenovate.vue b/components/newArchives/houseRenovate.vue index 4d74f45..2609004 100644 --- a/components/newArchives/houseRenovate.vue +++ b/components/newArchives/houseRenovate.vue @@ -1,133 +1,164 @@ - - - - - \ No newline at end of file diff --git a/components/newArchives/houseRepair.vue b/components/newArchives/houseRepair.vue index 7ed750e..b7178f1 100644 --- a/components/newArchives/houseRepair.vue +++ b/components/newArchives/houseRepair.vue @@ -1,66 +1,103 @@ \ No newline at end of file diff --git a/components/newArchives/houseTransaction.vue b/components/newArchives/houseTransaction.vue index 789f666..003c79e 100644 --- a/components/newArchives/houseTransaction.vue +++ b/components/newArchives/houseTransaction.vue @@ -1,57 +1,84 @@ \ No newline at end of file diff --git a/components/newArchives/thickProcessing.vue b/components/newArchives/thickProcessing.vue index 874880a..d947dae 100644 --- a/components/newArchives/thickProcessing.vue +++ b/components/newArchives/thickProcessing.vue @@ -1,269 +1,282 @@ - - - - - - \ No newline at end of file diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue index a4d982f..b07ff3e 100644 --- a/subpkg/archivesDetail/archivesDetail.vue +++ b/subpkg/archivesDetail/archivesDetail.vue @@ -1,18 +1,18 @@ \ No newline at end of file diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue index a8b9d59..2c028ae 100644 --- a/subpkg/topUp/topUp.vue +++ b/subpkg/topUp/topUp.vue @@ -42,8 +42,6 @@ payMoney: { money: '' }, - // 微信支付信息 - payData: null, payTimer: null, timeCount: 5, task_id: -1, //任务id,当为任务时,不可自选充值金额 @@ -64,28 +62,6 @@ this.loadTask(); } }, - onShow() { - if(this.payData){ - payStatus({ - order_id: payData.order_id, - from: payData.from, - }).then((status)=>{ - uni.showToast({ - icon: status.data.pay_status?'success':'none', - title: status.data.pay_status?'支付成功':'支付失败' - }) - if(this.task_id>0){ - uni.$emit('upBuyShare'); - uni.navigateBack(); - } - else{ - userInfo().then(user=>{ - this.$store.commit('setUserInfo', user.data); - }) - } - }) - } - }, methods: { changePrice(index){ if(this.changeMoney == index)this.changeMoney = -1; @@ -110,7 +86,7 @@ pay(){ if(!this.payMoney.money)return Toast('请先填写充值金额!') if(this.payMoney.money<=0)return Toast('充值金额不能小于0!') - if(!this.payTimer){ + if(this.payTimer==null){ this.goRecharge(); this.payTimer = setInterval(()=>{ this.timeCount--; @@ -135,7 +111,6 @@ queryData.task_id = this.task_id; } let { data } = await recharge(queryData); - this.payData = data; let res = await payWay({ order_id: data.order_id, from: data.from, @@ -171,6 +146,24 @@ success: (e) => { // console.log('成功', e); uni.hideLoading(); + payStatus({ + order_id: data.order_id, + from: data.from, + }).then((status)=>{ + uni.showToast({ + icon: status.data.pay_status?'success':'none', + title: status.data.pay_status?'支付成功':'支付失败' + }) + if(this.task_id>0){ + uni.$emit('upBuyShare'); + uni.navigateBack(); + } + else{ + userInfo().then(user=>{ + this.$store.commit('setUserInfo', user.data); + }) + } + }) }, fail: (e) => { console.log(e); diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue index 8ae0506..dcfdf37 100644 --- a/subpkg/updateArchives/updateArchives.vue +++ b/subpkg/updateArchives/updateArchives.vue @@ -55,7 +55,7 @@ keyName="name" @change="changeHandler" @cancel="demandShow = false" @confirm="changeDemand"> - + @@ -105,7 +105,6 @@ }, data() { return { - listMap: new Map(), demandShow: false, demandLoading: false, demandList: [], //更多需求 @@ -135,15 +134,9 @@ this.task_id = +options.task_id || 0; this.initInformationDetails({ id: options.id }); this.initCategoryBusinessList(); - this.initMap(); }, onShow() {}, methods: { - initMap() { - comonentList.forEach(item => { - this.listMap.set(item.id, item.name); - }) - }, async initInformationDetails(id) { let res = await informationDetails(id); this.formData = res.data; @@ -153,6 +146,7 @@ if (this.showDemandList.length == 0) return Toast('请先添加需求!'); let refsDatas = await this.loadRefsDatas(); if (!this.updateFlag) return; + // return ; uni.showLoading({ title: '正在更新...', mask: true @@ -201,10 +195,13 @@ // 初始化商机分类 async initCategoryBusinessList() { let res = await categoryBusinessList(); - // this.demandList = res.data; - this.demandList = res.data.filter(item => item.id == 6); - this.demandList[0].children = this.demandList[0].children.filter(item => item.id == 7 || item.id == 8 || item - .id == 32); + res.data = res.data.filter((item)=>{ + return item.status!=0; + }) + this.demandList = res.data; + // this.demandList = res.data.filter(item => item.id == 6); + // this.demandList[0].children = this.demandList[0].children.filter(item => item.id == 7 || item.id == 8 || item + // .id == 32); this.demandListChild = this.demandList[0].children; }, // 选择更多需求 From ea2e79af4421fdf8c905cb2e3fa0caba2942d653 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 6 Sep 2023 16:54:16 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/companyFinance/companyFinance.vue | 2 +- subpkg/finance/finance.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue index b6666ad..3d0382d 100644 --- a/components/companyFinance/companyFinance.vue +++ b/components/companyFinance/companyFinance.vue @@ -2,7 +2,7 @@ - 履约保证总金额(元) + 押金(元) {{cCount(+company.deposit)}} 0.00 diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue index 752ab30..a15515c 100644 --- a/subpkg/finance/finance.vue +++ b/subpkg/finance/finance.vue @@ -54,7 +54,7 @@ - 履约保证金额(元) + 押金(元) {{ userInfo.deposit || 0.0 }} @@ -444,6 +444,7 @@ page { align-items: center; .item { + flex: 1; text-align: center; font-size: 25rpx; font-weight: 400; From 323bd3b5511ee6be970c85d7926cf953f0f87f3b Mon Sep 17 00:00:00 2001 From: THK3121 Date: Thu, 7 Sep 2023 08:59:24 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/property/chosseCompany.vue | 6 +++--- subpkg/property/index.vue | 33 ++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue index c0a70ca..b24f648 100644 --- a/subpkg/property/chosseCompany.vue +++ b/subpkg/property/chosseCompany.vue @@ -65,8 +65,7 @@ 租赁车辆 - + @@ -186,6 +185,7 @@ // 13043214321 this.dataList = res.data.vehicleContract this.carList = res.data.vehicleRentCars + this.checked = [this.carList[0].car_id] this.dataList.cars_info ? this.dataList.cars_info = JSON.parse(this.dataList.cars_info).license : "" if (this.dataList.status == 3) { @@ -272,7 +272,7 @@ }, contractFn() { - // console.log(this.checked) + contractApi({ id: this.dataList.id, car_id: this.checked[0]?.car_id ? this.checked[0].car_id : "" diff --git a/subpkg/property/index.vue b/subpkg/property/index.vue index 556387d..9ffd495 100644 --- a/subpkg/property/index.vue +++ b/subpkg/property/index.vue @@ -8,22 +8,15 @@ - + - - + + + + + 数量超过上限 + + + 数量不能为空 + + { - Toast(res.msg) + Toast("操作成功") this.step = -1 }) }, @@ -370,13 +376,16 @@ this.toDetail("/subpkg/property/chosseCompany") }, confirm() { - if (!this.newCarNum) return + if (!this.newCarNum || this.newCarNum > this.datas.can_rent_num) { + this.novalue = true + return + } this.showPop = false leaseApi({ num: Number(this.newCarNum) }).then(res => { this.newCarNum = "" - // Toast(res.msg) + // Toast("操作成功") this.showpopp = true }) }, From 4171abc1fe4d4eb58973fae434980d77273bce30 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Thu, 7 Sep 2023 09:04:07 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- subpkg/property/chosseCompany.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subpkg/property/chosseCompany.vue b/subpkg/property/chosseCompany.vue index b24f648..c5335ae 100644 --- a/subpkg/property/chosseCompany.vue +++ b/subpkg/property/chosseCompany.vue @@ -185,7 +185,7 @@ // 13043214321 this.dataList = res.data.vehicleContract this.carList = res.data.vehicleRentCars - this.checked = [this.carList[0].car_id] + this.checked = [this.carList[0].car_id] || '' this.dataList.cars_info ? this.dataList.cars_info = JSON.parse(this.dataList.cars_info).license : "" if (this.dataList.status == 3) { @@ -275,7 +275,7 @@ contractApi({ id: this.dataList.id, - car_id: this.checked[0]?.car_id ? this.checked[0].car_id : "" + car_id: this.checked[0] || "" }).then(res => { this.navTo('/subpkg/property/success') }) From 8f362931c480945842493d90167d1a40c0e932f8 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 7 Sep 2023 09:06:21 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 8 ++++---- subpkg/buyShare/buyShare.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/app.js b/config/app.js index 7b60c06..18a6061 100644 --- a/config/app.js +++ b/config/app.js @@ -2,14 +2,14 @@ let httpApiThree; let httpApi; // 正式使用的域名 -// httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 +httpApi = 'https://ceshi-worker-task.lihaink.cn' //测试 // httpApi = 'https://preview-worker-task.lihaink.cn' //预上线 -httpApi = 'https://worker-task.lihaink.cn' //正式 +// httpApi = 'https://worker-task.lihaink.cn' //正式 -// httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 +httpApiThree = 'https://ceshi-worker-task.lihaink.cn' //测试 // httpApiThree = 'https://preview-worker-task.lihaink.cn' //预上线 -httpApiThree = 'https://worker-task.lihaink.cn' //正式 +// httpApiThree = 'https://worker-task.lihaink.cn' //正式 // #ifdef H5 // httpApiThree = 'baseUrlTest' //生产 // #endif diff --git a/subpkg/buyShare/buyShare.vue b/subpkg/buyShare/buyShare.vue index 624e488..ecb4349 100644 --- a/subpkg/buyShare/buyShare.vue +++ b/subpkg/buyShare/buyShare.vue @@ -1,5 +1,5 @@