From 7bca1214aec5793d0748112b61f7f0ad53ac1ad0 Mon Sep 17 00:00:00 2001 From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com> Date: Sun, 19 Apr 2026 15:14:59 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/components/filters.vue | 6 +- pages/shop/SellerDetail.vue | 4 +- pages/shop/buy-order.vue | 2 +- pages/shop/buyorder-detail.vue | 1687 +++++++++-------- pages/shop/photoAlbum/photoManage.vue | 5 +- pages/shop/sj-info-change.vue | 8 +- pages/shop/userorder-detail.vue | 38 +- pages/shop/userorders.vue | 2 +- pages/shop/workSpace/components/orderCard.vue | 2 +- 9 files changed, 929 insertions(+), 825 deletions(-) diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue index 15f5381..2e70229 100644 --- a/pages/home/components/filters.vue +++ b/pages/home/components/filters.vue @@ -156,6 +156,7 @@ weChatRefund: "/sj/workSeatOrder/weChatRefund", aliRefund: "/sj/workSeatOrder/aliRefund", startOrder: "/sj/workSeatOrder/start", + sureOrder:"/sj/workSeatOrder/sure", endOrder: "/sj/workSeatOrder/end", ordernum: "/sj/workSeatOrder/orderNum", list: "/sj/workSeatOrder/list", @@ -405,6 +406,7 @@ return; } this.clickType = true; + console.log(111,this.activeFirstId,this.urls) request .post(this.urls[this.activeFirstId].sureOrder, { id: order.id, @@ -414,7 +416,7 @@ .then((res) => { if (res.state != 1 || res.code != 200) { uni.showToast({ - title: res.msg, + title: "开始服务", icon: "none", }); } else { @@ -459,7 +461,7 @@ console.log(res); if (res.state == 1 || res.code == 200) { uni.showToast({ - title: res.msg, + title: "开始服务", icon: "none", }); this.searchList(); diff --git a/pages/shop/SellerDetail.vue b/pages/shop/SellerDetail.vue index 740c86b..d3aa5e3 100644 --- a/pages/shop/SellerDetail.vue +++ b/pages/shop/SellerDetail.vue @@ -25,11 +25,11 @@ }} ×1 - {{identity==0?'使用场景':'服务范围'}}：{{ + 单价：{{ orderInfo.price }}元/10分钟 diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue index 951610c..1cdab7f 100644 --- a/pages/shop/buy-order.vue +++ b/pages/shop/buy-order.vue @@ -77,7 +77,7 @@ - 再来一单 + 再次购买 diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue index 01786d2..f20a06e 100644 --- a/pages/shop/buyorder-detail.vue +++ b/pages/shop/buyorder-detail.vue @@ -1,98 +1,94 @@ - \ No newline at end of file + /* 预约信息卡片 */ + .booking-card { + margin: 24rpx; + background-color: #FFFFFF; + border-radius: 16rpx; + padding: 24rpx; + box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50); + } + + .card-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 24rpx; + } + + .card-title { + font-size: 32rpx; + color: #333333; + font-weight: 500; + } + + .update-time { + font-size: 28rpx; + color: #333333; + padding-right: 4rpx; + } + + .update-change { + font-size: 28rpx; + color: #666666; + } + + .service-item { + display: flex; + flex-flow: row nowrap; + justify-content: flex-start; + align-items: center; + margin-bottom: 24rpx; + } + + .service-image { + width: 160rpx; + height: 160rpx; + border-radius: 16rpx; + margin-right: 24rpx; + background-color: #e2e2e2; + } + + .service-info { + flex: 1; + height: 160rpx; + display: flex; + flex-flow: column nowrap; + justify-content: space-between; + align-items: flex-start; + margin-right: 24rpx; + } + + .service-name { + font-size: 28rpx; + color: #333333; + margin-bottom: 8rpx; + } + + .service-price { + font-size: 32rpx; + color: #FF4D6B; + font-weight: 500; + } + + .service-count { + font-size: 28rpx; + color: #666666; + } + + .service-real { + display: flex; + flex-flow: row nowrap; + justify-content: flex-end; + align-items: baseline; + padding-top: 24rpx; + border-top: 1rpx solid rgba(0, 0, 0, 0.05); + } + + .real-lable { + font-size: 24rpx; + color: #333333; + } + + .real-price { + font-size: 32rpx; + font-weight: 500; + color: #E8101E; + } + + /* 订单信息卡片 */ + .order-card { + margin: 24rpx; + background-color: #FFFFFF; + border-radius: 16rpx; + padding: 24rpx; + box-shadow: 0 4rpx 16rpx 0 rgba(210, 213, 224, 0.50); + } + + .info-item { + display: flex; + justify-content: space-between; + margin-top: 16rpx; + } + + .label { + font-size: 28rpx; + color: #999999; + } + + .value { + font-size: 28rpx; + color: #333333; + } + + /* 底部按钮 */ + .bottom-buttons { + position: fixed; + left: 0; + right: 0; + bottom: 0; + height: 128rpx; + background-color: #FFFFFF; + display: flex; + flex-flow: row nowrap; + align-items: center; + justify-content: space-between; + box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.05); + padding: 0 24rpx 0 78rpx; + /* #ifdef H5 */ + padding-bottom: env(safe-area-inset-bottom); + /* #endif */ + z-index: 999; + } + + .contact-button { + display: flex; + flex-flow: column nowrap; + justify-content: center; + align-items: center; + } + + .contact-text { + font-size: 24rpx; + color: #666666; + } + + .tell-icon { + width: 36rpx; + height: 36rpx; + margin-right: 8rpx; + } + + .handel-button { + width: 240rpx; + height: 64rpx; + display: flex; + flex-flow: row nowrap; + justify-content: center; + align-items: center; + border-radius: 32rpx; + } + + .btn-border { + border: 1rpx solid #E8101E; + background-color: #fff; + box-sizing: border-box; + margin-left: 20rpx; + } + + .btn-bg { + background-color: #E8101E; + } + + .button-text { + font-size: 28rpx; + font-weight: 400; + color: #FFFFFF; + } + + .btn-border .button-text { + font-size: 28rpx; + font-weight: 400; + color: #E8101E; + } + + /* APP适配 */ + /* #ifdef APP-PLUS */ + .permission.transform { + top: calc(var(--status-bar-height) + 88rpx + 20rpx); + opacity: 1; + visibility: visible; + } + + .detail-page { + padding-bottom: 140rpx; + } + + /* #endif */ + /* 平台适配 */ + /* #ifdef H5 */ + .detail-page { + padding-bottom: calc(120rpx + env(safe-area-inset-bottom)); + } + + /* #endif */ + + /* #ifdef MP-WEIXIN */ + .custom-nav { + padding-top: calc(var(--status-bar-height) + constant(safe-area-inset-top)); + padding-top: calc(var(--status-bar-height) + env(safe-area-inset-top)); + } + + /* #endif */ + \ No newline at end of file diff --git a/pages/shop/photoAlbum/photoManage.vue b/pages/shop/photoAlbum/photoManage.vue index 834234a..13c7d3c 100644 --- a/pages/shop/photoAlbum/photoManage.vue +++ b/pages/shop/photoAlbum/photoManage.vue @@ -136,8 +136,11 @@ methods: { todetail() { console.log('详情'); + // uni.navigateTo({ + // url: '/pages/shop/skill-detail' + // }) uni.navigateTo({ - url: '/pages/shop/skill-detail' + url: `/pages/agreement/agreement?type=${this.type==1?22:23}&title=${this.type==1?`相册配置说明`:`视频配置说明`}` }) }, getItem(item) { diff --git a/pages/shop/sj-info-change.vue b/pages/shop/sj-info-change.vue index b4e0bfd..4a88b7c 100644 --- a/pages/shop/sj-info-change.vue +++ b/pages/shop/sj-info-change.vue @@ -1224,7 +1224,7 @@ } - \ No newline at end of file diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue index 0236388..26ae105 100644 --- a/pages/shop/userorders.vue +++ b/pages/shop/userorders.vue @@ -249,7 +249,7 @@ console.log(res); if (res.state == 1 || res.code == 200) { uni.showToast({ - title: res.msg, + title: "开始服务", icon: "none", }); this.$refs.groupRef.manualRefresh(this.listQuery); diff --git a/pages/shop/workSpace/components/orderCard.vue b/pages/shop/workSpace/components/orderCard.vue index 659c20f..134d454 100644 --- a/pages/shop/workSpace/components/orderCard.vue +++ b/pages/shop/workSpace/components/orderCard.vue @@ -126,7 +126,7 @@ "待支付", "待接单", "待开始", - "进行中", + "待完成", "已完成", "已评价", "已取消",