From ffc25489d04ea045baa0e3bb6bfecd52cf3f9479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Fri, 14 Mar 2025 18:10:12 +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 --- pages/detection/Merchantproducts.vue | 9 +- pages/detection/orderdetais.vue | 132 +++++++++++++-------------- 2 files changed, 71 insertions(+), 70 deletions(-) diff --git a/pages/detection/Merchantproducts.vue b/pages/detection/Merchantproducts.vue index 4138725..e6287f3 100644 --- a/pages/detection/Merchantproducts.vue +++ b/pages/detection/Merchantproducts.vue @@ -480,7 +480,8 @@ carIdNo: this.zjData.Vin, carNo: this.zjData.PlateNo, couponId: this.couponId, - pickCarId: this.pickCarId + pickCarId: this.pickCarId, + appointmentId: restime.data, } let res = await request({ @@ -635,7 +636,7 @@ }) }, - // + // open() { console.log('open'); }, @@ -1249,7 +1250,7 @@ } - // + // .ail-box { width: 100%; border-radius: 8px; @@ -1475,4 +1476,4 @@ background-color: #1c3d9c; color: #fff; } - \ No newline at end of file + diff --git a/pages/detection/orderdetais.vue b/pages/detection/orderdetais.vue index ea07fc3..3cda1b9 100644 --- a/pages/detection/orderdetais.vue +++ b/pages/detection/orderdetais.vue @@ -17,14 +17,14 @@ - + {{detailData.workerName}} - - + + @@ -48,7 +48,7 @@ 车牌号: {{detailData.carNum}} - + @@ -76,7 +76,7 @@ {{detailData.endTime || ''}} - + {{detailData.remark || ''}} @@ -89,7 +89,7 @@ - + 推荐M站 @@ -100,13 +100,13 @@ - - + + {{item.siteName}} {{item.siteAddress}} - + @@ -114,12 +114,12 @@ 联系人: {{item.siteContractName}} - + 联系人电话: {{item.siteContractPhone}} - + @@ -138,7 +138,7 @@ ¥{{items.price / 100}} - + @@ -214,7 +214,7 @@ pageNum:that.pageNum } request({ - + url: '/inspection/info/list', method: 'get', params: data @@ -225,7 +225,7 @@ that.listarr = res.rows } let total = res.total - that.totalPages = Math.ceil(total / that.pageSize); + that.totalPages = Math.ceil(total / that.pageSize); }) },fail(e) { let data = { @@ -236,7 +236,7 @@ pageNum:that.pageNum } request({ - + url: '/inspection/info/list', method: 'get', params: data @@ -247,14 +247,14 @@ that.listarr = res.rows } let total = res.total - that.totalPages = Math.ceil(total / that.pageSize); + that.totalPages = Math.ceil(total / that.pageSize); }) } }); - - + + }, - + // M callUser(phone){ uni.makePhoneCall({ @@ -276,13 +276,13 @@ url:'/partnerOwn/partner/stopInspection', method: 'post', data:inspectionInfo - }) + }) if(res.code == 200){ this.closehge() uni.showToast({ title:"成功", - - }) + + }) uni.reLaunch({ url:'/pages/staff/staff' }); @@ -305,8 +305,8 @@ url:'/partnerOwn/partner/addStepInfo', method: 'post', data:this.stepInfo - - }) + + }) if(res.code == 200){ this.fileList1 =[] this.fileList2 =[] @@ -314,36 +314,36 @@ this.xling = false uni.showToast({ title:"成功", - }) + }) this.getindex() - + uni.reLaunch({ url:'/pages/index/ordermanage' }) - + } if(res.code == 500){ uni.showToast({ title:"已结束", - }) + }) uni.reLaunch({ url:'/pages/index/ordermanage' }) } }, async getindex(){ - + let res = await request({ url:'/appInspection/order/inspectionDetail', method: 'get', params:{ inspectionInfoId:this.inspectionInfoId } - }) + }) this.detailData = res.data - + }, - + getback(){ uni.navigateBack() }, @@ -354,7 +354,7 @@ closexl(e){ this.xling = false console.log('n'); - + }, openxl(e){ console.log('y'); @@ -386,7 +386,7 @@ lists.map((item) => { this[`fileList${event.name}`].push({ ...item, - + }) }) for (let i = 0; i < lists.length; i++) { @@ -402,15 +402,15 @@ }, uploadFilePromise(url) { console.log(url); - upload({ + upload({ url:'/common/upload', - filePath: url, + filePath: url, }).then((res)=>{ // this.newsCover = res.fileName this.fileList2.push(res.fileName) console.log(res); }) - + }, deletePic1(event) { this[`fileList${event.name}`].splice(event.index, 1) @@ -430,7 +430,7 @@ height: 100%; background: #F4F4F4; } - + .top-heder{ width: 100%; // height: 46px; @@ -492,13 +492,13 @@ border-radius: 50%; overflow: hidden; margin: 10px auto; - + } .sanniu{ width: 105px; height: 35px; background: #0D2E8D; - border-radius: 50px; + border-radius: 50px; display: flex; align-items: center; justify-content: center; @@ -512,7 +512,7 @@ width: 90%; height: 45px; background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); - border-radius: 50px; + border-radius: 50px; display: flex; align-items: center; justify-content: center; @@ -526,7 +526,7 @@ width: 20%; height: 30px; background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%); - border-radius: 50px; + border-radius: 50px; display: flex; align-items: center; justify-content: center; @@ -535,7 +535,7 @@ color: #FFFFFF; } .box{ - + } .zdxdbt{ width: 100%; @@ -595,21 +595,21 @@ border-radius: 6px; box-sizing: border-box; padding: 2px 5px ; - + } .on-input{ width: 100%; display: flex; justify-content: space-between; align-items: center; - margin: 15px auto; + margin: 15px auto; } .on-inputx{ width: 100%; display: flex; - + align-items: center; - margin: 15px auto; + margin: 15px auto; } .bottom-input{ border-top: 1px solid #F4F4F4; @@ -696,7 +696,7 @@ align-items: center; justify-content: center; color: #0D2E8D; - + } .imgs-warp{ width: 100%; @@ -713,7 +713,7 @@ width: 100%; height: 100%; } - + } .anniu{ box-sizing: border-box; @@ -733,7 +733,7 @@ padding: 2px 10px; margin: 0px 10px; background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%) !important; - + border-radius: 23px; font-size: 15px; color: white !important; @@ -809,9 +809,9 @@ font-size: 20px; font-weight: bold; color: #333333; - + } - + .huang{ margin-left: 20px; color: #FF9600; @@ -875,7 +875,7 @@ // display: flex; // justify-content: space-between; // align-items: center; - + } .santu{ width: 32%; @@ -895,7 +895,7 @@ } .ming{ width: 100%; - white-space: nowrap; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; font-size: 15px; @@ -933,7 +933,7 @@ font-size: 18px; font-weight: bold } - + .top-list { width: 100%; height: 88rpx; @@ -942,16 +942,16 @@ align-items: center; justify-content: space-between; } - + .list-box { height: 100%; width: 33%; display: flex; align-items: center; justify-content: center; - + } - + /* 遮罩 */ .xuanx { position: fixed; @@ -963,7 +963,7 @@ .nbian{ padding-top: 45px; } - + .x-xiang { width: 100%; background: white; @@ -977,9 +977,9 @@ background: white; box-sizing: border-box; padding: 30rpx; - + } - + .ann { display: flex; align-items: center; @@ -993,13 +993,13 @@ margin-right: 20rpx; margin-bottom: 30rpx; } - + .ax { font-size: 28rpx; background: #0D2E8D; color: white !important; } - + .xsanniu { border-top: 1px solid #EEEEEE; background: white; @@ -1009,7 +1009,7 @@ justify-content: space-between; align-items: center; } - + .wc { width: 436rpx; height: 80rpx; @@ -1021,7 +1021,7 @@ font-size: 32rpx; justify-content: center; } - + .fanhu { width: 224rpx; height: 80rpx; @@ -1034,4 +1034,4 @@ color: #0D2E8D; justify-content: center; } - \ No newline at end of file +