root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
tianyi 15 hours ago
parent
2ffc8f3f89
commit
fa9d5e1410
2 changed files with 39 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      package1/order/orderDetail.vue
  2. 2
      package1/order/orderEvaluate.vue

64
package1/order/orderDetail.vue
View File

@ -176,9 +176,9 @@
<view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;"> <view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;">
退款/售后 退款/售后
</view> </view>
<view style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;" v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2"> <view style="display: flex;margin-top:10px;padding: 20rpx;background: #eee;border-radius: 20rpx;" v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
<view> <view style="width: 100%;">
<view style="height: 80rpx;line-height: 80rpx;display: flex;"> <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;"> <view style="flex: 1;color: #777;font-weight: 700;">
申请时间 申请时间
@ -503,40 +503,37 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="returnPopup" background-color="#fff" style="height: 1600rpx !important;"> <uni-popup ref="returnPopup" background-color="#fff">
<view class="car-content" v-if="orderDetail.deliveryType == 1 && orderDetail.status != 10 && orderDetail.otherOrder != 1"> <view class="car-content" style="height: auto;padding: 20rpx;" v-if="orderDetail.deliveryType == 1 && orderDetail.status != 10 && orderDetail.otherOrder != 1">
<view class="car-close"> <view class="car-title" style="padding: 0 20rpx;">
<uni-icons type="close" size="30" color="#fff"></uni-icons>
</view>
<view class="car-title">
选择退款原因 选择退款原因
</view> </view>
<view class=""> <view class="" style="padding: 0 20rpx;">
<view class=""> <view style="height:80rpx;">
全额退款（商家原因）
<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" /> <radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
全额退款（商家原因）
</view> </view>
<view class=""> <view style="height:80rpx;">
全额退款（配送员原因）
<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" /> <radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
全额退款（配送员原因）
</view> </view>
<view class=""> <view style="height:80rpx;">
全额退款（商家+配送员原因）
<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" /> <radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
全额退款（商家+配送员原因）
</view> </view>
</view> </view>
</view> <view class="guize-list">
<view class="guize-list"> <view style="height: 180rpx;line-height: 80rpx;font-size: 28rpx;font-weight: 700;text-align: center;">
<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;text-align: center;"> 确定要取消订单吗
确定要取消订单吗 <text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3) || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">取消订单需要商家同意</text>
<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3) || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">取消订单需要商家同意</text> <view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4">
<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4"> <text v-if="payData.shopMakeTime == null && payData.otherOrder == null">商家还未出餐</text>
<text v-if="payData.shopMakeTime == null && payData.otherOrder == null">商家还未出餐</text> <text v-if="payData.shopMakeTime != null && payData.otherOrder == null">本单商家备餐时长共计{{shopTime}} 配送员配送时长共计{{peisongTime}}</text>
<text v-if="payData.shopMakeTime != null && payData.otherOrder == null">本单商家备餐时长共计{{shopTime}} 配送员配送时长共计{{peisongTime}}</text> </view>
</view>
<view class="btn" @tap="returnOrder()">
确认取消
</view> </view>
</view>
<view class="btn" @tap="returnOrder()">
确认取消
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
@ -1492,4 +1489,19 @@
margin-right: 20rpx; margin-right: 20rpx;
} }
} }
.car-close {
width: 60rpx;
height: 60rpx;
position: absolute;
top: -80rpx;
right: 20rpx;
}
.car-title {
height: 96rpx;
line-height: 60rpx;
margin: 0 auto;
font-size: 28rpx;
font-weight: 700;
}
</style> </style>

2
package1/order/orderEvaluate.vue
View File

@ -191,7 +191,7 @@
let that = this let that = this
that.tui.request("/mall/order/detail/"+this.shopData.id, "GET", {}, false, true).then((res) => { that.tui.request("/mall/order/detail/"+this.shopData.id, "GET", {}, false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
that.manId = res.result.deliveryInfo.id; that.manId = res.result.deliveryInfo.workerId;
} else { } else {
that.tui.toast(res.message) that.tui.toast(res.message)
} }

Write Preview
Loading…
Cancel
Save