From 4aa397de35309e4c20270aef711e105a3c7fc719 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Fri, 8 May 2026 14:04:42 +0800 Subject: [PATCH] 1 --- package1/buyFood/buyFood.vue | 5 +- package1/group/groupBuySingle.vue | 4 +- package1/order/orderDetail.vue | 862 +++++++++++++++++------------- package1/order/pendGroup.vue | 4 +- package1/runErrand/runErrand.vue | 4 +- 5 files changed, 511 insertions(+), 368 deletions(-) diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index ca257d2..d1e092c 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -305,8 +305,9 @@ - - 支付剩余时间 59:09 + + 支付剩余时间 + diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index eb70041..6d893d2 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -439,8 +439,8 @@ - - 支付剩余时间 59:09 + + 支付剩余时间 diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 8a1cc52..4a076fa 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -16,11 +16,12 @@ {{orderDetail.shopName}} - + - + {{item1.productName}} @@ -48,7 +49,8 @@ 差{{orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers}}人即可成团 - + 快呼唤小伙伴参加吧！ @@ -56,30 +58,36 @@ - + - + + - 取消订单 - + 取消拼团转直接购买 刷新 - + @@ -94,12 +102,24 @@ - - - - - - + + + + + + - + 退款/售后 - - + + @@ -192,10 +221,12 @@ 金额 - {{item2.refundAmount}} + ￥{{item2.refundAmount}} - + @@ -237,7 +268,7 @@ 退款/售后类型 - {{item2.refundType == 1 ? '退商品' : item2.refundType == 2 ? '退配送费' : '全额退款' }} + {{item2.refundType == 1 ? '退商品 ' : item2.refundType == 2 ? '退配送费 ' : '全额退款 ' }} | {{item2.refundTypeStatus == 1 ? '商家原因' : item2.refundTypeStatus == 2 ? '配送员原因' : item2.refundTypeStatus == 3 ? '商家/配送员都有原因' : '平台退款' }} @@ -251,7 +282,8 @@ {{item2.status == 0 ? '处理退款中' : item2.status == 1 ? '同意退款' : item2.status == 2 ? '拒绝退款' : item2.status == 3 ? '处理售后中' : item2.status == 4 ? '同意售后' : '拒绝售后' }} - + 处理退款/售后时间 @@ -261,18 +293,21 @@ - + - + - + {{orderDetail.shopName}} - - + + @@ -281,7 +316,7 @@ {{item1.productName}} - {{item1.specs}} + {{item1.specs | delNode}} @@ -294,7 +329,8 @@ - + 打包费 @@ -302,7 +338,8 @@ ￥{{orderDetail.packageFee}} - + 配送费 @@ -310,7 +347,8 @@ ￥{{orderDetail.deliveryFee}} - + 优惠券 @@ -319,7 +357,8 @@ - + 实付 @@ -328,10 +367,11 @@ - + - + 取件地址 @@ -339,7 +379,8 @@ {{orderDetail.shopAddress}} - + 收件地址 @@ -347,7 +388,8 @@ {{orderDetail.receiverAddress}} - + 件数 @@ -355,7 +397,8 @@ {{orderDetail.deliveryInfo.allCount}} - + 服务类型 @@ -363,7 +406,8 @@ 快递/跑腿 - + 订单号 @@ -379,11 +423,13 @@ {{orderDetail.createTime | formatTime}} - + 配送员 - + {{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}} - + 配送员接单时间 @@ -401,15 +448,18 @@ {{orderDetail.deliveryInfo.acceptTime | formatTime}} - + 商家出餐时间 - + {{orderDetail.shopMakeTime ? orderDetail.shopMakeTime : '' | formatTime}} - + 配送员到店时间 @@ -417,7 +467,8 @@ {{orderDetail.deliveryInfo.arriveTime ? orderDetail.deliveryInfo.arriveTime : '' | formatTime}} - + 配送员取货时间 @@ -425,7 +476,8 @@ {{orderDetail.deliveryInfo.getTime ? orderDetail.deliveryInfo.getTime : '' | formatTime}} - + 送达时间 @@ -433,7 +485,8 @@ {{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}} - + 我的评价 @@ -461,8 +514,7 @@ - + @@ -486,7 +538,8 @@ - + @@ -509,10 +562,11 @@ - + - + @@ -520,14 +574,14 @@ - + 全额退款（商家原因） - + 全额退款（配送员原因） - + 全额退款（商家+配送员原因） @@ -544,7 +598,8 @@ - + @@ -554,57 +609,60 @@ - - - - - 取消订单需要商家同意 - - - - - - 商家还未出餐 + + + + + 取消订单需要商家同意 + + 请选择退款原因 + + + + + 商家还未出餐 + + + + + + + + 配送员到店时间：{{shopTime}} - - - - - - 配送员到店时间：{{shopTime}} - - - - - - - - 本单商家备餐时长：{{shopTime}} - - + + + + + + 本单商家备餐时长：{{shopTime}} + - - - - - 配送员配送时长：{{peisongTime}} - - + + + + + + 配送员配送时长：{{peisongTime}} + - - + 确认取消 - + - + 确定要取消拼团吗 @@ -614,7 +672,7 @@ - + @@ -622,14 +680,15 @@ 请输入要增加的佣金金额（元） - + 去支付 - + @@ -638,17 +697,21 @@ 增加配送佣金 - + ￥{{additionalFee || '0.00'}} - + 确认付款 - + 微信支付 @@ -656,10 +719,11 @@ - + - + @@ -670,73 +734,90 @@ export default { data() { return { - newQRList:'', - pintuan:false, - sellTime:2, + newQRList: '', + pintuan: false, + sellTime: 2, menuButtonInfo: {}, - refundType:3, - refundTypeStatus:1, - shopTime:'', - hasRefund:false, - peisongTime:'', - shopItem:{}, - orderId:'', - payData:{}, - orderDetail:{ - userCouponNum:0 + refundType: 3, + refundTypeStatus: 1, + shopTime: '', + hasRefund: false, + peisongTime: '', + shopItem: {}, + orderId: '', + payData: {}, + orderDetail: { + userCouponNum: 0 }, - codeImg:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/3a4e68eb14d7417cbb4f15fa85907c64.jpg', + codeImg: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/3a4e68eb14d7417cbb4f15fa85907c64.jpg', additionalFee: '', addFeeTradeNo: '' } }, components: { - + }, filters: { - formatHourMinute(value) { - if (!value) return ''; - - const date = new Date(value); - - // 获取日 (getDate)，并补齐0 - const day = String(date.getDate()).padStart(2, '0'); - - // 获取小时 (getHours)，并补齐0 - const hour = String(date.getHours()).padStart(2, '0'); - - // 获取分钟 (getMinutes)，并补齐0 - const minute = String(date.getMinutes()).padStart(2, '0'); - - // 拼接格式：日-日-时:分 - return `${day}-${hour}:${minute}`; - }, - formatTime(value) { - if (!value) return ''; - if(value == '尽快送达') return '尽快送达'; - const date = new Date(value); - - // 获取年份 - const year = date.getFullYear(); - - // 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0 - const month = String(date.getMonth() + 1).padStart(2, '0'); - - // 获取日 (getDate)，并补齐0 - const day = String(date.getDate()).padStart(2, '0'); - - // 获取小时 (getHours)，并补齐0 - const hour = String(date.getHours()).padStart(2, '0'); - - // 获取分钟 (getMinutes)，并补齐0 - const minute = String(date.getMinutes()).padStart(2, '0'); - - // 获取秒 (getSeconds)，并补齐0 - const second = String(date.getSeconds()).padStart(2, '0'); - - // 拼接格式：年-月-日 时:分:秒 - return `${year}-${month}-${day} ${hour}:${minute}:${second}`; - } + formatHourMinute(value) { + if (!value) return ''; + + const date = new Date(value); + + // 获取日 (getDate)，并补齐0 + const day = String(date.getDate()).padStart(2, '0'); + + // 获取小时 (getHours)，并补齐0 + const hour = String(date.getHours()).padStart(2, '0'); + + // 获取分钟 (getMinutes)，并补齐0 + const minute = String(date.getMinutes()).padStart(2, '0'); + + // 拼接格式：日-日-时:分 + return `${day}日${hour}:${minute}`; + }, + formatTime(value) { + if (!value) return ''; + if (value == '尽快送达') return '尽快送达'; + const date = new Date(value); + + // 获取年份 + const year = date.getFullYear(); + + // 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0 + const month = String(date.getMonth() + 1).padStart(2, '0'); + + // 获取日 (getDate)，并补齐0 + const day = String(date.getDate()).padStart(2, '0'); + + // 获取小时 (getHours)，并补齐0 + const hour = String(date.getHours()).padStart(2, '0'); + + // 获取分钟 (getMinutes)，并补齐0 + const minute = String(date.getMinutes()).padStart(2, '0'); + + // 获取秒 (getSeconds)，并补齐0 + const second = String(date.getSeconds()).padStart(2, '0'); + + // 拼接格式：年-月-日 时:分:秒 + return `${year}-${month}-${day} ${hour}:${minute}:${second}`; + }, + delNode(data) { + // 1. 统一转为字符串 + let str; + if (typeof data === 'object' && data !== null) { + // 对象或数组 → JSON 字符串 + str = JSON.stringify(data); + } else if (typeof data === 'string') { + str = data; + } else { + // 其他类型（数字、布尔等）先转字符串 + str = String(data); + } + + // 2. 删除所有大括号 { } 和双引号 " + const result = str.replace(/[{}"]/g, ''); + return result; + } }, onLoad(option) { if (option.id) { @@ -763,20 +844,21 @@ let targetMembers = that.orderDetail.groupInfo.targetMembers; let shopItemStr = encodeURIComponent(JSON.stringify(that.shopItem)); let isFTF = that.orderDetail.orderType == 3 ? 1 : 0; - let path = `/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`; - + let path = + `/package1/group/groupBuySingle?type=shop&item=${shopItemStr}&groupId=${groupId}&targetMembers=${targetMembers}&isFaceToFace=${isFTF}`; + return { title: '快来一起拼单吧！', path: path, - imageUrl:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/62c9aa038b2541ad9c400a76ddae7ef8.png' + imageUrl: 'https://jewel-shop.oss-cn-beijing.aliyuncs.com/62c9aa038b2541ad9c400a76ddae7ef8.png' } }, onUnload() { uni.$off('updateDeliveryWorker'); }, - + methods: { - openCode(){ + openCode() { let that = this this.$refs.imgPopup.open() this.$refs.uqrcode.toTempFilePath({ @@ -836,7 +918,7 @@ }, 1000) }, //立即备餐 - makeMeal(){ + makeMeal() { let that = this; uni.showModal({ title: '提示', @@ -844,7 +926,7 @@ success: function(res) { if (res.confirm) { that.tui.request("/mall/order/userRequireMake", "POST", { - orderId:that.orderDetail.id, + orderId: that.orderDetail.id, }, false, true).then((res) => { if (res.code == 200) { that.tui.toast('通知成功！'); @@ -859,61 +941,62 @@ } }); }, - checkSellTime(type){ + checkSellTime(type) { this.sellTime = type; - if(this.sellTime == 2){ + if (this.sellTime == 2) { //this.returnData.refundAmount = this.orderDetail.totalAmount this.refundType = 3 this.refundTypeStatus = 1 - }else if(this.sellTime == 3){ + } else if (this.sellTime == 3) { //this.returnData.refundAmount = this.orderDetail.totalAmount this.refundType = 3 this.refundTypeStatus = 2 - }else{ + } else { //this.returnData.refundAmount = this.orderDetail.totalAmount this.refundType = 3 this.refundTypeStatus = 3 } }, - makeCall(phone){ + makeCall(phone) { uni.makePhoneCall({ phoneNumber: phone }); }, - checkEvaluate(){ + checkEvaluate() { console.log(this.orderDetail) - if(this.orderDetail.comments != null && this.orderDetail.comments.length>0){ + if (this.orderDetail.comments != null && this.orderDetail.comments.length > 0) { this.$refs.evaluatePopup.open() - }else{ + } else { this.tui.toast("暂无评价"); } }, - orderStatus(item){ - if(item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == 1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4){ + orderStatus(item) { + if (item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == + 1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4) { return true; } return false; }, - orderStatusBuy(item){ - if(item.status == 10){ + orderStatusBuy(item) { + if (item.status == 10) { return true; } return false; }, - returnPopupProp(item){ + returnPopupProp(item) { this.payData = item; - - if(this.payData.otherOrder == 1){ + + if (this.payData.otherOrder == 1) { this.refundType = 3 this.refundTypeStatus = 2 } - if(this.payData.shopMakeTime != null){ + if (this.payData.shopMakeTime != null) { const date1 = new Date(this.payData.deliveryInfo.acceptTime); const date2 = new Date(this.payData.shopMakeTime); - + // 2. 计算毫秒差值 (取绝对值，防止结果为负数) let diffMs = Math.abs(date2 - date1); - + // 3. 数学换算 // 1秒 = 1000毫秒 // 1分 = 60秒 @@ -921,17 +1004,17 @@ const seconds = Math.floor((diffMs / 1000) % 60); const minutes = Math.floor((diffMs / (1000 * 60)) % 60); const hours = Math.floor(diffMs / (1000 * 60 * 60)); - + // 4. 格式化输出 (可选：补零操作，例如 9秒 -> 09秒) const fmt = (num) => num.toString().padStart(2, '0'); - - this.shopTime = `${fmt(hours)}时${fmt(minutes)}分${fmt(seconds)}秒`; - + + this.shopTime = `${fmt(hours)}时${fmt(minutes)}分${fmt(seconds)}秒`; + const date3 = new Date(); - + // 2. 计算毫秒差值 (取绝对值，防止结果为负数) let diffMs1 = Math.abs(date3 - date2); - + // 3. 数学换算 // 1秒 = 1000毫秒 // 1分 = 60秒 @@ -939,20 +1022,20 @@ const seconds1 = Math.floor((diffMs1 / 1000) % 60); const minutes1 = Math.floor((diffMs1 / (1000 * 60)) % 60); const hours1 = Math.floor(diffMs1 / (1000 * 60 * 60)); - - this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`; + + this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`; } this.$refs.returnPopup.open('bottom'); }, - returnPopupPropBuy(item){ + returnPopupPropBuy(item) { this.payData = item; - if(this.payData.shopMakeTime != null){ + if (this.payData.shopMakeTime != null) { const date1 = new Date(this.payData.deliveryInfo.acceptTime); const date2 = new Date(this.payData.shopMakeTime); - + // 2. 计算毫秒差值 (取绝对值，防止结果为负数) let diffMs = Math.abs(date2 - date1); - + // 3. 数学换算 // 1秒 = 1000毫秒 // 1分 = 60秒 @@ -960,17 +1043,17 @@ const seconds = Math.floor((diffMs / 1000) % 60); const minutes = Math.floor((diffMs / (1000 * 60)) % 60); const hours = Math.floor(diffMs / (1000 * 60 * 60)); - + // 4. 格式化输出 (可选：补零操作，例如 9秒 -> 09秒) const fmt = (num) => num.toString().padStart(2, '0'); - - this.shopTime = `${fmt(hours)}时${fmt(minutes)}分${fmt(seconds)}秒`; - + + this.shopTime = `${fmt(hours)}时${fmt(minutes)}分${fmt(seconds)}秒`; + const date3 = new Date(); - + // 2. 计算毫秒差值 (取绝对值，防止结果为负数) let diffMs1 = Math.abs(date3 - date2); - + // 3. 数学换算 // 1秒 = 1000毫秒 // 1分 = 60秒 @@ -978,16 +1061,25 @@ const seconds1 = Math.floor((diffMs1 / 1000) % 60); const minutes1 = Math.floor((diffMs1 / (1000 * 60)) % 60); const hours1 = Math.floor(diffMs1 / (1000 * 60 * 60)); - - this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`; + + this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`; } this.$refs.returnPopupBuy.open('bottom'); }, - returnOrder(){ + returnOrder() { + if(sellTime == 5 && remark == ""){ + that.tui.toast("请填写备注"); + return + } this.$refs.returnPopup.close(); let item = this.payData let that = this - that.tui.request("/mall/order/cancel", "POST", {refundType:this.refundType,refundTypeStatus:this.refundTypeStatus,orderId:item.id,userId:uni.getStorageSync('id')}, false, true).then((res) => { + that.tui.request("/mall/order/cancel", "POST", { + refundType: this.refundType, + refundTypeStatus: this.refundTypeStatus, + orderId: item.id, + userId: uni.getStorageSync('id') + }, false, true).then((res) => { if (res.code == 200) { that.tui.toast("取消订单成功"); that.getOrderDetail(item.id) @@ -999,25 +1091,36 @@ uni.hideLoading(); }).catch((res) => {}); }, - returnOrderBuy(){ + returnOrderBuy() { this.$refs.returnPopupBuy.close(); let item = this.payData let that = this - that.tui.request("/mall/order/cancel", "POST", {refundType:3,refundTypeStatus:4,orderId:item.id,userId:uni.getStorageSync('id')}, false, true).then((res) => { + that.tui.request("/mall/order/cancel", "POST", { + refundType: 3, + refundTypeStatus: 4, + orderId: item.id, + userId: uni.getStorageSync('id') + }, false, true).then((res) => { if (res.code == 200) { - that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.payData.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => { + that.tui.request("/app/shop/getShopInfoById", "POST", { + id: that.payData.shopId, + regionId: JSON.parse(uni.getStorageSync('area')).id + }, false, true).then((res1) => { if (res1.code == 200) { uni.hideLoading(); // 类似普通订单结算逻辑 let cartItems = []; - for(let i = 0;i 0) { priceToUse = parseFloat(pObj[0].specPrice); @@ -1044,8 +1147,10 @@ }); } uni.navigateTo({ - url: '/package1/buyFood/buyFood?cart=' + encodeURIComponent(JSON.stringify(cartItems)) + - '&shopItem=' + encodeURIComponent(JSON.stringify(res1.result.shop)) + '&packageFee=' + + url: '/package1/buyFood/buyFood?cart=' + encodeURIComponent( + JSON.stringify(cartItems)) + + '&shopItem=' + encodeURIComponent(JSON.stringify(res1 + .result.shop)) + '&packageFee=' + that.payData.packageFee }); } else { @@ -1061,47 +1166,52 @@ uni.hideLoading(); }).catch((res) => {}); }, - refreah(item){ + refreah(item) { this.getOrderDetail(item.id) this.$forceUpdate(); }, - returnProducts(item){ + returnProducts(item) { uni.redirectTo({ url: '/package1/order/returnOrder?order=' + encodeURIComponent(JSON.stringify(item)) }); }, - getOrderDetail(id){ + getOrderDetail(id) { this.pintuan = false; let that = this - that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => { + that.tui.request("/mall/order/detail/" + id, "GET", {}, false, true).then((res) => { if (res.code == 200) { that.orderDetail = res.result; - if(that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > 0){ - for(let i = 0; i < that.orderDetail.mallRefundRecord.length;i++){ - if(that.orderDetail.mallRefundRecord[i].status >= 3){ + if (that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > + 0) { + for (let i = 0; i < that.orderDetail.mallRefundRecord.length; i++) { + if (that.orderDetail.mallRefundRecord[i].status >= 3) { that.hasRefund = true } } } - if(that.orderDetail.groupInfo){ + if (that.orderDetail.groupInfo) { //还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开) - if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){ + if (that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2) { that.pintuan = true; - that.tui.request("/app/shop/getShopInfoById", "POST", {id:that.orderDetail.shopId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res1) => { + that.tui.request("/app/shop/getShopInfoById", "POST", { + id: that.orderDetail.shopId, + regionId: JSON.parse(uni.getStorageSync('area')).id + }, false, true).then((res1) => { if (res1.code == 200) { that.shopItem = res1.result.shop } else { that.tui.toast(res1.message); return; } - + }).catch((res1) => {}); } } that.orderDetail.userCouponNum = 0 - if(that.orderDetail.userCoupon.length > 0){ - for(let i = 0;i 0) { + for (let i = 0; i < that.orderDetail.userCoupon.length; i++) { + that.orderDetail.userCouponNum += Number(that.orderDetail.userCoupon[i] + .discountAmount) } } that.$forceUpdate(); @@ -1206,7 +1316,10 @@ // 模拟支付成功(用于测试环境) if (res.code == 404 || res.code == 500 || res.code == 400 || !res.code) { that.$refs.addFeePayPopup.close(); - uni.showToast({ title: '支付成功(模拟)', icon: 'none' }); + uni.showToast({ + title: '支付成功(模拟)', + icon: 'none' + }); setTimeout(() => { that.callAddFeeApi(); }, 1500); @@ -1226,8 +1339,8 @@ that.tui.request("/mall/delivery/addFee", "POST", { deliveryId: deliveryId, additionalFee: fee, - orderId:that.orderDetail.id, - olditionalFee:that.orderDetail.deliveryFee ? that.orderDetail.deliveryFee : 0 + orderId: that.orderDetail.id, + olditionalFee: that.orderDetail.deliveryFee ? that.orderDetail.deliveryFee : 0 }, false, true).then((res) => { if (res.code == 200) { that.tui.toast("增加佣金成功"); @@ -1244,7 +1357,7 @@ uni.navigateBack() } } - + } @@ -1256,127 +1369,141 @@ background: #F5F8F5; color: #00231C; } - + .page1 { width: 100%; height: 100%; font-size: 24rpx; position: relative; } - - .title{ + + .title { background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/8bc15960c2dc40268e295d6dd23aecce.png') no-repeat; width: 100%; height: 54%; } - - .content{ + + .content { position: absolute; top: 220rpx; width: 100%; } - - .title-sreach{ + + .title-sreach { width: 100%; display: flex; - height: 200rpx; + height: 260rpx; position: relative; } - - .back-btn{ + + .back-btn { position: absolute; bottom: 0; left: 0; } - .box1{ + + .box1 { width: 95%; margin: 0 auto 20rpx; background: #fff; border-radius: 20rpx; - padding: 20rpx; + padding: 20rpx; } + .goods-img { width: 160rpx; height: 160rpx; position: relative; - + img { width: 100%; background-size: 100%; height: 100%; } } + .goods-content { flex: 1; padding-left: 20rpx; } - + .goods-name { font-size: 32rpx; font-weight: 900; } - + .goods-content-center { display: flex; - margin: 16rpx 0; - color: #777; + margin: 16rpx 0; + color: #777; } + .goods-content-bottom { - display: flex; - line-height: 56rpx; - color: #777; + display: flex; + line-height: 56rpx; + color: #777; } + .pintuan-left-price { - width: 50%; - text-align: right; - font-weight: 700; - color: #000; + width: 50%; + text-align: right; + font-weight: 700; + color: #000; } - .status-img{ - width: 84rpx; - height: 84rpx; - img{ - width: 84rpx; - height: 84rpx; - background-size: 100%; - } + + .status-img { + width: 84rpx; + height: 84rpx; + + img { + width: 84rpx; + height: 84rpx; + background-size: 100%; + } } - .status-text{ + + .status-text { flex: 1; - position: relative; - padding-left: 20rpx; + position: relative; + padding-left: 20rpx; } - .status-zhu{ - font-size: 32rpx; - font-weight: 700; + + .status-zhu { + font-size: 32rpx; + font-weight: 700; } - .status-fu{ - height: 50rpx; - line-height: 50rpx; + + .status-fu { + height: 50rpx; + line-height: 50rpx; } - .status-address{ - font-weight: 700; + + .status-address { + font-weight: 700; } - .status-btn{ + + .status-btn { position: absolute; - top: 20rpx; - right: 0; - background: #eee; - width: 130rpx; - height: 50rpx; - text-align: center; - line-height: 50rpx; - border-radius: 16rpx; - color: #777; - border: 1px solid #777; - font-size: 20rpx; + top: 20rpx; + right: 0; + background: #f5f5f5; + width: 130rpx; + height: 50rpx; + text-align: center; + line-height: 50rpx; + border-radius: 16rpx; + color: #777; + border: 1px solid #777; + font-size: 20rpx; } - .btn-box{ + + .btn-box { height: auto; display: flex; margin-bottom: 10px; } - .btn{ + + .btn { width: 90%; height: 100rpx; line-height: 100rpx; @@ -1387,77 +1514,81 @@ margin: 0 auto; font-weight: 700; } + .img-popup-content { width: 600rpx; height: 800rpx; background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/73e684e3319c468d9252461ba3c9e95b.png') no-repeat; background-size: 100%; } - .evaluate-content{ + + .evaluate-content { width: 600rpx; height: 800rpx; background: #fff; border-radius: 20rpx; padding: 20rpx; } - + .title1 { background: url('https://jewel-shop.oss-cn-beijing.aliyuncs.com/69c894452e924bedbb5a24bf978f47c7.png') no-repeat; width: 100%; height: 30%; background-size: 100%; } - + .title-sreach1 { width: 100%; display: flex; height: 200rpx; position: relative; } - + .back-btn1 { position: absolute; bottom: 0; left: 0; } - + .box11 { width: 95%; margin: 0 auto 20rpx; background: #fff; border-radius: 20rpx; padding: 20rpx; - position: absolute;top: 450rpx;left: 2.5%; + position: absolute; + top: 450rpx; + left: 2.5%; } - + .goods-img1 { width: 160rpx; height: 160rpx; position: relative; - + img { width: 100%; background-size: 100%; height: 100%; } } - + .goods-content1 { flex: 1; padding-left: 20rpx; } - + .goods-name1 { font-size: 32rpx; font-weight: 900; } - + .goods-content-center1 { display: flex; margin: 16rpx 0; color: #777; } - + .pintuan-left-price1 { width: 55%; text-align: right; @@ -1465,13 +1596,13 @@ color: #000; display: flex; } - + .goods-content-bottom { display: flex; line-height: 56rpx; color: #777; } - + .ziqu-xuanfu1 { position: absolute; top: 0; @@ -1486,7 +1617,7 @@ text-align: center; line-height: 56rpx; } - + .weipincheng1 { width: 90rpx; height: 90rpx; @@ -1500,109 +1631,118 @@ color: #02fbdd; border: 1px solid #a6ffea; line-height: 80rpx; - margin: 0 auto; + margin: 0 auto; } - .kaituan11{ + + .kaituan11 { display: flex; - height: 70rpx; - font-size: 44rpx; - font-weight: 700; - margin-top: 20rpx; + height: 70rpx; + font-size: 44rpx; + font-weight: 700; + margin-top: 20rpx; } - .kaituan1-title1{ + + .kaituan1-title1 { position: relative; - margin-left: 20rpx; + margin-left: 20rpx; } - .kaituan1-title11{ - font-size: 24rpx; - background: rgba(224, 255, 222, 0.65); - border: 1px solid rgba(166, 255, 234, 1); - border-radius: 20rpx; - height: 44rpx; - line-height: 38rpx; - width: 280rpx; - text-align: center; - margin: 10rpx 0 0 20rpx; + + .kaituan1-title11 { + font-size: 24rpx; + background: rgba(224, 255, 222, 0.65); + border: 1px solid rgba(166, 255, 234, 1); + border-radius: 20rpx; + height: 44rpx; + line-height: 38rpx; + width: 280rpx; + text-align: center; + margin: 10rpx 0 0 20rpx; } - .kaituan21{ + + .kaituan21 { display: flex; - width: 90%; - margin: 40rpx auto; + width: 90%; + margin: 40rpx auto; } - .kaituan221{ - flex: 1; + + .kaituan221 { + flex: 1; } - .kaituan31{ + + .kaituan31 { height: 80rpx; - line-height: 80rpx; - text-align: center; - color: #777; + line-height: 80rpx; + text-align: center; + color: #777; } - .kaituan41{ - width: 95%; - height: 100rpx; - background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); - border-radius: 100rpx; - text-align: center; - line-height: 100rpx; - font-size: 30rpx; - font-weight: 700; - margin: 20rpx auto; + + .kaituan41 { + width: 95%; + height: 100rpx; + background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); + border-radius: 100rpx; + text-align: center; + line-height: 100rpx; + font-size: 30rpx; + font-weight: 700; + margin: 20rpx auto; } - .kaituan51{ + + .kaituan51 { margin: 80rpx 0 40rpx; } + .evaluate-list { margin-top: 40rpx; } - + .eval-title { width: 100%; height: 80rpx; display: flex; } - + .eval-icon { height: 80rpx; width: 80rpx; - + img { width: 100%; height: 100%; background-size: 100%; } } - + .eval-name { margin-left: 20rpx; } - + .name1 { font-size: 28rpx; line-height: 50rpx; font-weight: 700; } - + .eval-rate { display: flex; margin: 20rpx 0 0 100rpx; height: 48rpx; line-height: 40rpx; } - + .eval-content { margin-left: 100rpx; font-size: 28rpx; color: #777; line-height: 48rpx; } - + .eval-img { display: flex; width: 100%; overflow-x: scroll; margin-top: 20rpx; - + img { width: 100rpx; height: 100rpx; @@ -1610,6 +1750,7 @@ margin-right: 20rpx; } } + .car-close { width: 60rpx; height: 60rpx; @@ -1617,7 +1758,7 @@ top: -80rpx; right: 20rpx; } - + .car-title { height: 96rpx; line-height: 60rpx; @@ -1625,7 +1766,8 @@ font-size: 28rpx; font-weight: 700; } - .share-btn::after{ + + .share-btn::after { border: 0; } \ No newline at end of file diff --git a/package1/order/pendGroup.vue b/package1/order/pendGroup.vue index 933411a..91bc0bf 100644 --- a/package1/order/pendGroup.vue +++ b/package1/order/pendGroup.vue @@ -69,8 +69,8 @@ - - 剩余23:59:23结束 + + 剩余结束 分享至微信 diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue index eb1c599..8bdb5b1 100644 --- a/package1/runErrand/runErrand.vue +++ b/package1/runErrand/runErrand.vue @@ -285,8 +285,8 @@ - - 支付剩余时间 59:09 + + 支付剩余时间 ￥{{backendTotalAmount ? backendTotalAmount.toFixed(2) : totalAmountCalc.toFixed(2)}}