diff --git a/package1/myCenter/shopOrderList.vue b/package1/myCenter/shopOrderList.vue index dfb299c..74cd40b 100644 --- a/package1/myCenter/shopOrderList.vue +++ b/package1/myCenter/shopOrderList.vue @@ -35,7 +35,7 @@ - 商品 1 + 商品 1 已出餐 diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue index 9c37a88..6d657bc 100644 --- a/package1/order/returnOrder.vue +++ b/package1/order/returnOrder.vue @@ -171,8 +171,7 @@ {{orderDetail.deliveryInfo.finishTime ? orderDetail.deliveryInfo.finishTime : '尽快送达' | formatTime}} - 申请售后¥{{allReturnPrice}} @@ -190,8 +189,25 @@ 选择退款原因 - - + + + 只退商品 + + + + 退配送费 + + + + 全额退款(商家原因) + + + + 全额退款(配送员原因) + + + + 确认 @@ -213,6 +229,7 @@ export default { data() { return { + sellTime:0, pintuan:false, menuButtonInfo: {}, orderId:'', @@ -278,9 +295,12 @@ }, onShow() { this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() - this.$refs.carPopup.open(); + this.$refs.carPopup.open('bottom'); }, methods: { + checkSellTime(type){ + this.sellTime = type; + }, openCode(){ this.$refs.imgPopup.open() }, @@ -693,6 +713,7 @@ .car-content { position: relative; height: auto; + background: #fff; max-height: 1200rpx; width: 100%; border-top-left-radius: 20rpx; @@ -716,4 +737,15 @@ font-size: 28rpx; font-weight: 700; } + .btn { + width: 95%; + height: 100rpx; + font-size: 32rpx; + font-weight: 700; + background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); + border-radius: 100rpx; + line-height: 100rpx; + text-align: center; + margin: 40rpx auto; + } \ No newline at end of file