From 72dbb35edb1a5aead6d93a38a662bb2328e8a0bd Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 11 Jun 2026 09:47:09 +0800 Subject: [PATCH] 1 --- src/views/Main.vue | 5 +-- src/views/app/bill/current/current.vue | 1 - src/views/app/business/bus/addEdit.vue | 3 +- src/views/app/business/bus/bus.vue | 2 +- src/views/app/business/courier/courier.vue | 12 ++++-- .../app/business/courier/logisticsAddress.vue | 2 - .../business/deliverytruck/deliveryTruck.vue | 1 - src/views/app/business/deposit/deposit.vue | 7 +--- .../expressCompany/expressCompany.vue | 1 - src/views/app/business/lineManage/addEdit.vue | 5 --- .../app/business/lineManage/dictManage.vue | 1 - .../app/business/lineManage/lineManage.vue | 2 - .../business/lineManage/logisticsAddress.vue | 3 -- .../business/lineManage/transferStation.vue | 1 - .../app/business/logistics/logistics.vue | 8 ++-- .../business/logistics/logisticsAddress.vue | 2 - .../business/logiticsCompany/lineBinding.vue | 3 -- src/views/app/business/luckey/luckey.vue | 40 ++++++++++--------- src/views/app/business/recharge/recharge.vue | 1 - .../app/business/recharge/rechargeOne.vue | 2 - src/views/app/company/logisticsAddress.vue | 2 - .../marketing-management.vue | 2 - src/views/app/shop/addEdit.vue | 1 - src/views/app/shop/dictManage.vue | 7 ---- src/views/app/shop/logisticsAddress.vue | 3 -- src/views/app/shop/mernage.vue | 2 - src/views/main-components/message-tip.vue | 3 -- src/views/my-components/hiver/map.vue | 1 - src/views/my-components/hiver/mapLocate.vue | 1 - src/views/sys/dict-manage/chlidrenList.vue | 3 -- src/views/sys/dict-manage/dictManage.vue | 1 - .../sys/order-manage/logisticsAddress.vue | 6 --- src/views/sys/order-manage/orderManage.vue | 2 - src/views/sys/upApp/upApp.vue | 2 +- 34 files changed, 42 insertions(+), 96 deletions(-) diff --git a/src/views/Main.vue b/src/views/Main.vue index cd55d2f..a1559fb 100644 --- a/src/views/Main.vue +++ b/src/views/Main.vue @@ -350,14 +350,13 @@ export default { } }, handleSubmenuChange(val) { - // console.log(val) + }, beforePush(name) { - // console.log(name) return true; }, fullscreenChange(isFullScreen) { - // console.log(isFullScreen); + }, resize() { let currWidth = document.body.clientWidth; diff --git a/src/views/app/bill/current/current.vue b/src/views/app/bill/current/current.vue index c6a2730..2570fc2 100644 --- a/src/views/app/bill/current/current.vue +++ b/src/views/app/bill/current/current.vue @@ -144,7 +144,6 @@ this.getDataList(); }, changeDate(v){ - console.log(v) this.searchForm.settlementDate = v }, getTime() { diff --git a/src/views/app/business/bus/addEdit.vue b/src/views/app/business/bus/addEdit.vue index 17431f7..e3eb969 100644 --- a/src/views/app/business/bus/addEdit.vue +++ b/src/views/app/business/bus/addEdit.vue @@ -174,7 +174,6 @@ }, changeDate(v){ - console.log(v) this.form.validStartTime = v[0] this.form.validEndTime = v[1] }, @@ -233,7 +232,7 @@ this.form.applyScene = JSON.stringify(this.form.applyScene) this.form.type = JSON.stringify(this.form.type) this.form.validType = JSON.stringify(this.form.validType) - console.log('优惠券',this.form) + } this.visible = value; }, diff --git a/src/views/app/business/bus/bus.vue b/src/views/app/business/bus/bus.vue index 8314fe8..75a0e28 100644 --- a/src/views/app/business/bus/bus.vue +++ b/src/views/app/business/bus/bus.vue @@ -404,7 +404,7 @@ }, checkStatus(v){ this.searchForm.applyScene = v - console.log(v) + }, changePage(v) { this.searchForm.pageNum = v; diff --git a/src/views/app/business/courier/courier.vue b/src/views/app/business/courier/courier.vue index 7ec17d0..44b2c52 100644 --- a/src/views/app/business/courier/courier.vue +++ b/src/views/app/business/courier/courier.vue @@ -288,6 +288,15 @@ title: "是否接指派", key: "getPushOrder", width: 180, + render: (h, params) => { + let re = "" + if (params.row.getPushOrder == 1) { + re = "接指派"; + } else if (params.row.getPushOrder == 0) { + re = "不接"; + } + return h("div", re); + } }, { title: "评分", @@ -452,7 +461,6 @@ }, checkStatusLine(v){ this.searchForm.isOnLine = v - console.log(v) }, showPic(v) { let image = new Image(); @@ -466,7 +474,6 @@ }, checkStatus(v){ this.searchForm.getPushOrder = v - console.log(v) }, selectDateRange(v) { if (v) { @@ -495,7 +502,6 @@ }, findAllRecord(v) { this.Visiable = true; - console.log(v) this.$nextTick(() => { this.$refs.dialog.initRecharge(v); }); diff --git a/src/views/app/business/courier/logisticsAddress.vue b/src/views/app/business/courier/logisticsAddress.vue index affe270..9d9d876 100644 --- a/src/views/app/business/courier/logisticsAddress.vue +++ b/src/views/app/business/courier/logisticsAddress.vue @@ -122,8 +122,6 @@ }, methods: { initRecharge(data) { - //data是父组件弹窗传递过来的值，我们可以打印看看 - console.log(data); this.searchForm.shopId = data.workerId; this.getDataList(); }, diff --git a/src/views/app/business/deliverytruck/deliveryTruck.vue b/src/views/app/business/deliverytruck/deliveryTruck.vue index 0da26ec..d38308c 100644 --- a/src/views/app/business/deliverytruck/deliveryTruck.vue +++ b/src/views/app/business/deliverytruck/deliveryTruck.vue @@ -651,7 +651,6 @@ export default { }); },findRechargeLog(v) { this.rechargeVisiable=true; - console.log(v) this.$nextTick(()=>{ this.$refs.rechargelog.initRecharge(v); }); diff --git a/src/views/app/business/deposit/deposit.vue b/src/views/app/business/deposit/deposit.vue index 12805dc..c77e85b 100644 --- a/src/views/app/business/deposit/deposit.vue +++ b/src/views/app/business/deposit/deposit.vue @@ -72,13 +72,10 @@ let re = "" if (params.row.linkType == 0) { re = "用户"; - } else if (params.row.type == 1) { + } else if (params.row.linkType == 1) { re = "配送员"; } - return h( - "div", - re - ); + return h("div", re); } }, { diff --git a/src/views/app/business/expressCompany/expressCompany.vue b/src/views/app/business/expressCompany/expressCompany.vue index 8b8701b..b782b4a 100644 --- a/src/views/app/business/expressCompany/expressCompany.vue +++ b/src/views/app/business/expressCompany/expressCompany.vue @@ -431,7 +431,6 @@ }, findRechargeLog(v) { this.rechargeVisiable = true; - console.log(v) this.$nextTick(() => { this.$refs.rechargelog.initRecharge(v); }); diff --git a/src/views/app/business/lineManage/addEdit.vue b/src/views/app/business/lineManage/addEdit.vue index 4ec25f0..c227989 100644 --- a/src/views/app/business/lineManage/addEdit.vue +++ b/src/views/app/business/lineManage/addEdit.vue @@ -308,10 +308,8 @@ this.visible = false }, getGoods(v) { - console.log('11111', v) this.form.productList1.productImage = v.productPicture this.form.productList1.productName = v.productName - console.log('22222', this.form) this.aaVisiable = false }, sreachShop(v) { @@ -331,7 +329,6 @@ }); }, checkShop(v) { - console.log("数据1", v) for (let i = 0; i < this.shopList.length; i++) { if (this.shopList[i].id == v) { let data = { @@ -385,7 +382,6 @@ }, checkStatusLine(v) { this.form.position = v - console.log(v) }, handleSelectRegion(v) { this.form.region = v; @@ -411,7 +407,6 @@ if (this.type == "0" || this.type == "1") { // 回显数据 let data = this.data; - console.log('回显数据', data) // 回显 this.form = data; diff --git a/src/views/app/business/lineManage/dictManage.vue b/src/views/app/business/lineManage/dictManage.vue index 7188776..5b361ae 100644 --- a/src/views/app/business/lineManage/dictManage.vue +++ b/src/views/app/business/lineManage/dictManage.vue @@ -104,7 +104,6 @@ }, methods: { init(v) { - console.log(v) this.searchForm.shopId = JSON.parse(v).id this.getDataList() }, diff --git a/src/views/app/business/lineManage/lineManage.vue b/src/views/app/business/lineManage/lineManage.vue index 5061cfc..d587382 100644 --- a/src/views/app/business/lineManage/lineManage.vue +++ b/src/views/app/business/lineManage/lineManage.vue @@ -348,8 +348,6 @@ this.showCompany = true; }, edit(v) { - // 转换null为"" - console.log(v) for (let attr in v) { if (v[attr] == null) { v[attr] = ""; diff --git a/src/views/app/business/lineManage/logisticsAddress.vue b/src/views/app/business/lineManage/logisticsAddress.vue index c2024be..c09a33a 100644 --- a/src/views/app/business/lineManage/logisticsAddress.vue +++ b/src/views/app/business/lineManage/logisticsAddress.vue @@ -186,8 +186,6 @@ }, methods: { initRecharge(data) { - //data是父组件弹窗传递过来的值，我们可以打印看看 - console.log(data); this.searchForm.circuitId = data.id; this.getDataList(); }, @@ -250,7 +248,6 @@ }, findAllRecords(v) { this.tranVisiable = true; - console.log(v) this.$nextTick(() => { this.$refs.dialog.initRecharges(v); }); diff --git a/src/views/app/business/lineManage/transferStation.vue b/src/views/app/business/lineManage/transferStation.vue index bab2082..aa3a94f 100644 --- a/src/views/app/business/lineManage/transferStation.vue +++ b/src/views/app/business/lineManage/transferStation.vue @@ -158,7 +158,6 @@ }, initRecharges(data) { this.detailVisible = true; - console.log(data); this.searchForm.stationId = data.id; this.form.stationId = data.id; this.getDataList(); diff --git a/src/views/app/business/logistics/logistics.vue b/src/views/app/business/logistics/logistics.vue index f3fb364..428d89e 100644 --- a/src/views/app/business/logistics/logistics.vue +++ b/src/views/app/business/logistics/logistics.vue @@ -221,6 +221,11 @@ key: "status", width: 100, align: "center", + }, { + title: "商家名", + key: "shopName", + width: 200, + align: "center", }, { title: "取货地址", key: "shopAddress", @@ -403,7 +408,6 @@ }, //点击页面转单-->点击弹窗转单 goTransferOrder(item) { - console.log('订单', item) runshOrder({ deliveryId: this.orderId, @@ -606,7 +610,6 @@ orderDetail(v) { let that = this; this.Visiable = true; - console.log(v) this.$nextTick(() => { that.$refs.dialog.initRecharge(v); }); @@ -617,7 +620,6 @@ this.searchWorker.getAreaId = v.getAreaId this.searchWorker.putAreaId = v.putAreaId this.orderId = v.id - console.log(v) this.getWorker(v) }, //获取人员列表 diff --git a/src/views/app/business/logistics/logisticsAddress.vue b/src/views/app/business/logistics/logisticsAddress.vue index 005ccca..2666f5a 100644 --- a/src/views/app/business/logistics/logisticsAddress.vue +++ b/src/views/app/business/logistics/logisticsAddress.vue @@ -164,8 +164,6 @@ this.orderDetail(data.orderId) }, getMinutesDiff(time1, time2) { - console.log('time1',time1) - console.log('time2',time2) // 将参数转换为 Date 对象，参数为 1 时取当前时间 const date1 = time1 === 1 ? new Date() : new Date(time1); const date2 = time2 === 1 ? new Date() : new Date(time2); diff --git a/src/views/app/business/logiticsCompany/lineBinding.vue b/src/views/app/business/logiticsCompany/lineBinding.vue index a9ee9cc..5fc7a1b 100644 --- a/src/views/app/business/logiticsCompany/lineBinding.vue +++ b/src/views/app/business/logiticsCompany/lineBinding.vue @@ -116,7 +116,6 @@ }, initRecharge(data) { this.detailVisible = true; - console.log(data); this.searchForm.companyId = data.id; this.searchForm.companyName = data.companyName; this.getDataList(); @@ -152,7 +151,6 @@ }, getBinding(){ this.loading = true; - console.log('this.searchForm',this.searchForm) let data = { pageNum:this.searchForm.pageNum, pageSize:this.searchForm.pageSize, @@ -171,7 +169,6 @@ }, //绑定按钮 binding(){ - console.log('this.selectList',this.selectList) for(let i=0;i - 当前校区：{{ regionId || '未识别（请确认账号已绑定校区）' }} + 当前校区：{{ regionName || '未识别（请确认账号已绑定校区）' }} @@ -179,7 +179,7 @@
- + @@ -239,7 +239,7 @@ - + + + + +